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

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

Author: baunax
Date: 2010-04-13 20:21:06 -0400 (Tue, 13 Apr 2010)
New Revision: 32561

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules/SuggestionCompletionLoader.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules/SuggestionCompletionLoaderTest.java
Log:
GUVNOR-527 Add the ability of creating Business Rules Templates using drools-templates
- Fixed test after the errors caused by adding Collections classes to SCE.

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules/SuggestionCompletionLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules/SuggestionCompletionLoader.java	2010-04-13 18:58:13 UTC (rev 32560)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/rules/SuggestionCompletionLoader.java	2010-04-14 00:21:06 UTC (rev 32561)
@@ -259,19 +259,19 @@
             final GlobalDescr global = (GlobalDescr) it.next();
             try {
                 final String shortTypeName = getShortNameOfClass( global.getType() );
+                final Class<?> clazz = loadClass( global.getType(), jars );
                 if ( !this.builder.hasFieldsForType( shortTypeName ) ) {
-                    final Class clazz = loadClass( global.getType(),
-                                                   jars );
+                    
                     loadClassFields( clazz,
                                      shortTypeName );
 
                     this.builder.addGlobalType( global.getIdentifier(),
                                                 shortTypeName );
-                    if ( clazz != null && Collection.class.isAssignableFrom( clazz ) ) {
-                        this.builder.addGlobalCollection( global.getIdentifier() );
-                    }
+                    
                 }
-
+                if ( clazz != null && Collection.class.isAssignableFrom( clazz ) ) {
+                    this.builder.addGlobalCollection( global.getIdentifier() );
+                }
                 this.builder.addGlobalType( global.getIdentifier(),
                                             shortTypeName );
             } catch ( final IOException e ) {

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules/SuggestionCompletionLoaderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules/SuggestionCompletionLoaderTest.java	2010-04-13 18:58:13 UTC (rev 32560)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules/SuggestionCompletionLoaderTest.java	2010-04-14 00:21:06 UTC (rev 32561)
@@ -61,9 +61,9 @@
         assertFalse(loader.hasErrors());
         assertNotNull(eng);
 
-        assertEquals(2, eng.getFactTypes().length);
-        assertEquals("GenBean", eng.getFactTypes()[0]);
-        assertEquals("GenBean2", eng.getFactTypes()[1]);
+        assertEquals(6, eng.getFactTypes().length); //Collection, Set, List, Number are always present
+        assertEquals("GenBean", eng.getFactTypes()[1]);
+        assertEquals("GenBean2", eng.getFactTypes()[2]);
 
         assertEquals(SuggestionCompletionEngine.TYPE_NUMERIC, eng.getFieldType( "GenBean", "id" ));
         assertEquals(SuggestionCompletionEngine.TYPE_STRING, eng.getFieldType( "GenBean", "name"));
@@ -132,10 +132,10 @@
         SuggestionCompletionEngine eng = loader.getSuggestionEngine( "package foo \n import org.drools.guvnor.server.rules.SomeFact\n import org.drools.Person", new ArrayList(), new ArrayList() );
         assertNotNull(eng);
         String[] facts  = eng.getFactTypes();
-        assertEquals(2, facts.length);
+        assertEquals(6, facts.length);
 
-        assertEquals("Person", facts[0]);
-        assertEquals("SomeFact", facts[1]);
+        assertEquals("Person", facts[3]);
+        assertEquals("SomeFact", facts[5]);
     }
 
     public void testTypeDeclarations() throws Exception {