[jboss-svn-commits] JBL Code SVN: r26358 - in labs/jbossrules/trunk/drools-compiler/src: test/java/org/drools/guvnor/server/util and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: Rikkola
Date: 2009-05-04 02:22:33 -0400 (Mon, 04 May 2009)
New Revision: 26358

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/ClassMethodInspector.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/ClassMethodInspectorTest.java
Log:
Fix for a broken test and the cause of it breaking.

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/ClassMethodInspector.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/ClassMethodInspector.java	2009-05-04 03:22:35 UTC (rev 26357)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/ClassMethodInspector.java	2009-05-04 06:22:33 UTC (rev 26358)
@@ -58,7 +58,6 @@
             return false;
         }
 
-
         if ( Collection.class.isAssignableFrom( clazz ) ) {
             if ( checkCollectionMethods( methodName ) ) {
                 return false;
@@ -73,7 +72,7 @@
 
         if ( List.class.isAssignableFrom( clazz ) ) {
 
-            if ( checkCollectionMethods( methodName ) || "listIterator".equals( methodName ) || "lastIndexOf".equals( methodName ) || "indexOf".equals( methodName ) || "subList".equals( methodName ) ) {
+            if ( checkCollectionMethods( methodName ) || "get".equals( methodName ) || "listIterator".equals( methodName ) || "lastIndexOf".equals( methodName ) || "indexOf".equals( methodName ) || "subList".equals( methodName ) ) {
                 return false;
             }
         }

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/ClassMethodInspectorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/ClassMethodInspectorTest.java	2009-05-04 03:22:35 UTC (rev 26357)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/ClassMethodInspectorTest.java	2009-05-04 06:22:33 UTC (rev 26358)
@@ -64,7 +64,7 @@
 
         for ( String s : ext.getMethodNames() ) {
             assertFalse( "Method " + s + " is not allowed.",
-                         allowedListMethod( s ) );
+                         allowedMethod( s ) );
         }
     }
 
@@ -73,7 +73,7 @@
 
         for ( String s : ext.getMethodNames() ) {
             assertFalse( "Method " + s + " is not allowed.",
-                         allowedListMethod( s ) );
+                         allowedMethod( s ) );
         }
     }
 
@@ -111,14 +111,6 @@
                 || "containsAll".equals( methodName ) || "size".equals( methodName ));
     }
 
-    private boolean allowedListMethod(String methodName) {
-        return ("hashCode".equals( methodName ) || "equals".equals( methodName ) || "listIterator".equals( methodName ) || "lastIndexOf".equals( methodName ) || "indexOf".equals( methodName ) || "subList".equals( methodName )
-                || "isEmpty".equals( methodName ) || "containsKey".equals( methodName ) || "values".equals( methodName ) || "entrySet".equals( methodName ) || "containsValue".equals( methodName )
-                || "size".equals( methodName ) || "toArray".equals( methodName ) || "iterator".equals( methodName ) || "contains".equals( methodName ) || "isEmpty".equals( methodName )
-                || "containsAll".equals( methodName ) || "size".equals( methodName ));
-    }
-
-
     public static class SimpleMethods {
         public void cleanOrSimilar() {