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

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

Author: mshaw
Date: 2007-02-14 06:00:08 -0500 (Wed, 14 Feb 2007)
New Revision: 9487

Modified:
   labs/jbossrules/trunk/drools-testing/src/org/drools/testing/core/main/Testing.java
   labs/jbossrules/trunk/drools-testing/src/org/drools/testing/core/test/TestingTest.java
   labs/jbossrules/trunk/drools-testing/src/org/drools/testing/core/utils/ObjectUtils.java
Log:


Modified: labs/jbossrules/trunk/drools-testing/src/org/drools/testing/core/main/Testing.java
===================================================================
--- labs/jbossrules/trunk/drools-testing/src/org/drools/testing/core/main/Testing.java	2007-02-14 10:55:16 UTC (rev 9486)
+++ labs/jbossrules/trunk/drools-testing/src/org/drools/testing/core/main/Testing.java	2007-02-14 11:00:08 UTC (rev 9487)
@@ -38,8 +38,8 @@
 	private Random rng;
 	private List facts = new ArrayList();
 	private ApplicationProperties applicationProperties = ApplicationProperties.getInstance();
+	private ClassLoader classLoader;
 	
-	
 	public Testing () {
 		
 	}
@@ -51,6 +51,18 @@
 	}
 	
 	/**
+	 * Instantiate with a class loader
+	 * @param suiteName
+	 * @param packageDescr
+	 */
+	public Testing (String suiteName, PackageDescr packageDescr, ClassLoader classLoader) {
+		this.testSuite = new TestSuite();
+		this.testSuite.setName(suiteName);
+		this.packageDescr = packageDescr;
+		this.classLoader = classLoader;
+	}
+	
+	/**
 	 * return a testsuite serializable object with the name
 	 * 
 	 * @param name
@@ -105,7 +117,7 @@
 			// each columndescr is for a "when" statment in the drl
 			ColumnDescr columnDescr = (ColumnDescr) i.next();
 			
-			Class classDefn = ObjectUtils.getClassDefn(columnDescr.getObjectType(), this.packageDescr.getImports());
+			Class classDefn = ObjectUtils.getClassDefn(columnDescr.getObjectType(), this.packageDescr.getImports(),this.classLoader);
 				
 			FactWrapper fact = new FactWrapper();
 			fact.setType(classDefn.getName());

Modified: labs/jbossrules/trunk/drools-testing/src/org/drools/testing/core/test/TestingTest.java
===================================================================
--- labs/jbossrules/trunk/drools-testing/src/org/drools/testing/core/test/TestingTest.java	2007-02-14 10:55:16 UTC (rev 9486)
+++ labs/jbossrules/trunk/drools-testing/src/org/drools/testing/core/test/TestingTest.java	2007-02-14 11:00:08 UTC (rev 9487)
@@ -23,7 +23,7 @@
 	
 	public void testGenerateRTL () throws Exception {
 		PackageDescr paDescr = TransformerService.parseDrl("/org/drools/testing/core/resources/drl/test.drl");
-		Testing testing = new Testing("The Test Test Suite", paDescr);
+		Testing testing = new Testing("The Test Test Suite", paDescr,TestingTest.class.getClassLoader());
 		Scenario scenario = testing.generateScenario("Scenario One",paDescr.getRules());
 		testing.addScenarioToSuite(scenario);
 		TestSuite testSuite = testing.getTestSuite();

Modified: labs/jbossrules/trunk/drools-testing/src/org/drools/testing/core/utils/ObjectUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-testing/src/org/drools/testing/core/utils/ObjectUtils.java	2007-02-14 10:55:16 UTC (rev 9486)
+++ labs/jbossrules/trunk/drools-testing/src/org/drools/testing/core/utils/ObjectUtils.java	2007-02-14 11:00:08 UTC (rev 9487)
@@ -29,10 +29,14 @@
 	      return classDefinition;
 	}
 	
-	public static Class getClassDefn (String className, List imports) {
+	public static Class getClassDefn (String className, List imports, ClassLoader classLoader) {
 		Class classDefinition = null;
 		try {
-			ClassTypeResolver cResolver = new ClassTypeResolver(imports); 
+			ClassTypeResolver cResolver;
+			if (classLoader == null)
+				cResolver = new ClassTypeResolver(imports);
+			else
+				cResolver = new ClassTypeResolver(imports, classLoader);
 			classDefinition = cResolver.resolveType(className);
 		}catch (Exception e) {
 			System.out.println(e);