[jboss-svn-commits] JBL Code SVN: r14394 - in labs/jbossrules/trunk/drools-core/src/test/java/org: drools and 1 other directory.

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

Author: fmeyer
Date: 2007-08-20 18:12:40 -0400 (Mon, 20 Aug 2007)
New Revision: 14394

Added:
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/FirstClass.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/SecondClass.java
Modified:
   labs/jbossrules/trunk/drools-core/src/test/java/org/codehaus/jfdi/interpreter/ClassTypeResolverTest.java
Log:
JBRULES-1053 - Added coverage at ClassTypeResolver


Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/codehaus/jfdi/interpreter/ClassTypeResolverTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/codehaus/jfdi/interpreter/ClassTypeResolverTest.java	2007-08-20 21:46:45 UTC (rev 14393)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/codehaus/jfdi/interpreter/ClassTypeResolverTest.java	2007-08-20 22:12:40 UTC (rev 14394)
@@ -3,12 +3,13 @@
  */
 package org.codehaus.jfdi.interpreter;
 
-import java.util.ArrayList;
 import java.util.HashSet;
 
 import junit.framework.TestCase;
 
 import org.drools.Cheese;
+import org.drools.FirstClass;
+import org.drools.SecondClass;
 import org.drools.base.ClassTypeResolver;
 
 /**
@@ -87,6 +88,11 @@
     public void testResolveObjectFromImport() throws Exception {
         final ClassTypeResolver resolver = new ClassTypeResolver( new HashSet(), Thread.currentThread().getContextClassLoader() );
         resolver.addImport( "org.drools.Cheese" );
+        resolver.addImport( "org.drools.FirstClass" );
+        resolver.addImport( "org.drools.FirstClass.AlternativeKey" );
+        resolver.addImport( "org.drools.SecondClass" );
+        resolver.addImport( "org.drools.SecondClass.AlternativeKey" );        
+        
         assertEquals( String.class,
                       resolver.resolveType( "String" ) );
         assertEquals( String.class,
@@ -95,8 +101,30 @@
                       resolver.resolveType( "Cheese" ) );
         assertEquals( Cheese.class,
                       resolver.resolveType( "org.drools.Cheese" ) );
+        assertEquals( FirstClass.class,
+                      resolver.resolveType( "org.drools.FirstClass" ) );
+        assertEquals( FirstClass.AlternativeKey.class,
+                      resolver.resolveType( "org.drools.FirstClass.AlternativeKey" ) );
+
+        assertEquals( SecondClass.class,
+                      resolver.resolveType( "org.drools.SecondClass" ) );
+        assertEquals( SecondClass.AlternativeKey.class,
+                      resolver.resolveType( "org.drools.SecondClass.AlternativeKey" ) );
     }
 
+    public void testResolveObjectFromImportMultipleClassesDifferentPackages() throws Exception {
+        final ClassTypeResolver resolver = new ClassTypeResolver( new HashSet(), Thread.currentThread().getContextClassLoader() );
+        resolver.addImport( "org.drools.Cheese" );
+        assertEquals( String.class,
+                      resolver.resolveType( "String" ) );
+        assertEquals( String.class,
+                      resolver.resolveType( "java.lang.String" ) );
+        assertEquals( Cheese.class,
+                      resolver.resolveType( "Cheese" ) );
+        assertEquals( Cheese.class,
+                      resolver.resolveType( "org.drools.Cheese" ) );
+    }
+
     public void testResolveArrayOfObjectsNotFromImport() throws Exception {
         final ClassTypeResolver resolver =  new ClassTypeResolver(new HashSet(), Thread.currentThread().getContextClassLoader());
         assertEquals( String[].class,

Added: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/FirstClass.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/FirstClass.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/FirstClass.java	2007-08-20 22:12:40 UTC (rev 14394)
@@ -0,0 +1,65 @@
+package org.drools;
+
+public class FirstClass {
+	
+	private String item1;
+	private String item2;
+	private String item3;
+	private String item4;
+	private String item5;
+	
+	private String something;
+	
+	public String getItem1() {
+		return item1;
+	}
+	public void setItem1(String item1) {
+		this.item1 = item1;
+	}
+	public String getItem2() {
+		return item2;
+	}
+	public void setItem2(String item2) {
+		this.item2 = item2;
+	}
+	public String getItem3() {
+		return item3;
+	}
+	public void setItem3(String item3) {
+		this.item3 = item3;
+	}
+	public String getItem4() {
+		return item4;
+	}
+	public void setItem4(String item4) {
+		this.item4 = item4;
+	}
+	public String getItem5() {
+		return item5;
+	}
+	public void setItem5(String item5) {
+		this.item5 = item5;
+	}
+	public String getSomething() {
+		return something;
+	}
+	public void setSomething(String something) {
+		this.something = something;
+	}
+	
+	public String toString() {
+		StringBuffer buf = new StringBuffer();
+		buf.append("FirstClass[");
+		buf.append("item1=" + item1 + ", ");
+		buf.append("item2=" + item2 + ", ");
+		buf.append("item3=" + item3 + ", ");
+		buf.append("item4=" + item4 + ", ");
+		buf.append("item5=" + item5 + "]");
+		return buf.toString();
+	}
+	
+	public static class AlternativeKey {
+		
+	}
+
+}


Property changes on: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/FirstClass.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/SecondClass.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/SecondClass.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/SecondClass.java	2007-08-20 22:12:40 UTC (rev 14394)
@@ -0,0 +1,56 @@
+package org.drools;
+
+public class SecondClass {
+	private String item1;
+	private String item2;
+	private String item3;
+	private String item4;
+	private String item5;
+	
+	public String getItem1() {
+		return item1;
+	}
+	public void setItem1(String item1) {
+		this.item1 = item1;
+	}
+	public String getItem2() {
+		return item2;
+	}
+	public void setItem2(String item2) {
+		this.item2 = item2;
+	}
+	public String getItem3() {
+		return item3;
+	}
+	public void setItem3(String item3) {
+		this.item3 = item3;
+	}
+	public String getItem4() {
+		return item4;
+	}
+	public void setItem4(String item4) {
+		this.item4 = item4;
+	}
+	public String getItem5() {
+		return item5;
+	}
+	public void setItem5(String item5) {
+		this.item5 = item5;
+	}
+	
+	public String toString() {
+		StringBuffer buf = new StringBuffer();
+		buf.append("SecondClass[");
+		buf.append("item1=" + item1 + ", ");
+		buf.append("item2=" + item2 + ", ");
+		buf.append("item3=" + item3 + ", ");
+		buf.append("item4=" + item4 + ", ");
+		buf.append("item5=" + item5 + "]");
+		return buf.toString();
+	}
+	
+	public static class AlternativeKey {
+		
+	}
+
+}


Property changes on: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/SecondClass.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain