From 42e1d67e298b9dfb2427b5ea48ba55da91a950ea Mon Sep 17 00:00:00 2001 From: Toni Rikkola Date: Thu, 13 Nov 2014 16:05:44 +0200 Subject: [PATCH] Bug 1121985 - Test scenario: Not working with Java enums (cherry picked from commit 451eebede378457c563b2ad6be4359bb599f191a) --- .../testscenarios/backend/ScenarioRunner.java | 6 +--- .../backend/TestScenarioKSessionWrapper.java | 4 --- .../populators/EnumFieldPopulator.java | 5 ++- .../populators/ExistingFactPopulator.java | 2 -- .../FactAssignmentFieldPopulator.java | 8 ++--- .../backend/populators/FactPopulatorBase.java | 6 +--- .../populators/FactPopulatorFactory.java | 8 +---- .../populators/FieldPopulatorFactory.java | 11 ++----- .../populators/GlobalFactPopulator.java | 2 -- .../backend/populators/NewFactPopulator.java | 2 -- .../verifiers/FactFieldValueVerifier.java | 5 ++- .../backend/verifiers/FactVerifier.java | 9 ++--- .../backend/ScenarioRunnerTest.java | 24 ++++++++++++++ .../FactAssignmentFieldPopulatorTest.java | 6 ++-- .../backend/populators/FactPopulatorTest.java | 33 ++++++------------- .../populators/FieldPopulatorFactoryTest.java | 4 +-- .../populators/GlobalFactPopulatorTest.java | 1 - .../populators/NewFactPopulatorTest.java | 1 - .../verifiers/FactFieldValueVerifierTest.java | 3 +- .../backend/verifiers/FactVerifierTest.java | 15 +++------ 20 files changed, 58 insertions(+), 97 deletions(-) diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/ScenarioRunner.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/ScenarioRunner.java index 573177c93c7..3fc174d1bc0 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/ScenarioRunner.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/ScenarioRunner.java @@ -27,7 +27,6 @@ import org.drools.core.base.ClassTypeResolver; import org.drools.core.impl.InternalKnowledgeBase; -import org.drools.core.impl.KnowledgeBaseImpl; import org.drools.workbench.models.testscenarios.backend.populators.FactPopulator; import org.drools.workbench.models.testscenarios.backend.populators.FactPopulatorFactory; import org.drools.workbench.models.testscenarios.shared.ActivateRuleFlowGroup; @@ -86,7 +85,6 @@ public void run( final Scenario scenario ) throws ClassNotFoundException, Illega final Map populatedData = new HashMap(); final Map globalData = new HashMap(); - final ClassLoader classloader = Thread.currentThread().getContextClassLoader(); // This looks safe! final KieBase kieBase = ksession.getKieBase(); @@ -97,13 +95,11 @@ public void run( final Scenario scenario ) throws ClassNotFoundException, Illega this.workingMemoryWrapper = new TestScenarioKSessionWrapper( ksession, resolver, - classloader, populatedData, globalData ); this.factPopulatorFactory = new FactPopulatorFactory( populatedData, globalData, - resolver, - classloader ); + resolver ); this.factPopulator = new FactPopulator( ksession, populatedData ); diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/TestScenarioKSessionWrapper.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/TestScenarioKSessionWrapper.java index 70583603d91..c0a1aea212e 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/TestScenarioKSessionWrapper.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/TestScenarioKSessionWrapper.java @@ -45,17 +45,14 @@ public class TestScenarioKSessionWrapper { private final MethodExecutor methodExecutor; private final Map populatedData; - private final ClassLoader classLoader; public TestScenarioKSessionWrapper( KieSession ksession, final TypeResolver resolver, - final ClassLoader classLoader, Map populatedData, Map globalData ) { this.ksession = ksession; this.populatedData = populatedData; this.methodExecutor = new MethodExecutor( populatedData ); - this.classLoader = classLoader; factVerifier = initFactVerifier( resolver, globalData ); @@ -65,7 +62,6 @@ private FactVerifier initFactVerifier( TypeResolver resolver, Map globalData ) { return new FactVerifier( populatedData, resolver, - classLoader, ksession, globalData ); } diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/EnumFieldPopulator.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/EnumFieldPopulator.java index 86e6a8d9ca3..977a000a20c 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/EnumFieldPopulator.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/EnumFieldPopulator.java @@ -36,15 +36,14 @@ public class EnumFieldPopulator extends FieldPopulator { public EnumFieldPopulator(Object factObject, String fieldName, String fieldValue, - TypeResolver typeResolver, - ClassLoader classLoader) { + TypeResolver typeResolver) { super( factObject, fieldName ); this.typeResolver = typeResolver; this.fieldValue = fieldValue; this.pconf = new ParserConfiguration(); - pconf.setClassLoader( classLoader ); + pconf.setClassLoader( typeResolver.getClassLoader() ); // classLoader ); this.pctx = new ParserContext( pconf ); pctx.setStrongTyping( true ); } diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/ExistingFactPopulator.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/ExistingFactPopulator.java index 54b441693e3..6146fd0162c 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/ExistingFactPopulator.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/ExistingFactPopulator.java @@ -29,11 +29,9 @@ class ExistingFactPopulator extends FactPopulatorBase { public ExistingFactPopulator( Map populatedData, TypeResolver typeResolver, - ClassLoader classLoader, FactData fact ) throws ClassNotFoundException { super( populatedData, typeResolver, - classLoader, fact ); } diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FactAssignmentFieldPopulator.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FactAssignmentFieldPopulator.java index 10ce962eb71..7610765585d 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FactAssignmentFieldPopulator.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FactAssignmentFieldPopulator.java @@ -30,17 +30,14 @@ public class FactAssignmentFieldPopulator private final Object fact; private final Collection subFieldPopulators = new ArrayList(); - private final ClassLoader classLoader; public FactAssignmentFieldPopulator(Object factObject, FactAssignmentField field, - TypeResolver resolver, - ClassLoader classLoader) + TypeResolver resolver) throws ClassNotFoundException, IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException { super(factObject, field.getName()); this.fact = resolver.resolveType(resolver.getFullTypeName(field.getFact().getType())).newInstance(); - this.classLoader = classLoader; initSubFieldPopulators(field, resolver); @@ -50,8 +47,7 @@ private void initSubFieldPopulators(FactAssignmentField field, TypeResolver resolver) throws ClassNotFoundException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException { FieldPopulatorFactory fieldPopulatorFactory = new FieldPopulatorFactory(fact, - resolver, - classLoader); + resolver); for (Field subField : field.getFact().getFieldData()) { try { subFieldPopulators.add(fieldPopulatorFactory.getFieldPopulator(subField)); diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FactPopulatorBase.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FactPopulatorBase.java index c41ccc9899c..4171c68ec42 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FactPopulatorBase.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FactPopulatorBase.java @@ -31,16 +31,13 @@ abstract class FactPopulatorBase protected final Map populatedData; protected final TypeResolver typeResolver; - protected final ClassLoader classLoader; protected final FactData fact; public FactPopulatorBase(Map populatedData, TypeResolver typeResolver, - ClassLoader classLoader, FactData fact) throws ClassNotFoundException { this.populatedData = populatedData; this.typeResolver = typeResolver; - this.classLoader = classLoader; this.fact = fact; } @@ -52,8 +49,7 @@ protected List getFieldPopulators(Object factObject) throws ClassNotFoundException, IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException { FieldPopulatorFactory fieldPopulatorFactory = new FieldPopulatorFactory(factObject, - typeResolver, - classLoader); + typeResolver); List fieldPopulators = new ArrayList(); for (Field field : fact.getFieldData()) { diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FactPopulatorFactory.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FactPopulatorFactory.java index f80c91b6bea..ae8c5db63fb 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FactPopulatorFactory.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FactPopulatorFactory.java @@ -26,16 +26,13 @@ public class FactPopulatorFactory { private Map populatedData; private Map globalData; private final TypeResolver typeResolver; - private ClassLoader classLoader; public FactPopulatorFactory(Map populatedData, Map globalData, - TypeResolver typeResolver, - ClassLoader classLoader) { + TypeResolver typeResolver) { this.populatedData = populatedData; this.globalData = globalData; this.typeResolver = typeResolver; - this.classLoader = classLoader; } public Populator createFactPopulator(FactData fact) throws ClassNotFoundException, @@ -45,13 +42,11 @@ public Populator createFactPopulator(FactData fact) throws ClassNotFoundExceptio return new ExistingFactPopulator( populatedData, typeResolver, - classLoader, fact ); } else { return new NewFactPopulator( populatedData, typeResolver, - classLoader, fact ); } } @@ -62,7 +57,6 @@ public Populator createGlobalFactPopulator(FactData fact) throws ClassNotFoundEx return new GlobalFactPopulator( populatedData, typeResolver, - classLoader, fact, globalData ); } diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FieldPopulatorFactory.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FieldPopulatorFactory.java index 799028baea9..a7144813efb 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FieldPopulatorFactory.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/FieldPopulatorFactory.java @@ -29,14 +29,11 @@ class FieldPopulatorFactory { private final Object factObject; private final TypeResolver typeResolver; - private final ClassLoader classLoader; public FieldPopulatorFactory(Object factObject, - TypeResolver typeResolver, - ClassLoader classLoader) { + TypeResolver typeResolver) { this.factObject = factObject; this.typeResolver = typeResolver; - this.classLoader = classLoader; } public FieldPopulator getFieldPopulator(Field field) throws ClassNotFoundException, @@ -53,8 +50,7 @@ public FieldPopulator getFieldPopulator(Field field) throws ClassNotFoundExcepti } else if (field instanceof FactAssignmentField ) { return new FactAssignmentFieldPopulator(factObject, (FactAssignmentField) field, - typeResolver, - classLoader); + typeResolver); } else if (field instanceof CollectionFieldData) { return new CollectionFieldPopulator( factObject, @@ -80,8 +76,7 @@ private FieldPopulator getFieldDataPopulator(Object factObject, return new EnumFieldPopulator(factObject, fieldData.getName(), fieldData.getValue(), - typeResolver, - classLoader); + typeResolver); } else if (isDate(fieldData.getName())) { return new DateFieldPopulator( factObject, diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/GlobalFactPopulator.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/GlobalFactPopulator.java index 9d0e4dee154..ec3cb70e606 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/GlobalFactPopulator.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/GlobalFactPopulator.java @@ -31,14 +31,12 @@ class GlobalFactPopulator extends FactPopulatorBase { public GlobalFactPopulator( Map populatedData, TypeResolver typeResolver, - ClassLoader classLoader, FactData fact, Map globalData ) throws ClassNotFoundException, InstantiationException, IllegalAccessException { super( populatedData, typeResolver, - classLoader, fact ); factObject = resolveFactObject(); diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/NewFactPopulator.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/NewFactPopulator.java index 1b9cb26a40e..6667581b944 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/NewFactPopulator.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/populators/NewFactPopulator.java @@ -32,13 +32,11 @@ class NewFactPopulator extends FactPopulatorBase { public NewFactPopulator( Map populatedData, TypeResolver typeResolver, - ClassLoader classLoader, FactData fact ) throws ClassNotFoundException, InstantiationException, IllegalAccessException { super( populatedData, typeResolver, - classLoader, fact ); factObject = resolveFactObject(); } diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactFieldValueVerifier.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactFieldValueVerifier.java index b9f9f6bd3b3..012f40a2ac7 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactFieldValueVerifier.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactFieldValueVerifier.java @@ -49,15 +49,14 @@ public class FactFieldValueVerifier { public FactFieldValueVerifier(Map populatedData, String factName, Object factObject, - final TypeResolver resolver, - final ClassLoader classLoader) { + final TypeResolver resolver) { this.populatedData = populatedData; this.factName = factName; this.factObject = factObject; this.resolver = resolver; this.pconf = new ParserConfiguration(); - pconf.setClassLoader(classLoader); + pconf.setClassLoader(resolver.getClassLoader()); this.pctx = new ParserContext(pconf); pctx.setStrongTyping(true); } diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactVerifier.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactVerifier.java index d26f35ebe76..a1069e7fcd8 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactVerifier.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactVerifier.java @@ -30,16 +30,13 @@ public class FactVerifier { private final TypeResolver resolver; private final KieSession ksession; private final Map globalData; - private final ClassLoader classLoader; public FactVerifier( Map populatedData, TypeResolver resolver, - ClassLoader classLoader, KieSession ksession, Map globalData ) { this.populatedData = populatedData; this.resolver = resolver; - this.classLoader = classLoader; this.ksession = ksession; this.globalData = globalData; } @@ -62,8 +59,7 @@ public void verify( VerifyFact verifyFact ) throws InvocationTargetException, verifyFact.getName(), populatedData, globalData ), - resolver, - classLoader ); + resolver ); fieldVerifier.checkFields( verifyFact.getFieldValues() ); } else { for ( Object object : ksession.getObjects() ) { @@ -94,8 +90,7 @@ private boolean verifyFact( Object factObject, FactFieldValueVerifier fieldVerifier = new FactFieldValueVerifier( populatedData, verifyFact.getName(), factObject, - resolver, - classLoader ); + resolver ); fieldVerifier.checkFields( verifyFact.getFieldValues() ); if ( verifyFact.wasSuccessful() ) { return true; diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/ScenarioRunnerTest.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/ScenarioRunnerTest.java index 0decf9b87be..33efb81e049 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/ScenarioRunnerTest.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/ScenarioRunnerTest.java @@ -290,6 +290,30 @@ public void testVerifyFactsWithEnum() throws Exception { assertTrue(field.getSuccessResult()); } } + @Test + public void testVerifyFactsWithEnumWildCardImport() throws Exception { + + FieldData cheeseType = new FieldData( + "cheeseType", + "CheeseType.CHEDDAR" + ); + cheeseType.setNature(FieldData.TYPE_ENUM); + FactData f1 = new FactData( + "Cheese", + "f1", + Arrays.asList(cheeseType), + false + ); + + Scenario scenario = new Scenario(); + scenario.setPackageName("org.drools.workbench.models.testscenarios.backend"); + scenario.getFixtures().add(f1); + + ScenarioRunner runner = new ScenarioRunner(ksession); + + runner.run(scenario); + + } @Test public void testTestingEventListener() throws Exception { diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/FactAssignmentFieldPopulatorTest.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/FactAssignmentFieldPopulatorTest.java index 695733a8789..d99db8c859d 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/FactAssignmentFieldPopulatorTest.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/FactAssignmentFieldPopulatorTest.java @@ -43,7 +43,7 @@ public void testFactAssignmentField() throws Exception { FactAssignmentField factAssignmentField = new FactAssignmentField("cheese", "Cheese"); - FactAssignmentFieldPopulator factAssignmentFieldPopulator = new FactAssignmentFieldPopulator(mouse, factAssignmentField, typeResolver, classLoader); + FactAssignmentFieldPopulator factAssignmentFieldPopulator = new FactAssignmentFieldPopulator(mouse, factAssignmentField, typeResolver); factAssignmentFieldPopulator.populate(new HashMap()); @@ -61,7 +61,7 @@ public void testSimpleFields() throws Exception { FactAssignmentField factAssignmentField = new FactAssignmentField("cheese", "Cheese"); factAssignmentField.getFact().getFieldData().add(new FieldData("type", "Best cheddar EVER! (tm)")); - FactAssignmentFieldPopulator factAssignmentFieldPopulator = new FactAssignmentFieldPopulator(mouse, factAssignmentField, typeResolver, classLoader); + FactAssignmentFieldPopulator factAssignmentFieldPopulator = new FactAssignmentFieldPopulator(mouse, factAssignmentField, typeResolver); factAssignmentFieldPopulator.populate(new HashMap()); @@ -79,7 +79,7 @@ public void testMatryoshkaDollSituation() throws Exception { FactAssignmentField factAssignmentField = createFactAssignmentField(); addFactAssignmentFieldIntoFactAssignmentField(factAssignmentField, 5); - FactAssignmentFieldPopulator factAssignmentFieldPopulator = new FactAssignmentFieldPopulator(matryoshkaDoll, factAssignmentField, typeResolver, classLoader); + FactAssignmentFieldPopulator factAssignmentFieldPopulator = new FactAssignmentFieldPopulator(matryoshkaDoll, factAssignmentField, typeResolver); factAssignmentFieldPopulator.populate(new HashMap()); diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/FactPopulatorTest.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/FactPopulatorTest.java index 498a3a43f05..e616000cfe1 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/FactPopulatorTest.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/FactPopulatorTest.java @@ -80,7 +80,7 @@ public void testPopulateFacts() throws Exception { "=30 + 3" ) ), false ); - factPopulator.add( new NewFactPopulator( populatedData, getTypeResolver(), getClassLoader(), factData ) ); + factPopulator.add( new NewFactPopulator( populatedData, getTypeResolver(), factData ) ); factPopulator.populate(); @@ -105,7 +105,7 @@ public void testPopulateEnum() throws Exception { asList( (Field) fieldData ), false ); - factPopulator.add( new NewFactPopulator( populatedData, getTypeResolver(), getClassLoader(), factData ) ); + factPopulator.add( new NewFactPopulator( populatedData, getTypeResolver(), factData ) ); factPopulator.populate(); @@ -132,7 +132,7 @@ public void testPopulateNested() throws Exception { "42" ) ), false ); - factPopulator.add( new NewFactPopulator( populatedData, typeResolver, getClassLoader(), cheeseFactData ) ); + factPopulator.add( new NewFactPopulator( populatedData, typeResolver, cheeseFactData ) ); FactData outerFactData = new FactData( "OuterFact", @@ -146,7 +146,7 @@ public void testPopulateNested() throws Exception { "=c1" ) ), false ); - factPopulator.add( new NewFactPopulator( populatedData, typeResolver, getClassLoader(), outerFactData ) ); + factPopulator.add( new NewFactPopulator( populatedData, typeResolver, outerFactData ) ); factPopulator.populate(); @@ -174,7 +174,7 @@ public void testPopulateNestedWrongOrder() throws Exception { "=c1" ) ), false ); - factPopulator.add( new NewFactPopulator( populatedData, typeResolver, getClassLoader(), outerFactData ) ); + factPopulator.add( new NewFactPopulator( populatedData, typeResolver, outerFactData ) ); FactData cheeseFactData = new FactData( "Cheese", @@ -188,7 +188,7 @@ public void testPopulateNestedWrongOrder() throws Exception { "42" ) ), false ); - factPopulator.add( new NewFactPopulator( populatedData, typeResolver, getClassLoader(), cheeseFactData ) ); + factPopulator.add( new NewFactPopulator( populatedData, typeResolver, cheeseFactData ) ); factPopulator.populate(); @@ -206,7 +206,6 @@ public void testPopulateFactWithoutFields() throws Exception { new NewFactPopulator( populatedData, getTypeResolver(), - getClassLoader(), new FactData( "Cheese", "c1", new ArrayList(), @@ -225,7 +224,6 @@ public void testPopulateEmptyIntegerField() throws Exception { new NewFactPopulator( populatedData, getTypeResolver(), - getClassLoader(), new FactData( "Cheese", "c1", Arrays.asList( @@ -255,7 +253,6 @@ public void testPopulatingExistingFact() throws Exception { new ExistingFactPopulator( populatedData, getTypeResolver(), - getClassLoader(), new FactData( "Cheese", "x", @@ -281,7 +278,6 @@ public void testDateField() throws Exception { new NewFactPopulator( populatedData, getTypeResolver(), - getClassLoader(), new FactData( "Cheese", "c1", @@ -297,7 +293,6 @@ public void testDateField() throws Exception { new NewFactPopulator( populatedData, getTypeResolver(), - getClassLoader(), new FactData( "OuterFact", "p1", @@ -327,7 +322,6 @@ public void testSQLDateField() throws Exception { new NewFactPopulator( populatedData, getTypeResolver(), - getClassLoader(), new FactData( "SqlDateWrapper", "c1", @@ -353,7 +347,6 @@ public void testPopulateFactsWithExpressions() throws Exception { new NewFactPopulator( populatedData, getTypeResolver(), - getClassLoader(), new FactData( "Cheese", "c1", Arrays.asList( @@ -368,7 +361,6 @@ public void testPopulateFactsWithExpressions() throws Exception { new NewFactPopulator( populatedData, getTypeResolver(), - getClassLoader(), new FactData( "Cheese", "c2", @@ -405,7 +397,6 @@ public void testPopulateEmptyString() throws Exception { new ExistingFactPopulator( populatedData, getTypeResolver(), - getClassLoader(), new FactData( "Cheese", "x", @@ -438,7 +429,7 @@ public void testCollectionFieldInFacts() throws Exception { "42" ) ), false ); - factPopulator.add( new NewFactPopulator( populatedData, typeResolver, getClassLoader(), fd1 ) ); + factPopulator.add( new NewFactPopulator( populatedData, typeResolver, fd1 ) ); FactData fd2 = new FactData( "Cheese", "f2", @@ -448,7 +439,7 @@ public void testCollectionFieldInFacts() throws Exception { new FieldData( "price", "43" ) ), false ); - factPopulator.add( new NewFactPopulator( populatedData, typeResolver, getClassLoader(), fd2 ) ); + factPopulator.add( new NewFactPopulator( populatedData, typeResolver, fd2 ) ); FactData fd3 = new FactData( "Cheese", "f3", @@ -459,7 +450,7 @@ public void testCollectionFieldInFacts() throws Exception { "45" ) ), false ); - factPopulator.add( new NewFactPopulator( populatedData, typeResolver, getClassLoader(), fd3 ) ); + factPopulator.add( new NewFactPopulator( populatedData, typeResolver, fd3 ) ); FieldData field = new FieldData(); field.setName( "cheeses" ); @@ -471,7 +462,7 @@ public void testCollectionFieldInFacts() throws Exception { "listChesse", lstField, false ); - factPopulator.add( new NewFactPopulator( populatedData, typeResolver, getClassLoader(), lst ) ); + factPopulator.add( new NewFactPopulator( populatedData, typeResolver, lst ) ); factPopulator.populate(); @@ -520,19 +511,16 @@ public void testCollection() throws Exception { factPopulator.add( new NewFactPopulator( populatedData, typeResolver, - Thread.currentThread().getContextClassLoader(), cheeseryFactData ) ); factPopulator.add( new NewFactPopulator( populatedData, typeResolver, - Thread.currentThread().getContextClassLoader(), cheeseFactData1 ) ); factPopulator.add( new NewFactPopulator( populatedData, typeResolver, - Thread.currentThread().getContextClassLoader(), cheeseFactData2 ) ); factPopulator.populate(); @@ -567,7 +555,6 @@ public void testCollectionSums() throws Exception { factPopulator.add( new NewFactPopulator( populatedData, typeResolver, - Thread.currentThread().getContextClassLoader(), wrapperFactData ) ); factPopulator.populate(); diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/FieldPopulatorFactoryTest.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/FieldPopulatorFactoryTest.java index 38d0d034acc..9b27d58367f 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/FieldPopulatorFactoryTest.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/FieldPopulatorFactoryTest.java @@ -33,14 +33,12 @@ public class FieldPopulatorFactoryTest { private FieldPopulatorFactory fieldPopulatorFactory; private TypeResolver typeResolver; - private ClassLoader classLoader; @Before public void setUp() throws Exception { Object factObject = mock(Object.class); typeResolver = mock(TypeResolver.class); - classLoader = Thread.currentThread().getContextClassLoader(); - fieldPopulatorFactory = new FieldPopulatorFactory(factObject, typeResolver, classLoader); + fieldPopulatorFactory = new FieldPopulatorFactory(factObject, typeResolver); } @Test diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/GlobalFactPopulatorTest.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/GlobalFactPopulatorTest.java index 9bb03f710e7..a6f6dbb837a 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/GlobalFactPopulatorTest.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/GlobalFactPopulatorTest.java @@ -53,7 +53,6 @@ public void testWithGlobals() throws Exception { Map globalData = new HashMap(); GlobalFactPopulator globalFactPopulator = new GlobalFactPopulator( populatedData, resolver, - Thread.currentThread().getContextClassLoader(), global, globalData ); diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/NewFactPopulatorTest.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/NewFactPopulatorTest.java index c26a8b07421..9d5e9b9cf99 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/NewFactPopulatorTest.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/populators/NewFactPopulatorTest.java @@ -65,7 +65,6 @@ public void testDummyRunNoRules() throws Exception { NewFactPopulator newFactPopulator = new NewFactPopulator( populatedData, typeResolver, - Thread.currentThread().getContextClassLoader(), fact ); newFactPopulator.populate( workingMemory, new HashMap() ); diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactFieldValueVerifierTest.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactFieldValueVerifierTest.java index 6d18bc6cfb7..04cd9825718 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactFieldValueVerifierTest.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactFieldValueVerifierTest.java @@ -28,8 +28,7 @@ public void testSQLDate() throws Exception { populatedData, "sqlDateWrapper", sqlDateWrapper, - typeResolver, - Thread.currentThread().getContextClassLoader()); + typeResolver); List fieldValues = new ArrayList(); VerifyField verifyField = new VerifyField("sqlDate", "12-DEC-2012", "=="); diff --git a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactVerifierTest.java b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactVerifierTest.java index 288e3b91fd1..c6f8f040698 100644 --- a/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactVerifierTest.java +++ b/drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/verifiers/FactVerifierTest.java @@ -43,8 +43,7 @@ public void setUp() throws Exception { @Test public void testVerifyAnonymousFacts() throws Exception { TypeResolver typeResolver = mock( TypeResolver.class ); - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - FactVerifier factVerifier = new FactVerifier( new HashMap(), typeResolver, classLoader, ksession, new HashMap() ); + FactVerifier factVerifier = new FactVerifier( new HashMap(), typeResolver, ksession, new HashMap() ); Cheese c = new Cheese(); c.setPrice( 42 ); @@ -109,7 +108,6 @@ public void testVerifyAnonymousFacts() throws Exception { @Test public void testVerifyFactsWithOperator() throws Exception { TypeResolver typeResolver = mock( TypeResolver.class ); - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); Cheese f1 = new Cheese( "cheddar", 42 ); @@ -120,7 +118,7 @@ public void testVerifyFactsWithOperator() throws Exception { Set o = Collections.singleton( (Object) f1); when( ksession.getObjects() ).thenReturn( o ); - FactVerifier factVerifier = new FactVerifier( populatedData, typeResolver, classLoader, ksession, new HashMap() ); + FactVerifier factVerifier = new FactVerifier( populatedData, typeResolver, ksession, new HashMap() ); // test all true VerifyFact vf = new VerifyFact(); @@ -151,7 +149,6 @@ public void testVerifyFactsWithOperator() throws Exception { @Test public void testVerifyFactsWithExpression() throws Exception { TypeResolver typeResolver = mock( TypeResolver.class ); - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); Cheese f1 = new Cheese( "cheddar", 42 ); @@ -164,7 +161,7 @@ public void testVerifyFactsWithExpression() throws Exception { Set o = Collections.singleton( (Object) f1 ); when( ksession.getObjects() ).thenReturn( o ); - FactVerifier factVerifier = new FactVerifier( populatedData, typeResolver, classLoader, ksession, new HashMap() ); + FactVerifier factVerifier = new FactVerifier( populatedData, typeResolver, ksession, new HashMap() ); // test all true VerifyFact vf = new VerifyFact(); @@ -183,7 +180,6 @@ public void testVerifyFactExplanation() throws Exception { f1.setType( null ); TypeResolver typeResolver = mock( TypeResolver.class ); - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); HashMap populatedData = new HashMap(); populatedData.put( "f1", f1 ); @@ -192,7 +188,7 @@ public void testVerifyFactExplanation() throws Exception { Set o = Collections.singleton( (Object) f1 ); when( ksession.getObjects() ).thenReturn( o ); - FactVerifier factVerifier = new FactVerifier( populatedData, typeResolver, classLoader, ksession, new HashMap() ); + FactVerifier factVerifier = new FactVerifier( populatedData, typeResolver, ksession, new HashMap() ); VerifyFact vf = new VerifyFact(); vf.setName( "f1" ); @@ -213,7 +209,6 @@ public void testVerifyFieldAndActualIsNull() throws Exception { f1.setType( null ); TypeResolver typeResolver = mock( TypeResolver.class ); - ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); HashMap populatedData = new HashMap(); populatedData.put( "f1", f1 ); @@ -222,7 +217,7 @@ public void testVerifyFieldAndActualIsNull() throws Exception { Set o = Collections.singleton( (Object) f1 ); when( ksession.getObjects() ).thenReturn( o ); - FactVerifier factVerifier = new FactVerifier( populatedData, typeResolver, classLoader, ksession, new HashMap() ); + FactVerifier factVerifier = new FactVerifier( populatedData, typeResolver, ksession, new HashMap() ); VerifyFact vf = new VerifyFact(); vf.setName( "f1" );