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

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

Author: michael.neale at jboss.com
Date: 2007-10-01 01:00:41 -0400 (Mon, 01 Oct 2007)
New Revision: 15465

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/rules/SuggestionCompletionLoader.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/rules/SuggestionCompletionLoaderTest.java
Log:
bug where globals where not behaving with enums

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/rules/SuggestionCompletionLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/rules/SuggestionCompletionLoader.java	2007-10-01 04:16:08 UTC (rev 15464)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/server/rules/SuggestionCompletionLoader.java	2007-10-01 05:00:41 UTC (rev 15465)
@@ -243,7 +243,7 @@
         for ( final Iterator it = pkgDescr.getGlobals().iterator(); it.hasNext(); ) {
             final GlobalDescr global = (GlobalDescr) it.next();
             try {
-                final String shortTypeName = global.getType();
+                final String shortTypeName = getShortNameOfClass(global.getType());
                 if ( !this.builder.hasFieldsForType( shortTypeName ) ) {
                     final Class clazz = loadClass( global.getType(),
                                                    jars );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/rules/SuggestionCompletionLoaderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/rules/SuggestionCompletionLoaderTest.java	2007-10-01 04:16:08 UTC (rev 15464)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/rules/SuggestionCompletionLoaderTest.java	2007-10-01 05:00:41 UTC (rev 15465)
@@ -32,6 +32,18 @@
 
     }
 
+    public void testGlobal() throws Exception {
+        SuggestionCompletionLoader loader = new SuggestionCompletionLoader();
+        SuggestionCompletionEngine eng = loader.getSuggestionEngine( "package foo \n global org.drools.Person p", new ArrayList(), new ArrayList() );
+        assertNotNull(eng);
+        assertFalse(loader.hasErrors());
+
+        assertEquals(1, eng.getGlobalVariables().length);
+        assertEquals("p", eng.getGlobalVariables()[0]);
+        assertEquals("Person", eng.globalTypes.get("p"));
+
+    }
+
     public void testSortOrderOfFields() throws Exception {
 
 	    SuggestionCompletionLoader loader = new SuggestionCompletionLoader();