From 4765cfae6462493ff80fe83a80a117ad54ddf51b Mon Sep 17 00:00:00 2001 From: Paolo Bizzarri Date: Wed, 23 Mar 2022 14:12:18 +0100 Subject: [PATCH 1/9] Fix assertj imports for kie-dmn projects --- .../core/DMNDecisionTableHitPolicyTest.java | 136 ++++++++---------- .../internal/utils/DRGAnalysisUtilsTest.java | 14 +- .../core/stronglytyped/AnnotationsTest.java | 66 +++++---- .../dmn/feel/jandex/AbstractJandexTest.java | 5 +- .../functions/interval/FormulasTest.java | 48 +++---- .../model/api/AssociationDirectionTest.java | 8 +- .../api/DecisionTableOrientationTest.java | 8 +- .../kie/dmn/model/api/FunctionKindTest.java | 8 +- .../model/api/dmndi/AlignmentKindTest.java | 8 +- .../dmn/model/api/dmndi/KnownColorTest.java | 8 +- .../model/jandex/KieDMNModelJandexTest.java | 5 +- .../kie/dmn/openapi/FEELSchemaEnumTest.java | 9 +- .../org/kie/dmn/openapi/ProcessItemTest.java | 8 +- .../kie/dmn/pmml/DMNKMeansModelPMMLTest.java | 23 +-- .../kie/dmn/pmml/DMNMiningModelPMMLTest.java | 23 +-- .../kie/dmn/pmml/DMNNaiveBayesPMMLTest.java | 21 +-- .../dmn/pmml/DMNNeuralNetworkPMMLTest.java | 21 +-- .../kie/dmn/pmml/DMNRegressionPMMLTest.java | 27 ++-- .../org/kie/dmn/pmml/DMNTreePMMLTest.java | 31 ++-- .../dmn/validation/AbstractValidatorTest.java | 1 + .../org/kie/dmn/validation/ValidatorTest.java | 124 ++++++++-------- .../DMNDTAnalysisExceptionTest.java | 5 +- .../validation/dtanalysis/IntervalTest.java | 46 +++--- .../dtanalysis/model/NullBoundImplTest.java | 15 +- 24 files changed, 328 insertions(+), 340 deletions(-) diff --git a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/DMNDecisionTableHitPolicyTest.java b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/DMNDecisionTableHitPolicyTest.java index 29350252b5d..fb6b6919bf6 100644 --- a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/DMNDecisionTableHitPolicyTest.java +++ b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/DMNDecisionTableHitPolicyTest.java @@ -16,14 +16,15 @@ package org.kie.dmn.core; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.math.BigDecimal; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; -import org.assertj.core.api.Assertions; import org.junit.Test; -import org.kie.api.builder.Message; import org.kie.dmn.api.core.DMNContext; import org.kie.dmn.api.core.DMNMessage; import org.kie.dmn.api.core.DMNModel; @@ -36,20 +37,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.hasItems; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.isA; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.hasEntry; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.isEmptyOrNullString; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - public class DMNDecisionTableHitPolicyTest extends BaseInterpretedVsCompiledTest { public static final Logger LOG = LoggerFactory.getLogger(DMNDecisionTableHitPolicyTest.class); @@ -62,25 +49,25 @@ public DMNDecisionTableHitPolicyTest(final boolean useExecModelCompiler ) { public void testSimpleDecisionTableHitPolicyUnique() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("0004-simpletable-U.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("https://github.com/kiegroup/kie-dmn", "0004-simpletable-U"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); final DMNContext context = getSimpleTableContext(BigDecimal.valueOf(18), "Medium", true); final DMNContext result = evaluateSimpleTableWithContext(dmnModel, runtime, context); - assertThat(result.get("Approval Status"), is("Approved")); + assertThat(result.get("Approval Status")).isEqualTo("Approved"); } @Test public void testSimpleDecisionTableHitPolicyUniqueSatisfies() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("0004-simpletable-U.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("https://github.com/kiegroup/kie-dmn", "0004-simpletable-U"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); // Risk Category is constrained to "High", "Low", "Medium" and "ASD" is not allowed final DMNContext context = getSimpleTableContext(BigDecimal.valueOf(18), "ASD", false); final DMNResult dmnResult = runtime.evaluateAll(dmnModel, context); final DMNContext result = dmnResult.getContext(); - assertThat(result.get("Approval Status"), nullValue()); + assertThat(result.get("Approval Status")).isNull(); assertTrue(dmnResult.getMessages().size() > 0); DMNMessage message = dmnResult.getMessages().iterator().next(); assertEquals(message.getText(), "DMN: RiskCategory='ASD' does not match any of the valid values \"High\", \"Low\", \"Medium\" for decision table '_0004-simpletable-U'. (DMN id: _0004-simpletable-U, FEEL expression evaluation error) "); @@ -90,7 +77,7 @@ public void testSimpleDecisionTableHitPolicyUniqueSatisfies() { public void testSimpleDecisionTableHitPolicyUniqueNullWarn() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("0004-simpletable-U-noinputvalues.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("https://github.com/kiegroup/kie-dmn", "0004-simpletable-U-noinputvalues"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); check_testSimpleDecisionTableHitPolicyUniqueNullWarn(runtime, dmnModel); } @@ -100,7 +87,7 @@ private void check_testSimpleDecisionTableHitPolicyUniqueNullWarn(DMNRuntime run final DMNResult dmnResult = runtime.evaluateAll(dmnModel, context); final DMNContext result = dmnResult.getContext(); - assertThat(result.get("Approval Status"), nullValue()); + assertThat(result.get("Approval Status")).isNull(); assertTrue(dmnResult.getMessages().size() > 0); assertTrue(dmnResult.getMessages().stream().anyMatch(dm -> dm.getSeverity().equals(DMNMessage.Severity.WARN) && dm.getFeelEvent() instanceof HitPolicyViolationEvent && dm.getFeelEvent().getSeverity().equals(FEELEvent.Severity.WARN))); } @@ -109,7 +96,7 @@ private void check_testSimpleDecisionTableHitPolicyUniqueNullWarn(DMNRuntime run public void testSimpleDecisionTableHitPolicyUniqueNullWarn_ctxe() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("0004-simpletable-U-noinputvalues-ctxe.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("https://github.com/kiegroup/kie-dmn", "0004-simpletable-U-noinputvalues"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); check_testSimpleDecisionTableHitPolicyUniqueNullWarn(runtime, dmnModel); } @@ -118,7 +105,7 @@ public void testSimpleDecisionTableHitPolicyUniqueNullWarn_ctxe() { public void testSimpleDecisionTableHitPolicyUniqueNullWarn_ctxr() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("0004-simpletable-U-noinputvalues-ctxr.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("https://github.com/kiegroup/kie-dmn", "0004-simpletable-U-noinputvalues"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); check_testSimpleDecisionTableHitPolicyUniqueNullWarn(runtime, dmnModel); } @@ -127,31 +114,31 @@ public void testSimpleDecisionTableHitPolicyUniqueNullWarn_ctxr() { public void testDecisionTableHitPolicyUnique() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("BranchDistribution.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("http://www.trisotech.com/dmn/definitions/_cdf29af2-959b-4004-8271-82a9f5a62147", "Dessin 1"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); final DMNContext context = DMNFactory.newContext(); context.set("Branches dispersion", "Province"); context.set("Number of Branches", BigDecimal.valueOf(10)); final DMNResult dmnResult = runtime.evaluateAll(dmnModel, context); - assertThat(dmnResult.hasErrors(), is(false)); + assertThat(dmnResult.hasErrors()).isFalse(); final DMNContext result = dmnResult.getContext(); - assertThat(result.get("Branches distribution"), is("Medium")); + assertThat(result.get("Branches distribution")).isEqualTo("Medium"); } @Test public void testSimpleDecisionTableHitPolicyFirst() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("0004-simpletable-F.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("https://github.com/kiegroup/kie-dmn", "0004-simpletable-F"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); final DMNContext context = getSimpleTableContext(BigDecimal.valueOf(18), "Medium", true); final DMNContext result = evaluateSimpleTableWithContext(dmnModel, runtime, context); final Map decisionResult = (Map) result.get("Decision Result"); - assertThat(decisionResult.values(), hasSize(2)); - assertThat(decisionResult, hasEntry(is("Approval Status"), is("Approved"))); - assertThat(decisionResult, hasEntry(is("Decision Review"), is("Decision final"))); + assertThat(decisionResult).hasSize(2); + assertThat(decisionResult).containsEntry("Approval Status", "Approved"); + assertThat(decisionResult).containsEntry("Decision Review", "Decision final"); } @Test @@ -167,16 +154,16 @@ public void testSimpleDecisionTableHitPolicyAnyNonEqualRules() { private void testSimpleDecisionTableHitPolicyAny(final String resurceName, final String modelName, final boolean equalRules) { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime(resurceName, this.getClass()); final DMNModel dmnModel = runtime.getModel("https://github.com/kiegroup/kie-dmn", modelName); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); final DMNContext context = getSimpleTableContext(BigDecimal.valueOf(18), "Medium", true); final DMNResult dmnResult = runtime.evaluateAll(dmnModel, context); final DMNContext result = dmnResult.getContext(); if (equalRules) { - assertThat(result.get("Approval Status"), is("Approved")); + assertThat(result.get("Approval Status")).isEqualTo("Approved"); } else { - assertThat(dmnResult.hasErrors(), is(true)); - assertThat((String) result.get("Approval Status"), isEmptyOrNullString()); + assertThat(dmnResult.hasErrors()).isTrue(); + assertThat((String) result.get("Approval Status")).isNullOrEmpty(); } } @@ -184,50 +171,50 @@ private void testSimpleDecisionTableHitPolicyAny(final String resurceName, final public void testSimpleDecisionTableHitPolicyPriority() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("0004-simpletable-P.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("https://github.com/kiegroup/kie-dmn", "0004-simpletable-P"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); final DMNContext context = getSimpleTableContext(BigDecimal.valueOf(70), "Medium", true); final DMNContext result = evaluateSimpleTableWithContext(dmnModel, runtime, context); - assertThat(result.get("Approval Status"), is("Declined")); + assertThat(result.get("Approval Status")).isEqualTo("Declined"); } @Test public void testSimpleDecisionTableHitPolicyPriorityMultipleOutputs() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("0004-simpletable-P-multiple-outputs.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("https://github.com/kiegroup/kie-dmn", "0004-simpletable-P-multiple-outputs"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); final DMNContext context = getSimpleTableContext(BigDecimal.valueOf(18), "Medium", true); final DMNContext result = evaluateSimpleTableWithContext(dmnModel, runtime, context); final Map decisionResult = (Map) result.get("Decision Result"); - assertThat(decisionResult.values(), hasSize(2)); - assertThat(decisionResult, hasEntry(is("Approval Status"), is("Declined"))); - assertThat(decisionResult, hasEntry(is("Decision Review"), is("Needs verification"))); + assertThat(decisionResult.values()).hasSize(2); + assertThat(decisionResult).containsEntry("Approval Status", "Declined"); + assertThat(decisionResult).containsEntry("Decision Review", "Needs verification"); } @Test public void testSimpleDecisionTableHitPolicyOutputOrder() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("0004-simpletable-O.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("https://github.com/kiegroup/kie-dmn", "0004-simpletable-O"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); final DMNContext context = getSimpleTableContext(BigDecimal.valueOf(70), "Medium", true); final DMNContext result = evaluateSimpleTableWithContext(dmnModel, runtime, context); final List decisionResults = (List) result.get("Approval Status"); - assertThat(decisionResults, hasSize(3)); - assertThat(decisionResults, contains("Declined", "Declined", "Approved")); + assertThat(decisionResults).hasSize(3); + assertThat(decisionResults).contains("Declined", "Declined", "Approved"); } @Test public void testSimpleDecisionTableHitPolicyOutputOrderMultipleOutputs() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("0004-simpletable-O-multiple-outputs.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("https://github.com/kiegroup/kie-dmn", "0004-simpletable-O-multiple-outputs"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); final DMNContext context = getSimpleTableContext(BigDecimal.valueOf(18), "Medium", true); final DMNContext result = evaluateSimpleTableWithContext(dmnModel, runtime, context); final List> decisionResult = (List>) result.get("Decision Result"); - assertThat(decisionResult, hasSize(4)); + assertThat(decisionResult).hasSize(4); // Must be ordered, so we can read from the list by index checkMultipleOutputResult(decisionResult.get(0), "Declined", "Needs verification"); checkMultipleOutputResult(decisionResult.get(1), "Declined", "Decision final"); @@ -237,40 +224,40 @@ public void testSimpleDecisionTableHitPolicyOutputOrderMultipleOutputs() { private void checkMultipleOutputResult(final Map outputResult, final String expectedApprovalStatus, final String expectedDecisionReview) { - assertThat(outputResult, hasEntry(is("Approval Status"), is(expectedApprovalStatus))); - assertThat(outputResult, hasEntry(is("Decision Review"), is(expectedDecisionReview))); + assertThat(outputResult).containsEntry("Approval Status", expectedApprovalStatus); + assertThat(outputResult).containsEntry("Decision Review", expectedDecisionReview); } @Test public void testSimpleDecisionTableHitPolicyRuleOrder() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("0004-simpletable-R.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("https://github.com/kiegroup/kie-dmn", "0004-simpletable-R"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); final DMNContext context = getSimpleTableContext(BigDecimal.valueOf(70), "Medium", true); final DMNContext result = evaluateSimpleTableWithContext(dmnModel, runtime, context); final List decisionResults = (List) result.get("Approval Status"); - assertThat(decisionResults, hasSize(3)); - assertThat(decisionResults, contains("Approved", "Needs review", "Declined")); + assertThat(decisionResults).hasSize(3); + assertThat(decisionResults).contains("Approved", "Needs review", "Declined"); } @Test public void testSimpleDecisionTableHitPolicyCollect() { final List decisionResults = executeTestDecisionTableHitPolicyCollect(getSimpleTableContext(BigDecimal.valueOf(70 ), "Medium", true)); - assertThat(decisionResults, hasSize(3)); - assertThat(decisionResults, contains(BigDecimal.valueOf(10), BigDecimal.valueOf(25), BigDecimal.valueOf(13))); + assertThat(decisionResults).hasSize(3); + assertThat(decisionResults).contains(BigDecimal.valueOf(10), BigDecimal.valueOf(25), BigDecimal.valueOf(13)); } @Test public void testSimpleDecisionTableHitPolicyCollectNoHits() { final List decisionResults = executeTestDecisionTableHitPolicyCollect(getSimpleTableContext(BigDecimal.valueOf(5 ), "Medium", true)); - assertThat(decisionResults, hasSize(0)); + assertThat(decisionResults).hasSize(0); } private List executeTestDecisionTableHitPolicyCollect(final DMNContext context) { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime( "0004-simpletable-C.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel( "https://github.com/kiegroup/kie-dmn", "0004-simpletable-C"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); final DMNContext result = evaluateSimpleTableWithContext(dmnModel, runtime, context); @@ -289,16 +276,16 @@ public void testSimpleDecisionTableHitPolicyCollectSumMultipleOutputs() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("0004-simpletable-C-sum-multiple-outputs.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("https://github.com/kiegroup/kie-dmn", "0004-simpletable-C-sum-multiple-outputs"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); final DMNContext context = getSimpleTableContext(BigDecimal.valueOf(70), "Medium", true); final DMNResult dmnResult = runtime.evaluateAll(dmnModel, context); final DMNContext result = dmnResult.getContext(); final Map decisionResult = (Map) result.get("Decision Result"); - assertThat(decisionResult.values(), hasSize(2)); - assertThat(decisionResult, hasEntry( "Value1", BigDecimal.valueOf( 25 ) )); - assertThat(decisionResult, hasEntry( "Value2", BigDecimal.valueOf( 32 ) )); + assertThat(decisionResult.values()).hasSize(2); + assertThat(decisionResult).containsEntry("Value1", BigDecimal.valueOf(25)); + assertThat(decisionResult).containsEntry("Value2", BigDecimal.valueOf(32)); } @Test @@ -333,10 +320,10 @@ private void testSimpleDecisionTableHitPolicyCollectAggregateFunction( final String resourceName, final String modelName, final BigDecimal expectedResult, final DMNContext context) { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime(resourceName, this.getClass()); final DMNModel dmnModel = runtime.getModel("https://github.com/kiegroup/kie-dmn", modelName); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); final DMNContext result = evaluateSimpleTableWithContext(dmnModel, runtime, context); - assertThat(result.get("Status number"), is(expectedResult)); + assertThat(result.get("Status number")).isEqualTo(expectedResult); } private DMNContext evaluateSimpleTableWithContext(final DMNModel model, final DMNRuntime runtime, final DMNContext context) { @@ -356,38 +343,38 @@ private DMNContext getSimpleTableContext(final BigDecimal age, final String risk public void testDecisionTableHitPolicyCollect() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("Collect_Hit_Policy.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("http://www.trisotech.com/definitions/_da1a4dcb-01bf-4dee-9be8-f498bc68178c", "Collect Hit Policy"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); final DMNContext context = DMNFactory.newContext(); context.set("Input", 20); final DMNResult dmnResult = runtime.evaluateAll(dmnModel, context); - assertThat(dmnResult.hasErrors(), is(false)); + assertThat(dmnResult.hasErrors()).isFalse(); final DMNContext result = dmnResult.getContext(); - assertThat(result.get("Collect"), is(BigDecimal.valueOf(50))); + assertThat(result.get("Collect")).isEqualTo(BigDecimal.valueOf(50)); } @Test public void testDecisionTableHitPolicyAnyWithOverlap_DoOverlap() { final DMNResult dmnResult = executeHitPolicyAnyWithOverlap(20); - assertThat(dmnResult.hasErrors(), is(true)); + assertThat(dmnResult.hasErrors()).isTrue(); assertTrue(dmnResult.getMessages().size() > 0); assertTrue(dmnResult.getMessages().stream().anyMatch(dm -> dm.getFeelEvent() instanceof HitPolicyViolationEvent && dm.getFeelEvent().getSeverity().equals(FEELEvent.Severity.ERROR))); - assertThat(dmnResult.getDecisionResultByName("a decision").getResult(), nullValue()); + assertThat(dmnResult.getDecisionResultByName("a decision").getResult()).isNull(); } @Test public void testDecisionTableHitPolicyAnyWithOverlap_NoOverlap() { final DMNResult dmnResult = executeHitPolicyAnyWithOverlap(-1); - assertThat(dmnResult.hasErrors(), is(false)); - assertThat(dmnResult.getDecisionResultByName("a decision").getResult(), is("boh")); + assertThat(dmnResult.hasErrors()).isFalse(); + assertThat(dmnResult.getDecisionResultByName("a decision").getResult()).isEqualTo("boh"); } private DMNResult executeHitPolicyAnyWithOverlap(long number) { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("hitpolicyAnyWithOverlap.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("http://www.trisotech.com/definitions/_84872d6e-44c2-4c7c-a5b1-46be7b672fc8", "Drawing 1"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); final DMNContext context = DMNFactory.newContext(); context.set("a number", number); @@ -400,14 +387,17 @@ private DMNResult executeHitPolicyAnyWithOverlap(long number) { public void testShortCircuitFIRST() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntime("First DT not stopping.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("http://www.trisotech.com/definitions/_e56151c4-d522-4974-88e8-f6c88ffaaba4", "Drawing 1"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); final DMNContext emptyContext = DMNFactory.newContext(); final DMNResult dmnResult = runtime.evaluateAll(dmnModel, emptyContext); LOG.debug("{}", dmnResult); - assertThat(dmnResult.hasErrors(), is(false)); + assertThat(dmnResult.hasErrors()).isFalse(); final DMNContext result = dmnResult.getContext(); - Assertions.assertThat(result.getAll()).extracting("First Decision Table.nn abs").isEqualTo(BigDecimal.ZERO); + assertThat((result.getAll())).containsKeys("First Decision Table"); + final Map decisionTable = (Map) result.get("First Decision Table"); + + assertThat(decisionTable).containsEntry("nn abs", BigDecimal.ZERO); } } diff --git a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/internal/utils/DRGAnalysisUtilsTest.java b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/internal/utils/DRGAnalysisUtilsTest.java index bee337ac497..5177ac976f8 100644 --- a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/internal/utils/DRGAnalysisUtilsTest.java +++ b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/internal/utils/DRGAnalysisUtilsTest.java @@ -16,10 +16,15 @@ package org.kie.dmn.core.internal.utils; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; + import java.util.Collection; import java.util.stream.Collectors; -import org.assertj.core.api.Assertions; import org.junit.Test; import org.kie.dmn.api.core.DMNModel; import org.kie.dmn.api.core.DMNRuntime; @@ -30,11 +35,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.assertj.core.api.Assertions.assertThat; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; - public class DRGAnalysisUtilsTest { public static final Logger LOG = LoggerFactory.getLogger(DRGAnalysisUtilsTest.class); @@ -60,7 +60,7 @@ public void testCH11usingDMN13() throws Exception { assertThat(reqMonthlyInstallment.stream().filter(d -> d.getDependency().getName().equals("Requested product")).findFirst()).isPresent().get().hasFieldOrPropertyWithValue("degree", 0); assertThat(reqMonthlyInstallment.stream().filter(d -> d.getDependency().getName().equals("PMT")).findFirst()).isPresent().get().hasFieldOrPropertyWithValue("degree", 1); - Assertions.assertThatThrownBy(() -> DRGAnalysisUtils.inputDataOfDecision(dmnModel, "Routing rules")).isInstanceOf(IllegalArgumentException.class); + assertThatThrownBy(() -> DRGAnalysisUtils.inputDataOfDecision(dmnModel, "Routing rules")).isInstanceOf(IllegalArgumentException.class); Collection adjudicationIDs = DRGAnalysisUtils.inputDataOfDecision(dmnModel, "Adjudication"); assertThat(adjudicationIDs).containsExactlyInAnyOrder("Supporting documents", "Bureau data", "Requested product", "Applicant data"); diff --git a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/stronglytyped/AnnotationsTest.java b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/stronglytyped/AnnotationsTest.java index bc84505a3d1..3fb55ce2466 100644 --- a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/stronglytyped/AnnotationsTest.java +++ b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/stronglytyped/AnnotationsTest.java @@ -16,6 +16,8 @@ package org.kie.dmn.core.stronglytyped; +import static org.assertj.core.api.Assertions.assertThat; + import java.lang.reflect.Field; import java.time.Duration; import java.time.LocalDate; @@ -24,9 +26,6 @@ import java.time.Period; import java.util.Arrays; -import com.fasterxml.jackson.databind.json.JsonMapper; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import org.assertj.core.api.Assertions; import org.junit.Test; import org.kie.dmn.api.core.DMNContext; import org.kie.dmn.api.core.DMNModel; @@ -40,9 +39,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; +import com.fasterxml.jackson.databind.json.JsonMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; public class AnnotationsTest extends BaseVariantTest { @@ -58,31 +56,31 @@ public AnnotationsTest(VariantTestConf testConfig) { public void testNSWE() throws Exception { final DMNRuntime runtime = createRuntime("NSEW.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("https://kiegroup.org/dmn/_FBA17BF4-BC04-4C16-9305-40E8B4B2FECB", "NSEW"); - assertThat(dmnModel, notNullValue()); - assertThat(DMNRuntimeUtil.formatMessages(dmnModel.getMessages()), dmnModel.hasErrors(), is(false)); + assertThat(dmnModel).isNotNull(); + assertThat(dmnModel.hasErrors()).withFailMessage(DMNRuntimeUtil.formatMessages(dmnModel.getMessages())).isFalse(); final DMNContext context = DMNFactory.newContext(); context.set("direction", "East"); final DMNResult dmnResult = evaluateModel(runtime, dmnModel, context); LOG.debug("{}", dmnResult); - assertThat(DMNRuntimeUtil.formatMessages(dmnResult.getMessages()), dmnResult.hasErrors(), is(false)); - assertThat(dmnResult.getDecisionResultByName("Decision-1").getResult(), is("You decided to go East.")); + assertThat(dmnModel.hasErrors()).withFailMessage(DMNRuntimeUtil.formatMessages(dmnModel.getMessages())).isFalse(); + assertThat(dmnResult.getDecisionResultByName("Decision-1").getResult()).isEqualTo("You decided to go East."); if (strongly) { Class inputSetClass = getStronglyClassByName(dmnModel, "InputSet"); Field directionAsField = inputSetClass.getDeclaredField("direction"); org.eclipse.microprofile.openapi.annotations.media.Schema ann = directionAsField.getDeclaredAnnotation(org.eclipse.microprofile.openapi.annotations.media.Schema.class); - Assertions.assertThat(ann).isNotNull(); - Assertions.assertThat(ann.enumeration()).isNotNull().contains("North", "South", "East", "West"); + assertThat(ann).isNotNull(); + assertThat(ann.enumeration()).isNotNull().contains("North", "South", "East", "West"); Field definedKeySet = inputSetClass.getDeclaredField("definedKeySet"); org.eclipse.microprofile.openapi.annotations.media.Schema ann2 = definedKeySet.getDeclaredAnnotation(org.eclipse.microprofile.openapi.annotations.media.Schema.class); - Assertions.assertThat(ann2).isNotNull(); - Assertions.assertThat(ann2.hidden()).isTrue(); + assertThat(ann2).isNotNull(); + assertThat(ann2.hidden()).isTrue(); io.swagger.v3.oas.annotations.media.Schema ann3 = definedKeySet.getDeclaredAnnotation(io.swagger.v3.oas.annotations.media.Schema.class); - Assertions.assertThat(ann3).isNotNull(); - Assertions.assertThat(ann3.hidden()).isTrue(); + assertThat(ann3).isNotNull(); + assertThat(ann3.hidden()).isTrue(); } } @@ -90,8 +88,8 @@ public void testNSWE() throws Exception { public void testOneOfEachType() throws Exception { final DMNRuntime runtime = createRuntime("OneOfEachType.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("http://www.trisotech.com/definitions/_4f5608e9-4d74-4c22-a47e-ab657257fc9c", "OneOfEachType"); - assertThat(dmnModel, notNullValue()); - assertThat(DMNRuntimeUtil.formatMessages(dmnModel.getMessages()), dmnModel.hasErrors(), is(false)); + assertThat(dmnModel).isNotNull(); + assertThat(dmnModel.hasErrors()).withFailMessage(DMNRuntimeUtil.formatMessages(dmnModel.getMessages())).isFalse(); // this is already tested for execution/evaluation semantic in its proper test unit, here we check Annotations presence. @@ -108,18 +106,18 @@ public void testOneOfEachType() throws Exception { private void checkAnnOneOfEachType(Class inputSetClass, String fieldName, String name, Class implementation) throws Exception { Field directionAsField = inputSetClass.getDeclaredField(fieldName); org.eclipse.microprofile.openapi.annotations.media.Schema annMP = directionAsField.getDeclaredAnnotation(org.eclipse.microprofile.openapi.annotations.media.Schema.class); - Assertions.assertThat(annMP).isNotNull(); - Assertions.assertThat(annMP.name()).isEqualTo(name); - Assertions.assertThat(annMP.implementation()).isEqualTo(implementation); + assertThat(annMP).isNotNull(); + assertThat(annMP.name()).isEqualTo(name); + assertThat(annMP.implementation()).isEqualTo(implementation); if (implementation == Period.class) { - Assertions.assertThat(annMP.example()).isEqualTo("P1Y2M"); + assertThat(annMP.example()).isEqualTo("P1Y2M"); } io.swagger.v3.oas.annotations.media.Schema annIOSwagger = directionAsField.getDeclaredAnnotation(io.swagger.v3.oas.annotations.media.Schema.class); - Assertions.assertThat(annIOSwagger).isNotNull(); - Assertions.assertThat(annIOSwagger.name()).isEqualTo(name); - Assertions.assertThat(annIOSwagger.implementation()).isEqualTo(implementation); + assertThat(annIOSwagger).isNotNull(); + assertThat(annIOSwagger.name()).isEqualTo(name); + assertThat(annIOSwagger.implementation()).isEqualTo(implementation); if (implementation == Period.class) { - Assertions.assertThat(annIOSwagger.example()).isEqualTo("P1Y2M"); + assertThat(annIOSwagger.example()).isEqualTo("P1Y2M"); } } @@ -127,8 +125,8 @@ private void checkAnnOneOfEachType(Class inputSetClass, String fieldName, Str public void testNextDays() throws Exception { final DMNRuntime runtime = createRuntime("nextDays.dmn", this.getClass()); final DMNModel dmnModel = runtime.getModel("https://kiegroup.org/dmn/_8A1F9719-02AA-4517-97D4-5C4F5D22FE82", "nextDays"); - assertThat(dmnModel, notNullValue()); - assertThat(DMNRuntimeUtil.formatMessages(dmnModel.getMessages()), dmnModel.hasErrors(), is(false)); + assertThat(dmnModel).isNotNull(); + assertThat(dmnModel.hasErrors()).withFailMessage(DMNRuntimeUtil.formatMessages(dmnModel.getMessages())).isFalse(); DMNContext context = DMNFactory.newContext(); if (!isTypeSafe()) { @@ -147,18 +145,18 @@ public void testNextDays() throws Exception { final DMNResult dmnResult = evaluateModel(runtime, dmnModel, context); LOG.debug("{}", dmnResult); - assertThat(DMNRuntimeUtil.formatMessages(dmnResult.getMessages()), dmnResult.hasErrors(), is(false)); - assertThat(dmnResult.getDecisionResultByName("Decision-1").getResult(), is(Arrays.asList(LocalDate.of(2020, 1, 1), LocalDate.of(2020, 2, 22)))); + assertThat(dmnModel.hasErrors()).withFailMessage(DMNRuntimeUtil.formatMessages(dmnModel.getMessages())).isFalse(); + assertThat(dmnResult.getDecisionResultByName("Decision-1").getResult()).asList().contains(LocalDate.of(2020, 1, 1), LocalDate.of(2020, 2, 22)); if (strongly) { Class inputSetClass = getStronglyClassByName(dmnModel, "InputSet"); Field directionAsField = inputSetClass.getDeclaredField("few_32dates"); org.eclipse.microprofile.openapi.annotations.media.Schema annMP = directionAsField.getDeclaredAnnotation(org.eclipse.microprofile.openapi.annotations.media.Schema.class); - Assertions.assertThat(annMP).isNotNull(); - Assertions.assertThat(annMP.type()).isEqualTo(org.eclipse.microprofile.openapi.annotations.enums.SchemaType.ARRAY); + assertThat(annMP).isNotNull(); + assertThat(annMP.type()).isEqualTo(org.eclipse.microprofile.openapi.annotations.enums.SchemaType.ARRAY); io.swagger.v3.oas.annotations.media.Schema annIOSwagger = directionAsField.getDeclaredAnnotation(io.swagger.v3.oas.annotations.media.Schema.class); - Assertions.assertThat(annIOSwagger).isNotNull(); - Assertions.assertThat(annIOSwagger.type()).isEqualTo("array"); + assertThat(annIOSwagger).isNotNull(); + assertThat(annIOSwagger.type()).isEqualTo("array"); } } } diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java index da554136f9f..e4535871cc7 100644 --- a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java +++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java @@ -16,6 +16,8 @@ package org.kie.dmn.feel.jandex; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -33,7 +35,6 @@ import javax.json.bind.JsonbBuilder; import javax.json.bind.JsonbConfig; -import org.assertj.core.api.Assertions; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.Index; @@ -84,7 +85,7 @@ public void testReflectConfigJSON() throws Exception { Set foundsViaJandex = founds.stream().map(ClassInfo::name).collect(Collectors.toSet()); Set foundsViaJSON = dotNamesInJSON.stream().collect(Collectors.toSet()); - Assertions.assertThat(foundsViaJandex) + assertThat(foundsViaJandex) .as("List of classes found via Jandex during test and listed in JSON file must be same.") .isEqualTo(foundsViaJSON) ; diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/functions/interval/FormulasTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/functions/interval/FormulasTest.java index fca9773ca1d..2a4f9f5f814 100644 --- a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/functions/interval/FormulasTest.java +++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/functions/interval/FormulasTest.java @@ -16,7 +16,7 @@ package org.kie.dmn.feel.runtime.functions.interval; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; // ScratchPad to support discussion on https://issues.omg.org/browse/DMN14-125 @@ -79,15 +79,15 @@ static boolean overlapsBefore(R range1, R range2) { @Test public void testOverlapsBeforeFormula() { - Assertions.assertThat(overlapsBefore(new R(true, 1, 5, true), new R(true, 3, 8, true))).isEqualTo(true); - Assertions.assertThat(overlapsBefore(new R(true, 1, 5, true), new R(true, 6, 8, true))).isEqualTo(false); - Assertions.assertThat(overlapsBefore(new R(true, 1, 5, true), new R(true, 5, 8, true))).isEqualTo(true); - Assertions.assertThat(overlapsBefore(new R(true, 1, 5, true), new R(false, 5, 8, true))).isEqualTo(false); - Assertions.assertThat(overlapsBefore(new R(true, 1, 5, false), new R(true, 5, 8, true))).isEqualTo(false); - Assertions.assertThat(overlapsBefore(new R(true, 1, 5, false), new R(false, 1, 5, true))).isEqualTo(true); - Assertions.assertThat(overlapsBefore(new R(true, 1, 5, true), new R(false, 1, 5, true))).isEqualTo(true); - Assertions.assertThat(overlapsBefore(new R(true, 1, 5, false), new R(true, 1, 5, true))).isEqualTo(false); - Assertions.assertThat(overlapsBefore(new R(true, 1, 5, true), new R(true, 1, 5, true))).isEqualTo(false); + assertThat(overlapsBefore(new R(true, 1, 5, true), new R(true, 3, 8, true))).isEqualTo(true); + assertThat(overlapsBefore(new R(true, 1, 5, true), new R(true, 6, 8, true))).isEqualTo(false); + assertThat(overlapsBefore(new R(true, 1, 5, true), new R(true, 5, 8, true))).isEqualTo(true); + assertThat(overlapsBefore(new R(true, 1, 5, true), new R(false, 5, 8, true))).isEqualTo(false); + assertThat(overlapsBefore(new R(true, 1, 5, false), new R(true, 5, 8, true))).isEqualTo(false); + assertThat(overlapsBefore(new R(true, 1, 5, false), new R(false, 1, 5, true))).isEqualTo(true); + assertThat(overlapsBefore(new R(true, 1, 5, true), new R(false, 1, 5, true))).isEqualTo(true); + assertThat(overlapsBefore(new R(true, 1, 5, false), new R(true, 1, 5, true))).isEqualTo(false); + assertThat(overlapsBefore(new R(true, 1, 5, true), new R(true, 1, 5, true))).isEqualTo(false); } static boolean overlaps(R range1, R range2) { @@ -113,20 +113,20 @@ static boolean overlaps(R range1, R range2) { @Test public void testOverlapsFormula() { - Assertions.assertThat( overlaps( new R(true, 1, 5, true ), new R( true, 3, 8, true ) ) ).isEqualTo( true ); - Assertions.assertThat( overlaps( new R(true, 3, 8, true ), new R( true, 1, 5, true ) ) ).isEqualTo( true ); - Assertions.assertThat( overlaps( new R(true, 1, 8, true ), new R( true, 3, 5, true ) ) ).isEqualTo( true ); - Assertions.assertThat( overlaps( new R(true, 3, 5, true ), new R( true, 1, 8, true ) ) ).isEqualTo( true ); - Assertions.assertThat( overlaps( new R(true, 1, 5, true ), new R( true, 6, 8, true ) ) ).isEqualTo( false); - Assertions.assertThat( overlaps( new R(true, 6, 8, true ), new R( true, 1, 5, true ) ) ).isEqualTo( false); - Assertions.assertThat( overlaps( new R(true, 1, 5, true ), new R( true, 5, 8, true ) ) ).isEqualTo( true ); - Assertions.assertThat( overlaps( new R(true, 1, 5, true ), new R( false,5, 8, true ) ) ).isEqualTo( false); - Assertions.assertThat( overlaps( new R(true, 1, 5, false), new R( true, 5, 8, true ) ) ).isEqualTo( false); - Assertions.assertThat( overlaps( new R(true, 1, 5, false), new R( false,5, 8, true ) ) ).isEqualTo( false); - Assertions.assertThat( overlaps( new R(true, 5, 8, true ), new R( true, 1, 5, true ) ) ).isEqualTo( true ); - Assertions.assertThat( overlaps( new R(false,5, 8, true ), new R( true, 1, 5, true ) ) ).isEqualTo( false); - Assertions.assertThat( overlaps( new R(true, 5, 8, true ), new R( true, 1, 5, false) ) ).isEqualTo( false); - Assertions.assertThat( overlaps( new R(false,5, 8, true ), new R( true, 1, 5, false) ) ).isEqualTo( false); + assertThat( overlaps( new R(true, 1, 5, true ), new R( true, 3, 8, true ) ) ).isEqualTo( true ); + assertThat( overlaps( new R(true, 3, 8, true ), new R( true, 1, 5, true ) ) ).isEqualTo( true ); + assertThat( overlaps( new R(true, 1, 8, true ), new R( true, 3, 5, true ) ) ).isEqualTo( true ); + assertThat( overlaps( new R(true, 3, 5, true ), new R( true, 1, 8, true ) ) ).isEqualTo( true ); + assertThat( overlaps( new R(true, 1, 5, true ), new R( true, 6, 8, true ) ) ).isEqualTo( false); + assertThat( overlaps( new R(true, 6, 8, true ), new R( true, 1, 5, true ) ) ).isEqualTo( false); + assertThat( overlaps( new R(true, 1, 5, true ), new R( true, 5, 8, true ) ) ).isEqualTo( true ); + assertThat( overlaps( new R(true, 1, 5, true ), new R( false,5, 8, true ) ) ).isEqualTo( false); + assertThat( overlaps( new R(true, 1, 5, false), new R( true, 5, 8, true ) ) ).isEqualTo( false); + assertThat( overlaps( new R(true, 1, 5, false), new R( false,5, 8, true ) ) ).isEqualTo( false); + assertThat( overlaps( new R(true, 5, 8, true ), new R( true, 1, 5, true ) ) ).isEqualTo( true ); + assertThat( overlaps( new R(false,5, 8, true ), new R( true, 1, 5, true ) ) ).isEqualTo( false); + assertThat( overlaps( new R(true, 5, 8, true ), new R( true, 1, 5, false) ) ).isEqualTo( false); + assertThat( overlaps( new R(false,5, 8, true ), new R( true, 1, 5, false) ) ).isEqualTo( false); } } \ No newline at end of file diff --git a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/AssociationDirectionTest.java b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/AssociationDirectionTest.java index ba814c42ce8..a0d5a5bda63 100644 --- a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/AssociationDirectionTest.java +++ b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/AssociationDirectionTest.java @@ -16,10 +16,10 @@ package org.kie.dmn.model.api; -import org.assertj.core.api.Assertions; -import org.junit.Test; - import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; + +import org.junit.Test; public class AssociationDirectionTest { @@ -28,7 +28,7 @@ public void testFromValue() { assertThat(AssociationDirection.fromValue("None")).isEqualTo(AssociationDirection.NONE); assertThat(AssociationDirection.fromValue("One")).isEqualTo(AssociationDirection.ONE); assertThat(AssociationDirection.fromValue("Both")).isEqualTo(AssociationDirection.BOTH); - Assertions.assertThatIllegalArgumentException().isThrownBy(() -> AssociationDirection.fromValue("asd")); + assertThatIllegalArgumentException().isThrownBy(() -> AssociationDirection.fromValue("asd")); } } diff --git a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/DecisionTableOrientationTest.java b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/DecisionTableOrientationTest.java index 579faa18a80..8450ba507fd 100644 --- a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/DecisionTableOrientationTest.java +++ b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/DecisionTableOrientationTest.java @@ -16,10 +16,10 @@ package org.kie.dmn.model.api; -import org.assertj.core.api.Assertions; -import org.junit.Test; - import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; + +import org.junit.Test; public class DecisionTableOrientationTest { @@ -28,7 +28,7 @@ public void testFromValue() { assertThat(DecisionTableOrientation.fromValue("Rule-as-Row")).isEqualTo(DecisionTableOrientation.RULE_AS_ROW); assertThat(DecisionTableOrientation.fromValue("Rule-as-Column")).isEqualTo(DecisionTableOrientation.RULE_AS_COLUMN); assertThat(DecisionTableOrientation.fromValue("CrossTable")).isEqualTo(DecisionTableOrientation.CROSS_TABLE); - Assertions.assertThatIllegalArgumentException().isThrownBy(() -> DecisionTableOrientation.fromValue("asd")); + assertThatIllegalArgumentException().isThrownBy(() -> DecisionTableOrientation.fromValue("asd")); } } diff --git a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/FunctionKindTest.java b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/FunctionKindTest.java index 71d5dcd5152..e5cafe39177 100644 --- a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/FunctionKindTest.java +++ b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/FunctionKindTest.java @@ -16,10 +16,10 @@ package org.kie.dmn.model.api; -import org.assertj.core.api.Assertions; -import org.junit.Test; - import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; + +import org.junit.Test; public class FunctionKindTest { @@ -29,7 +29,7 @@ public void testFromValue() { assertThat(FunctionKind.fromValue("Java")).isEqualTo(FunctionKind.JAVA); assertThat(FunctionKind.fromValue("JAVA")).isEqualTo(FunctionKind.JAVA); assertThat(FunctionKind.fromValue("PMML")).isEqualTo(FunctionKind.PMML); - Assertions.assertThatIllegalArgumentException().isThrownBy(() -> FunctionKind.fromValue("asd")); + assertThatIllegalArgumentException().isThrownBy(() -> FunctionKind.fromValue("asd")); } } diff --git a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/AlignmentKindTest.java b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/AlignmentKindTest.java index c8f6885e57a..d6b57435c32 100644 --- a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/AlignmentKindTest.java +++ b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/AlignmentKindTest.java @@ -16,10 +16,10 @@ package org.kie.dmn.model.api.dmndi; -import org.assertj.core.api.Assertions; -import org.junit.Test; - import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; + +import org.junit.Test; public class AlignmentKindTest { @@ -28,7 +28,7 @@ public void testFromValue() { assertThat(AlignmentKind.fromValue("start")).isEqualTo(AlignmentKind.START).hasFieldOrPropertyWithValue("value", "start"); assertThat(AlignmentKind.fromValue("end")).isEqualTo(AlignmentKind.END); assertThat(AlignmentKind.fromValue("center")).isEqualTo(AlignmentKind.CENTER); - Assertions.assertThatIllegalArgumentException().isThrownBy(() -> AlignmentKind.fromValue("asd")); + assertThatIllegalArgumentException().isThrownBy(() -> AlignmentKind.fromValue("asd")); } } diff --git a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/KnownColorTest.java b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/KnownColorTest.java index 2368e85e3d1..d8753ef5fd4 100644 --- a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/KnownColorTest.java +++ b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/KnownColorTest.java @@ -16,10 +16,10 @@ package org.kie.dmn.model.api.dmndi; -import org.assertj.core.api.Assertions; -import org.junit.Test; - import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; + +import org.junit.Test; public class KnownColorTest { @@ -42,6 +42,6 @@ public void testFromValue() { assertThat(KnownColor.fromValue("black")).isEqualTo(KnownColor.BLACK); assertThat(KnownColor.fromValue("silver")).isEqualTo(KnownColor.SILVER); assertThat(KnownColor.fromValue("gray")).isEqualTo(KnownColor.GRAY); - Assertions.assertThatIllegalArgumentException().isThrownBy(() -> KnownColor.fromValue("asd")); + assertThatIllegalArgumentException().isThrownBy(() -> KnownColor.fromValue("asd")); } } diff --git a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java index 60d6189049f..4ff6dbf9947 100644 --- a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java +++ b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java @@ -16,6 +16,8 @@ package org.kie.dmn.model.jandex; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -33,7 +35,6 @@ import javax.json.bind.JsonbBuilder; import javax.json.bind.JsonbConfig; -import org.assertj.core.api.Assertions; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; import org.jboss.jandex.Index; @@ -76,7 +77,7 @@ public void testReflectConfigJSON() throws Exception { Set foundsViaJandex = founds.stream().map(ClassInfo::name).collect(Collectors.toSet()); Set foundsViaJSON = dotNamesInJSON.stream().collect(Collectors.toSet()); - Assertions.assertThat(foundsViaJandex) + assertThat(foundsViaJandex) .as("List of classes found via Jandex during test and listed in JSON file must be same.") .isEqualTo(foundsViaJSON) ; diff --git a/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/FEELSchemaEnumTest.java b/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/FEELSchemaEnumTest.java index 1b9944a5b91..1f8fe6ee16c 100644 --- a/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/FEELSchemaEnumTest.java +++ b/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/FEELSchemaEnumTest.java @@ -16,10 +16,11 @@ package org.kie.dmn.openapi; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.List; -import org.assertj.core.api.Assertions; import org.junit.Test; import org.kie.dmn.feel.runtime.Range; import org.kie.dmn.feel.runtime.Range.RangeBoundary; @@ -34,7 +35,7 @@ public void testBasic() { list.add(new RangeImpl(RangeBoundary.CLOSED, 0, null, RangeBoundary.CLOSED)); list.add(new RangeImpl(RangeBoundary.CLOSED, null, 100, RangeBoundary.CLOSED)); Range result = FEELSchemaEnum.consolidateRanges(list); - Assertions.assertThat(result).isNotNull().isEqualTo(new RangeImpl(RangeBoundary.CLOSED, 0, 100, RangeBoundary.CLOSED)); + assertThat(result).isNotNull().isEqualTo(new RangeImpl(RangeBoundary.CLOSED, 0, 100, RangeBoundary.CLOSED)); } @Test @@ -43,7 +44,7 @@ public void testInvalidRepeatedLB() { list.add(new RangeImpl(RangeBoundary.CLOSED, 0, null, RangeBoundary.CLOSED)); list.add(new RangeImpl(RangeBoundary.CLOSED, 0, 100, RangeBoundary.CLOSED)); Range result = FEELSchemaEnum.consolidateRanges(list); - Assertions.assertThat(result).isNull(); + assertThat(result).isNull(); } @Test @@ -52,6 +53,6 @@ public void testInvalidRepeatedUB() { list.add(new RangeImpl(RangeBoundary.CLOSED, null, 50, RangeBoundary.CLOSED)); list.add(new RangeImpl(RangeBoundary.CLOSED, null, 100, RangeBoundary.CLOSED)); Range result = FEELSchemaEnum.consolidateRanges(list); - Assertions.assertThat(result).isNull(); + assertThat(result).isNull(); } } diff --git a/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/ProcessItemTest.java b/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/ProcessItemTest.java index b80ac229114..c56ce4d48a9 100644 --- a/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/ProcessItemTest.java +++ b/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/ProcessItemTest.java @@ -16,9 +16,11 @@ package org.kie.dmn.openapi; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + import java.io.IOException; -import org.assertj.core.api.Assertions; import org.junit.Test; import org.kie.dmn.api.core.DMNModel; import org.kie.dmn.api.core.DMNRuntime; @@ -27,8 +29,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.networknt.schema.JsonSchema; -import static org.assertj.core.api.Assertions.assertThat; - public class ProcessItemTest extends BaseDMNOASTest { @Test @@ -79,7 +79,7 @@ public void test_together() throws Exception { @Test public void test_Colliding() { final DMNRuntime runtime = createRuntimeWithAdditionalResources("processItem.dmn", this.getClass(), "processItemCollidingNS.dmn"); - Assertions.assertThatExceptionOfType(IllegalStateException.class) + assertThatExceptionOfType(IllegalStateException.class) .isThrownBy(() -> DMNOASGeneratorFactory.generator(runtime.getModels()).build()) .withMessageContaining("processItem") // name of the 1st DMN Model .withMessageContaining("processItemCollidingNS"); // name of the 2nd DMN Model diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNKMeansModelPMMLTest.java b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNKMeansModelPMMLTest.java index 986e2701c87..7ca87b546dc 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNKMeansModelPMMLTest.java +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNKMeansModelPMMLTest.java @@ -16,7 +16,10 @@ package org.kie.dmn.pmml; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Map; + import org.junit.Test; import org.kie.dmn.api.core.DMNContext; import org.kie.dmn.api.core.DMNModel; @@ -27,8 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Map; - public abstract class DMNKMeansModelPMMLTest { private static final Logger LOG = LoggerFactory.getLogger(DMNKMeansModelPMMLTest.class); @@ -42,13 +43,13 @@ public void testKMeans() { "test_kmeans.pmml"); dmnModel = runtime.getModel("https://kiegroup.org/dmn/_51A1FD67-8A67-4332-9889-B718BE8B7456", "KMeansDMN"); - Assertions.assertThat(dmnModel).isNotNull(); - Assertions.assertThat(dmnModel.hasErrors()).isFalse(); + assertThat(dmnModel).isNotNull(); + assertThat(dmnModel.hasErrors()).isFalse(); - Assertions.assertThat(findCluster(5, 5)).isEqualTo("4"); - Assertions.assertThat(findCluster(5, -5)).isEqualTo("1"); - Assertions.assertThat(findCluster(-5, 5)).isEqualTo("3"); - Assertions.assertThat(findCluster(-5, -5)).isEqualTo("2"); + assertThat(findCluster(5, 5)).isEqualTo("4"); + assertThat(findCluster(5, -5)).isEqualTo("1"); + assertThat(findCluster(-5, 5)).isEqualTo("3"); + assertThat(findCluster(-5, -5)).isEqualTo("2"); } private String findCluster(final int x, final int y) { @@ -58,8 +59,8 @@ private String findCluster(final int x, final int y) { final DMNResult dmnResult = runtime.evaluateAll(dmnModel, dmnContext); LOG.debug("{}", dmnResult); - Assertions.assertThat(dmnResult.hasErrors()).isFalse(); - Assertions.assertThat(dmnResult.getDecisionResultByName("Decision1").getResult()).isNotNull(); + assertThat(dmnResult.hasErrors()).isFalse(); + assertThat(dmnResult.getDecisionResultByName("Decision1").getResult()).isNotNull(); final Map decisionResult = (Map) dmnResult.getDecisionResultByName("Decision1").getResult(); final String clusterName = (String) decisionResult.get("predictedValue"); diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNMiningModelPMMLTest.java b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNMiningModelPMMLTest.java index 59749125bd9..ec321ccc53b 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNMiningModelPMMLTest.java +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNMiningModelPMMLTest.java @@ -16,7 +16,10 @@ package org.kie.dmn.pmml; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + +import java.math.BigDecimal; + import org.junit.Test; import org.kie.dmn.api.core.DMNContext; import org.kie.dmn.api.core.DMNModel; @@ -27,8 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.math.BigDecimal; - public abstract class DMNMiningModelPMMLTest { public static final Logger LOG = LoggerFactory.getLogger(DMNMiningModelPMMLTest.class); @@ -40,19 +41,19 @@ public void testMiningModelSum() { "test_mining_model_summed.pmml"); - Assertions.assertThat(evaluateMiningModelDecision(runtime, 10, 10, 10)) + assertThat(evaluateMiningModelDecision(runtime, 10, 10, 10)) .isEqualTo(new BigDecimal(2070)); - Assertions.assertThat(evaluateMiningModelDecision(runtime, 200, -1, 2)) + assertThat(evaluateMiningModelDecision(runtime, 200, -1, 2)) .isEqualTo(new BigDecimal(-299)); - Assertions.assertThat(evaluateMiningModelDecision(runtime, 90, 2, 4)) + assertThat(evaluateMiningModelDecision(runtime, 90, 2, 4)) .isEqualTo(new BigDecimal(17040)); } private BigDecimal evaluateMiningModelDecision(final DMNRuntime runtime, final double input1, final double input2, final double input3) { final DMNModel dmnModel = runtime.getModel("https://kiegroup.org/dmn/_0E8EC382-BB89-4877-8D37-A59B64285F05", "MiningModelDMN"); - Assertions.assertThat(dmnModel).isNotNull(); - Assertions.assertThat(dmnModel.hasErrors()).isFalse(); + assertThat(dmnModel).isNotNull(); + assertThat(dmnModel.hasErrors()).isFalse(); final DMNContext dmnContext = DMNFactory.newContext(); dmnContext.set("input1", input1); @@ -61,11 +62,11 @@ private BigDecimal evaluateMiningModelDecision(final DMNRuntime runtime, final d final DMNResult dmnResult = runtime.evaluateAll(dmnModel, dmnContext); LOG.debug("{}", dmnResult); - Assertions.assertThat(dmnResult.hasErrors()).isFalse(); + assertThat(dmnResult.hasErrors()).isFalse(); final DMNContext resultContext = dmnResult.getContext(); - Assertions.assertThat(resultContext).isNotNull(); - Assertions.assertThat(resultContext.get("Decision")).isInstanceOf(BigDecimal.class); + assertThat(resultContext).isNotNull(); + assertThat(resultContext.get("Decision")).isInstanceOf(BigDecimal.class); final BigDecimal result = (BigDecimal) resultContext.get("Decision"); return result; diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNaiveBayesPMMLTest.java b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNaiveBayesPMMLTest.java index fc3d2fe0495..e3a679a2018 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNaiveBayesPMMLTest.java +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNaiveBayesPMMLTest.java @@ -16,7 +16,10 @@ package org.kie.dmn.pmml; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Map; + import org.junit.Test; import org.kie.dmn.api.core.DMNContext; import org.kie.dmn.api.core.DMNModel; @@ -27,8 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Map; - public abstract class DMNNaiveBayesPMMLTest { private static final Logger LOG = LoggerFactory.getLogger(DMNNaiveBayesPMMLTest.class); @@ -42,14 +43,14 @@ public void testKMeans() { "test_naive_bayes.pmml"); dmnModel = runtime.getModel("https://kiegroup.org/dmn/_51A1FD67-8A67-4332-9889-B718BE8B7456", "NaiveBayesDMN"); - Assertions.assertThat(dmnModel).isNotNull(); - Assertions.assertThat(dmnModel.hasErrors()).isFalse(); + assertThat(dmnModel).isNotNull(); + assertThat(dmnModel.hasErrors()).isFalse(); - Assertions.assertThat(evaluateNaiveBayes(5.7, 3.8, 1.7, 0.3)) + assertThat(evaluateNaiveBayes(5.7, 3.8, 1.7, 0.3)) .isEqualTo("setosa"); - Assertions.assertThat(evaluateNaiveBayes(6.4, 2.8, 5.6, 2.1)) + assertThat(evaluateNaiveBayes(6.4, 2.8, 5.6, 2.1)) .isEqualTo("virginica"); - Assertions.assertThat(evaluateNaiveBayes(5.7, 2.9, 4.2, 1.3)) + assertThat(evaluateNaiveBayes(5.7, 2.9, 4.2, 1.3)) .isEqualTo("versicolor"); } @@ -63,8 +64,8 @@ private String evaluateNaiveBayes(final double sepalLength, final double sepalWi final DMNResult dmnResult = runtime.evaluateAll(dmnModel, dmnContext); LOG.debug("{}", dmnResult); - Assertions.assertThat(dmnResult.hasErrors()).isFalse(); - Assertions.assertThat(dmnResult.getDecisionResultByName("Decision1").getResult()).isNotNull(); + assertThat(dmnResult.hasErrors()).isFalse(); + assertThat(dmnResult.getDecisionResultByName("Decision1").getResult()).isNotNull(); final Map decisionResult = (Map) dmnResult.getDecisionResultByName("Decision1").getResult(); final String predictedClassName = (String) decisionResult.get("Predicted_Species"); diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNeuralNetworkPMMLTest.java b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNeuralNetworkPMMLTest.java index b358f06f9d0..244331dede3 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNeuralNetworkPMMLTest.java +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNeuralNetworkPMMLTest.java @@ -16,7 +16,10 @@ package org.kie.dmn.pmml; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Map; + import org.junit.Test; import org.kie.dmn.api.core.DMNContext; import org.kie.dmn.api.core.DMNModel; @@ -27,8 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Map; - public abstract class DMNNeuralNetworkPMMLTest { private static final Logger LOG = LoggerFactory.getLogger(DMNNeuralNetworkPMMLTest.class); @@ -44,14 +45,14 @@ public void testNeuralNetworks() { dmnModel = runtime.getModel("https://kiegroup.org/dmn/_51A1FD67-8A67-4332-9889-B718BE8B7456", "NeuralNetworkDMN"); - Assertions.assertThat(dmnModel).isNotNull(); - Assertions.assertThat(dmnModel.hasErrors()).isFalse(); + assertThat(dmnModel).isNotNull(); + assertThat(dmnModel.hasErrors()).isFalse(); - Assertions.assertThat(evaluateNeuralNetwork(5.7, 3.8, 1.7, 0.3)) + assertThat(evaluateNeuralNetwork(5.7, 3.8, 1.7, 0.3)) .isEqualTo("setosa"); - Assertions.assertThat(evaluateNeuralNetwork(6.4, 2.8, 5.6, 2.1)) + assertThat(evaluateNeuralNetwork(6.4, 2.8, 5.6, 2.1)) .isEqualTo("virginica"); - Assertions.assertThat(evaluateNeuralNetwork(5.7, 2.9, 4.2, 1.3)) + assertThat(evaluateNeuralNetwork(5.7, 2.9, 4.2, 1.3)) .isEqualTo("versicolor"); } @@ -65,8 +66,8 @@ public String evaluateNeuralNetwork(final double sepalLength, final double sepal final DMNResult dmnResult = runtime.evaluateAll(dmnModel, dmnContext); LOG.debug("{}", dmnResult); - Assertions.assertThat(dmnResult.hasErrors()).isFalse(); - Assertions.assertThat(dmnResult.getDecisionResultByName("Decision1").getResult()).isNotNull(); + assertThat(dmnResult.hasErrors()).isFalse(); + assertThat(dmnResult.getDecisionResultByName("Decision1").getResult()).isNotNull(); final Map decisionResult = (Map) dmnResult.getDecisionResultByName("Decision1").getResult(); final String predictedClassName = (String) decisionResult.get("Predicted_Species"); diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNRegressionPMMLTest.java b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNRegressionPMMLTest.java index 085a458a92d..4bc0ca4f7bc 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNRegressionPMMLTest.java +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNRegressionPMMLTest.java @@ -16,7 +16,10 @@ package org.kie.dmn.pmml; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + +import java.math.BigDecimal; + import org.junit.Test; import org.kie.dmn.api.core.DMNContext; import org.kie.dmn.api.core.DMNModel; @@ -27,8 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.math.BigDecimal; - public abstract class DMNRegressionPMMLTest { public static final Logger LOG = LoggerFactory.getLogger(DMNRegressionPMMLTest.class); @@ -38,17 +39,17 @@ public void testRegression() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntimeWithAdditionalResources("KiePMMLRegression.dmn", DMNRegressionPMMLTest.class, "test_regression.pmml"); - Assertions.assertThat(runtime).isNotNull(); - Assertions.assertThat(evaluateRegressionDecision(runtime, 0.0,0.0, "x")).isEqualTo(BigDecimal.valueOf(-2.5)); - Assertions.assertThat(evaluateRegressionDecision(runtime, 0.0,0.0, "y")).isEqualTo(BigDecimal.valueOf(3.5)); - Assertions.assertThat(evaluateRegressionDecision(runtime, 3.0,2.0, "y")).isEqualTo(BigDecimal.valueOf(52.5)); - Assertions.assertThat(evaluateRegressionDecision(runtime, 5.0,-1.0, "x")).isEqualTo(BigDecimal.valueOf(120.5)); + assertThat(runtime).isNotNull(); + assertThat(evaluateRegressionDecision(runtime, 0.0,0.0, "x")).isEqualTo(BigDecimal.valueOf(-2.5)); + assertThat(evaluateRegressionDecision(runtime, 0.0,0.0, "y")).isEqualTo(BigDecimal.valueOf(3.5)); + assertThat(evaluateRegressionDecision(runtime, 3.0,2.0, "y")).isEqualTo(BigDecimal.valueOf(52.5)); + assertThat(evaluateRegressionDecision(runtime, 5.0,-1.0, "x")).isEqualTo(BigDecimal.valueOf(120.5)); } private BigDecimal evaluateRegressionDecision(final DMNRuntime runtime, final Double fld1, final Double fld2, final String fld3) { final DMNModel dmnModel = runtime.getModel("https://kiegroup.org/dmn/_51A1FD67-8A67-4332-9889-B718BE8B7456", "TestRegressionDMN"); - Assertions.assertThat(dmnModel).isNotNull(); - Assertions.assertThat(dmnModel.hasErrors()).isFalse(); + assertThat(dmnModel).isNotNull(); + assertThat(dmnModel.hasErrors()).isFalse(); final DMNContext dmnContext = DMNFactory.newContext(); dmnContext.set("fld1", fld1); @@ -57,11 +58,11 @@ private BigDecimal evaluateRegressionDecision(final DMNRuntime runtime, final Do final DMNResult dmnResult = runtime.evaluateAll(dmnModel, dmnContext); LOG.debug("{}", dmnResult); - Assertions.assertThat(dmnResult.hasErrors()).isFalse(); + assertThat(dmnResult.hasErrors()).isFalse(); final DMNContext resultContext = dmnResult.getContext(); - Assertions.assertThat(resultContext).isNotNull(); - Assertions.assertThat(resultContext.get("Decision")).isInstanceOf(BigDecimal.class); + assertThat(resultContext).isNotNull(); + assertThat(resultContext.get("Decision")).isInstanceOf(BigDecimal.class); final BigDecimal result = (BigDecimal) resultContext.get("Decision"); return result; diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNTreePMMLTest.java b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNTreePMMLTest.java index 8cf960d7c0b..69e2c710999 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNTreePMMLTest.java +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNTreePMMLTest.java @@ -16,7 +16,8 @@ package org.kie.dmn.pmml; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.Test; import org.kie.dmn.api.core.DMNContext; import org.kie.dmn.api.core.DMNModel; @@ -39,10 +40,10 @@ public void testTreeWithOutput() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntimeWithAdditionalResources("KiePMMLTree.dmn", DMNTreePMMLTest.class, "test_tree.pmml"); - Assertions.assertThat(runtime).isNotNull(); - Assertions.assertThat(evaluateWeatherDecision(runtime, 30, 10)).isEqualTo(SUNGLASSES); - Assertions.assertThat(evaluateWeatherDecision(runtime, 5, 70)).isEqualTo(UMBRELLA); - Assertions.assertThat(evaluateWeatherDecision(runtime, 10, 15)).isEqualTo(NOTHING); + assertThat(runtime).isNotNull(); + assertThat(evaluateWeatherDecision(runtime, 30, 10)).isEqualTo(SUNGLASSES); + assertThat(evaluateWeatherDecision(runtime, 5, 70)).isEqualTo(UMBRELLA); + assertThat(evaluateWeatherDecision(runtime, 10, 15)).isEqualTo(NOTHING); } @Test @@ -50,16 +51,16 @@ public void testTreeWithoutOutput() { final DMNRuntime runtime = DMNRuntimeUtil.createRuntimeWithAdditionalResources("KiePMMLTree_no_output.dmn", DMNTreePMMLTest.class, "test_tree_no_output.pmml"); - Assertions.assertThat(runtime).isNotNull(); - Assertions.assertThat(evaluateWeatherDecision(runtime, 30, 10)).isEqualTo(SUNGLASSES); - Assertions.assertThat(evaluateWeatherDecision(runtime, 5, 70)).isEqualTo(UMBRELLA); - Assertions.assertThat(evaluateWeatherDecision(runtime, 10, 15)).isEqualTo(NOTHING); + assertThat(runtime).isNotNull(); + assertThat(evaluateWeatherDecision(runtime, 30, 10)).isEqualTo(SUNGLASSES); + assertThat(evaluateWeatherDecision(runtime, 5, 70)).isEqualTo(UMBRELLA); + assertThat(evaluateWeatherDecision(runtime, 10, 15)).isEqualTo(NOTHING); } private String evaluateWeatherDecision(final DMNRuntime runtime, final Integer temperature, final Integer humidity) { final DMNModel dmnModel = runtime.getModel("https://kiegroup.org/dmn/_FAA4232D-9D61-4089-BB05-5F5D7C1AECE1", "TestTreeDMN"); - Assertions.assertThat(dmnModel).isNotNull(); - Assertions.assertThat(dmnModel.hasErrors()).isFalse(); + assertThat(dmnModel).isNotNull(); + assertThat(dmnModel.hasErrors()).isFalse(); final DMNContext dmnContext = DMNFactory.newContext(); dmnContext.set("temperature", temperature); @@ -67,13 +68,13 @@ private String evaluateWeatherDecision(final DMNRuntime runtime, final Integer t final DMNResult dmnResult = runtime.evaluateAll(dmnModel, dmnContext); LOG.debug("{}", dmnResult); - Assertions.assertThat(dmnResult.hasErrors()).isFalse(); + assertThat(dmnResult.hasErrors()).isFalse(); final DMNContext resultContext = dmnResult.getContext(); - Assertions.assertThat(resultContext).isNotNull(); - Assertions.assertThat(resultContext.get("Decision")).isInstanceOf(String.class); + assertThat(resultContext).isNotNull(); + assertThat(resultContext.get("Decision")).isInstanceOf(String.class); final String weatherDecision = (String) resultContext.get("Decision"); - Assertions.assertThat(weatherDecision).isNotNull(); + assertThat(weatherDecision).isNotNull(); return weatherDecision; } diff --git a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/AbstractValidatorTest.java b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/AbstractValidatorTest.java index b8402430609..adebf6d7af9 100644 --- a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/AbstractValidatorTest.java +++ b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/AbstractValidatorTest.java @@ -60,6 +60,7 @@ public static void init() { @AfterClass public static void dispose() { + if (validator != null) validator.dispose(); } diff --git a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/ValidatorTest.java b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/ValidatorTest.java index 84835c821ae..f89494a7af9 100644 --- a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/ValidatorTest.java +++ b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/ValidatorTest.java @@ -16,11 +16,7 @@ package org.kie.dmn.validation; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThan; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.kie.dmn.validation.DMNValidator.Validation.VALIDATE_COMPILATION; @@ -34,7 +30,6 @@ import java.net.URISyntaxException; import java.util.List; -import org.assertj.core.api.Assertions; import org.junit.Ignore; import org.junit.Test; import org.kie.api.builder.Message.Level; @@ -60,10 +55,10 @@ public class ValidatorTest extends AbstractValidatorTest { public void testDryRun() { DMNRuntime runtime = DMNRuntimeUtil.createRuntime( "0001-input-data-string.dmn", DMNInputRuntimeTest.class ); DMNModel dmnModel = runtime.getModel( "https://github.com/kiegroup/drools/kie-dmn", "_0001-input-data-string" ); - assertThat( dmnModel, notNullValue() ); + assertThat(dmnModel).isNotNull(); Definitions definitions = dmnModel.getDefinitions(); - assertThat( definitions, notNullValue() ); + assertThat(dmnModel).isNotNull(); DMNValidatorFactory.newValidator().validate(definitions); } @@ -72,21 +67,21 @@ public void testDryRun() { public void testMACDInputDefinitions() { DMNRuntime runtime = DMNRuntimeUtil.createRuntime( "MACD-enhanced_iteration.dmn", DMNInputRuntimeTest.class ); DMNModel dmnModel = runtime.getModel( "http://www.trisotech.com/definitions/_6cfe7d88-6741-45d1-968c-b61a597d0964", "MACD-enhanced iteration" ); - assertThat( dmnModel, notNullValue() ); + assertThat(dmnModel).isNotNull(); Definitions definitions = dmnModel.getDefinitions(); - assertThat( definitions, notNullValue() ); + assertThat(dmnModel).isNotNull(); List messages = DMNValidatorFactory.newValidator().validate(definitions, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( messages.toString(), messages.size(), is( 0 ) ); + assertThat(messages).withFailMessage(messages.toString()).hasSizeGreaterThan(0); } @Test public void testMACDInputReader() throws IOException { try (final Reader reader = new InputStreamReader(getClass().getResourceAsStream("/org/kie/dmn/core/MACD-enhanced_iteration.dmn") )) { List messages = DMNValidatorFactory.newValidator().validate(reader, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( messages.toString(), messages.size(), is( 0 ) ); + assertThat(messages).withFailMessage(messages.toString()).hasSize(0); } } @@ -103,7 +98,7 @@ private Definitions utilDefinitions(String filename, String modelName) { DMNMarshaller marshaller = DMNMarshallerFactory.newDefaultMarshaller(); try( InputStreamReader isr = new InputStreamReader( getClass().getResourceAsStream( filename ) ) ) { Definitions definitions = marshaller.unmarshal( isr ); - assertThat( definitions, notNullValue() ); + assertThat(definitions).isNotNull(); return definitions; } catch ( IOException e ) { e.printStackTrace(); @@ -115,28 +110,28 @@ private Definitions utilDefinitions(String filename, String modelName) { @Test public void testInvalidXml() throws URISyntaxException { List validateXML = validator.validate( new File(this.getClass().getResource( "invalidXml.dmn" ).toURI()), DMNValidator.Validation.VALIDATE_SCHEMA); - assertThat( ValidatorUtil.formatMessages( validateXML ), validateXML.size(), is( 1 ) ); - assertThat( validateXML.get( 0 ).toString(), validateXML.get( 0 ).getMessageType(), is( DMNMessageType.FAILED_XML_VALIDATION ) ); - assertThat( validateXML.get(0).getPath(), containsString("invalidXml.dmn") ); + assertThat(validateXML).withFailMessage(ValidatorUtil.formatMessages(validateXML)).hasSize(1); + assertThat(validateXML.get( 0 ).getMessageType()).withFailMessage(validateXML.get( 0 ).toString()).isEqualTo(DMNMessageType.FAILED_XML_VALIDATION); + assertThat( validateXML.get(0).getPath()).contains("invalidXml.dmn"); } @Test public void testINVOCATION_MISSING_EXPR() { List validate = validator.validate( getReader( "INVOCATION_MISSING_EXPR.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), greaterThan(0)); - assertThat( validate.get( 0 ).toString(), validate.get( 0 ).getMessageType(), is( DMNMessageType.MISSING_EXPRESSION ) ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSizeGreaterThan(0); + assertThat(validate.get(0).getMessageType()).withFailMessage(validate.get(0).toString()).isEqualTo(DMNMessageType.MISSING_EXPRESSION); } @Test public void testNAME_IS_VALID() { List validate = validator.validate( getReader( "NAME_IS_VALID.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.size(), is( 0 ) ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(0); } @Test public void testNAME_INVALID_empty_name() { List validate = validator.validate( getReader( "DROOLS-1447.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.size(), is( 4 ) ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(4); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.FAILED_XML_VALIDATION ) ) ); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.VARIABLE_NAME_MISMATCH ) ) ); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.INVALID_NAME ) && p.getSourceId().equals( "_5e43b55c-888e-443c-b1b9-80e4aa6746bd" ) ) ); @@ -146,21 +141,21 @@ public void testNAME_INVALID_empty_name() { @Test public void testDRGELEM_NOT_UNIQUE() { List validate = validator.validate( getReader( "DRGELEM_NOT_UNIQUE.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.size(), is( 2 ) ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(2); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.DUPLICATE_NAME ) ) ); } @Test public void testFORMAL_PARAM_DUPLICATED() { List validate = validator.validate( getReader( "FORMAL_PARAM_DUPLICATED.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.size(), is( 3 ) ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(3); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.DUPLICATED_PARAM ) ) ); } @Test public void testINVOCATION_INCONSISTENT_PARAM_NAMES() { List validate = validator.validate( getReader( "INVOCATION_INCONSISTENT_PARAM_NAMES.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), greaterThan(0)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSizeGreaterThan(0); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.PARAMETER_MISMATCH ) ) ); } @@ -184,21 +179,21 @@ public void testINVOCATION_MISSING_TARGETRbis() { @Test public void testINVOCATION_WRONG_PARAM_COUNT() { List validate = validator.validate( getReader( "INVOCATION_WRONG_PARAM_COUNT.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), greaterThan(0)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSizeGreaterThan(0); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.PARAMETER_MISMATCH ) ) ); } @Test public void testITEMCOMP_DUPLICATED() { List validate = validator.validate( getReader( "ITEMCOMP_DUPLICATED.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.size(), is( 2 ) ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(2); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.DUPLICATED_ITEM_DEF ) ) ); } @Test public void testITEMDEF_NOT_UNIQUE() { List validate = validator.validate( getReader( "ITEMDEF_NOT_UNIQUE.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.size(), is( 2 ) ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(2); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.DUPLICATED_ITEM_DEF ) ) ); } @@ -206,20 +201,20 @@ public void testITEMDEF_NOT_UNIQUE() { public void testITEMDEF_NOT_UNIQUE_DROOLS_1450() { // DROOLS-1450 List validate = validator.validate( getReader( "ITEMDEF_NOT_UNIQUE_DROOLS-1450.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.size(), is( 0 ) ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(0); } @Test public void testRELATION_DUP_COLUMN() { List validate = validator.validate( getReader( "RELATION_DUP_COLUMN.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.size(), is( 2 ) ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(2); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.DUPLICATED_RELATION_COLUMN ) ) ); } @Test public void testRELATION_ROW_CELL_NOTLITERAL() { List validate = validator.validate( getReader( "RELATION_ROW_CELL_NOTLITERAL.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.size(), is( 2 ) ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(2); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.RELATION_CELL_NOT_LITERAL ) ) ); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.MISSING_EXPRESSION ) ) ); } @@ -227,7 +222,7 @@ public void testRELATION_ROW_CELL_NOTLITERAL() { @Test public void testRELATION_ROW_CELLCOUNTMISMATCH() { List validate = validator.validate( getReader( "RELATION_ROW_CELLCOUNTMISMATCH.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.size(), is( 1 ) ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(1); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.RELATION_CELL_COUNT_MISMATCH ) ) ); } @@ -236,28 +231,28 @@ public void testMortgageRecommender() { // This file has a gazillion errors. The goal of this test is simply check that the validator itself is not blowing up // and raising an exception. The errors in the file itself are irrelevant. List validate = validator.validate( getReader( "MortgageRecommender.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.isEmpty(), is( false ) ); + assertThat(validate.isEmpty()).withFailMessage(ValidatorUtil.formatMessages(validate)).isFalse(); } @Test public void testREQAUTH_NOT_KNOWLEDGESOURCEbis() { // DROOLS-1435 List validate = validator.validate( getReader( "REQAUTH_NOT_KNOWLEDGESOURCEbis.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.size(), is( 1 ) ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(1); } @Test public void testVARIABLE_LEADING_TRAILING_SPACES() { List validate = validator.validate( getReader( "VARIABLE_LEADING_TRAILING_SPACES.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.size(), is( 1 ) ); - assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.INVALID_NAME ) ) ); - assertThat( validate.get(0).getSourceId(), is("_dd662d27-7896-42cb-9d14-bd74203bdbec") ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(1); + assertTrue(validate.stream().anyMatch(p -> p.getMessageType().equals( DMNMessageType.INVALID_NAME))); + assertThat(validate.get(0).getSourceId()).isEqualTo("_dd662d27-7896-42cb-9d14-bd74203bdbec"); } @Test public void testUNKNOWN_VARIABLE() { List validate = validator.validate( getReader( "UNKNOWN_VARIABLE.dmn" ), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.size(), is( 1 ) ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(1); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.ERR_COMPILING_FEEL ) ) ); } @@ -267,13 +262,13 @@ public void testUNKNOWN_OPERATOR() { VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.size(), greaterThan( 0 ) ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSizeGreaterThan(0); } @Test public void testVALIDATION() { List validate = validator.validate( getReader( "validation.dmn" ), VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat( ValidatorUtil.formatMessages( validate ), validate.size(), is( 5 ) ); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(5); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.INVALID_NAME ) ) ); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.MISSING_TYPE_REF ) ) ); assertTrue( validate.stream().anyMatch( p -> p.getMessageType().equals( DMNMessageType.MISSING_EXPRESSION ) ) ); @@ -286,21 +281,21 @@ public void testVALIDATION() { public void testUsingSemanticNamespacePrefix() { // DROOLS-2419 List validate = validator.validate(getReader("UsingSemanticNS.dmn"), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(0)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(0); } @Test public void testUsingSemanticNamespacePrefixAndExtensions() { // DROOLS-2447 List validate = validator.validate(getReader("Hello_World_semantic_namespace_with_extensions.dmn"), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(0)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(0); } @Test public void testNoPrefixAndExtensions() { // DROOLS-2447 List validate = validator.validate(getReader("Hello_World_no_prefix_with_extensions.dmn"), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(0)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(0); } @Test @@ -308,20 +303,20 @@ public void testRelationwithemptycell() { // DROOLS-2439 DMNRuntime runtime = DMNRuntimeUtil.createRuntime("relation_with_empty_cell.dmn", DMNRuntimeTest.class); DMNModel dmnModel = runtime.getModel("http://www.trisotech.com/dmn/definitions/_99a00903-2943-47df-bab1-a32f276617ea", "Relation with empty cell"); - assertThat(dmnModel, notNullValue()); + assertThat(dmnModel).isNotNull(); Definitions definitions = dmnModel.getDefinitions(); - assertThat(definitions, notNullValue()); + assertThat(dmnModel).isNotNull(); List messages = DMNValidatorFactory.newValidator().validate(definitions, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat(messages.toString(), messages.size(), is(0)); + assertThat(messages).withFailMessage(messages.toString()).hasSize(0); } @Test public void testRelationwithemptycellJustValidator() { // DROOLS-2439 List validate = validator.validate(getReader("relation_with_empty_cell.dmn", DMNRuntimeTest.class), VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(0)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(0); } @Test @@ -338,7 +333,7 @@ public void testDMNv1_2_ch11Modified() { VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(0)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(0); } @Test @@ -347,7 +342,7 @@ public void testDMNv1_2_ch11() { List validate = validator.validate(getReader("DMNv12_ch11.dmn"), VALIDATE_SCHEMA, VALIDATE_MODEL); // DMN v1.2 CH11 example for Adjudication does not define decision logic nor typeRef: - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(2)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(2); assertTrue(validate.stream().anyMatch(p -> p.getMessageType().equals(DMNMessageType.MISSING_TYPE_REF))); assertTrue(validate.stream().anyMatch(p -> p.getLevel() == Level.WARNING && p.getMessageType().equals(DMNMessageType.MISSING_EXPRESSION) && @@ -360,7 +355,7 @@ public void testDecisionServiceCompiler20180830() { List validate = validator.validate(getReader("DecisionServiceABC.dmn", DMNDecisionServicesTest.class), VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(0)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(0); } @Test @@ -371,7 +366,7 @@ public void testDecisionServiceCompiler20180830DMNV12() { VALIDATE_COMPILATION); // DMNMessage{ severity=WARN, type=MISSING_TYPE_REF, message='Variable named 'Decision Service ABC' is missing its type reference on node 'Decision Service ABC'', sourceId='_63d05cff-8e3b-4dad-a355-fd88f8bcd613', exception='', feelEvent=''} - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(1)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(1); assertTrue(validate.stream().anyMatch(p -> p.getMessageType().equals(DMNMessageType.MISSING_TYPE_REF) && p.getSourceId().equals("_63d05cff-8e3b-4dad-a355-fd88f8bcd613"))); } @@ -381,12 +376,12 @@ public void testDecisionService20181008() { List validate = validator.validateUsing(VALIDATE_MODEL, VALIDATE_COMPILATION) .theseModels(getReader("DSWithImport20181008-ModelA.dmn"), getReader("DSWithImport20181008-ModelB.dmn")); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(0)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(0); List missingDMNImport = validator.validateUsing(VALIDATE_MODEL) .theseModels(getReader("DSWithImport20181008-ModelA.dmn"), getReader("DSWithImport20181008-ModelB-missingDMNImport.dmn")); - assertThat(missingDMNImport.stream().filter(p -> p.getMessageType().equals(DMNMessageType.REQ_NOT_FOUND)).count(), is(2L)); // on Decision and Decision Service missing to locate the dependency given Import is omitted. + assertThat(missingDMNImport.stream().filter(p -> p.getMessageType().equals(DMNMessageType.REQ_NOT_FOUND))).hasSize(2); // on Decision and Decision Service missing to locate the dependency given Import is omitted. } @Test @@ -394,7 +389,7 @@ public void testInvalidFunctionNameInvocation() { List validate = validator.validate(getReader("invalidFunctionNameInvocation.dmn"), VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat(validate.stream().filter(p -> p.getLevel() == Level.WARNING && p.getMessageType().equals(DMNMessageType.REQ_NOT_FOUND)).count(), is(1L)); + assertThat(validate.stream().filter(p -> p.getLevel() == Level.WARNING && p.getMessageType().equals(DMNMessageType.REQ_NOT_FOUND))).hasSize(1); } @Test @@ -402,11 +397,10 @@ public void testDecisionNoExpr() { // DROOLS-4765 DMN validation rule alignment for missing expression List validate = validator.validate(getReader("noExpr.dmn", DMNRuntimeTest.class), VALIDATE_MODEL); // this test ensures the WARN for missing expr on the Decision node also applies when using static model validation rules (before compilation) - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(1)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(1); assertThat(validate.stream().filter(p -> p.getLevel() == Level.WARNING && p.getMessageType().equals(DMNMessageType.MISSING_EXPRESSION) && - p.getSourceId().equals("_cdd03786-d1ab-47b5-ba05-df830458dc62")).count(), - is(1L)); + p.getSourceId().equals("_cdd03786-d1ab-47b5-ba05-df830458dc62"))).hasSize(1); } @Test @@ -416,7 +410,7 @@ public void testValidateSchemaAndModels() { VALIDATE_MODEL) .theseModels(getReader("base join.dmn", ImportsTest.class), getReader("use join.dmn", ImportsTest.class)); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(0)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(0); } @Test @@ -425,7 +419,7 @@ public void testDMNv1_3_simple() { VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(0)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(0); } @Test @@ -435,7 +429,7 @@ public void testDMNv1_3_ch11example1() { VALIDATE_COMPILATION) .theseModels(getReader("Financial.dmn", DMN13specificTest.class), getReader("Chapter 11 Example.dmn", DMN13specificTest.class)); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(2)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(2); assertTrue(ValidatorUtil.formatMessages(validate), validate.stream().anyMatch(p -> p.getLevel() == Level.WARNING && p.getMessageType().equals(DMNMessageType.MISSING_EXPRESSION) && @@ -452,7 +446,7 @@ public void testSomethingInBetweenOC() { VALIDATE_MODEL, VALIDATE_COMPILATION) .theseModels(getReader("somethingInBetween.dmn")); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(1)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(1); assertTrue(ValidatorUtil.formatMessages(validate), validate.stream().anyMatch(p -> p.getLevel() == Level.ERROR && p.getMessageType().equals(DMNMessageType.ERR_COMPILING_FEEL) && @@ -466,17 +460,17 @@ public void testDMNv1_3_ch11example2() { VALIDATE_COMPILATION) .theseModels(getReader("Recommended Loan Products.dmn", DMN13specificTest.class), getReader("Loan info.dmn", DMN13specificTest.class)); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(0)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(0); } @Test public void test_dttyperef() { List validate = validator.validate(getReader("wrongxml/dttyperef.dmn"), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(1)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(0); DMNMessage v0 = validate.get(0); - Assertions.assertThat(v0.getLevel()).isEqualTo(Level.ERROR); - Assertions.assertThat(v0.getMessageType()).isEqualTo(DMNMessageType.MISSING_TYPE_REF); - Assertions.assertThat(v0.getSourceId()).isEqualTo("_99FC159F-0D94-45C3-A9BD-F1388017A5D4"); + assertThat(v0.getLevel()).isEqualTo(Level.ERROR); + assertThat(v0.getMessageType()).isEqualTo(DMNMessageType.MISSING_TYPE_REF); + assertThat(v0.getSourceId()).isEqualTo("_99FC159F-0D94-45C3-A9BD-F1388017A5D4"); } @Test @@ -488,7 +482,7 @@ public void testBkmAndBindingWarnLevel() { VALIDATE_COMPILATION); assertTrue(ValidatorUtil.formatMessages(validate), validate.stream().allMatch(p -> p.getLevel() == Level.WARNING)); - assertThat(ValidatorUtil.formatMessages(validate), validate.size(), is(2)); + assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(2); assertTrue(ValidatorUtil.formatMessages(validate), validate.stream().anyMatch(p -> p.getLevel() == Level.WARNING && p.getSourceId() != null && diff --git a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/DMNDTAnalysisExceptionTest.java b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/DMNDTAnalysisExceptionTest.java index e2a2aa41250..28f3281756b 100644 --- a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/DMNDTAnalysisExceptionTest.java +++ b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/DMNDTAnalysisExceptionTest.java @@ -16,7 +16,8 @@ package org.kie.dmn.validation.dtanalysis; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.Test; import org.kie.dmn.model.api.DecisionTable; import org.kie.dmn.model.v1_3.TDecisionTable; @@ -27,6 +28,6 @@ public class DMNDTAnalysisExceptionTest { public void smokeTest() { DecisionTable dtRef = new TDecisionTable(); DMNDTAnalysisException ut = new DMNDTAnalysisException("smoke test", dtRef); - Assertions.assertThat(ut.getDt()).isEqualTo(dtRef); + assertThat(ut.getDt()).isEqualTo(dtRef); } } diff --git a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/IntervalTest.java b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/IntervalTest.java index fedea29ff1b..d3b3d1a82c5 100644 --- a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/IntervalTest.java +++ b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/IntervalTest.java @@ -16,25 +16,19 @@ package org.kie.dmn.validation.dtanalysis; +import static org.assertj.core.api.Assertions.assertThat; + import java.time.LocalDate; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.assertj.core.api.Assertions; import org.junit.Test; import org.kie.dmn.feel.runtime.Range.RangeBoundary; import org.kie.dmn.validation.dtanalysis.model.Bound; import org.kie.dmn.validation.dtanalysis.model.Domain; import org.kie.dmn.validation.dtanalysis.model.Interval; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.startsWith; - public class IntervalTest { @Test @@ -44,7 +38,7 @@ public void testFlatten() { Interval c = new Interval(RangeBoundary.CLOSED, 3, 4, RangeBoundary.CLOSED, 0, 0); List result = Interval.flatten(Arrays.asList(c, b, a)); - assertThat(result, contains(new Interval(RangeBoundary.CLOSED, 0, 4, RangeBoundary.CLOSED, 0, 0))); + assertThat(result).contains(new Interval(RangeBoundary.CLOSED, 0, 4, RangeBoundary.CLOSED, 0, 0)); } @Test @@ -54,8 +48,8 @@ public void testFlatten2() { Interval c = new Interval(RangeBoundary.OPEN, 3, 4, RangeBoundary.CLOSED, 0, 0); List result = Interval.flatten(Arrays.asList(c, b, a)); - assertThat(result, contains(new Interval(RangeBoundary.CLOSED, 0, 3, RangeBoundary.OPEN, 0, 0), - new Interval(RangeBoundary.OPEN, 3, 4, RangeBoundary.CLOSED, 0, 0))); + assertThat(result).contains(new Interval(RangeBoundary.CLOSED, 0, 3, RangeBoundary.OPEN, 0, 0), + new Interval(RangeBoundary.OPEN, 3, 4, RangeBoundary.CLOSED, 0, 0)); } @Test @@ -65,7 +59,7 @@ public void testFlatten3() { Interval c = new Interval(RangeBoundary.CLOSED, 3, 4, RangeBoundary.CLOSED, 0, 0); List result = Interval.flatten(Arrays.asList(c, b, a)); - assertThat(result, contains(new Interval(RangeBoundary.CLOSED, 0, 4, RangeBoundary.CLOSED, 0, 0))); + assertThat(result).contains(new Interval(RangeBoundary.CLOSED, 0, 4, RangeBoundary.CLOSED, 0, 0)); } @Test @@ -74,7 +68,7 @@ public void testInvertOverDomain() { Interval domain = new Interval(RangeBoundary.CLOSED, Interval.NEG_INF, Interval.POS_INF, RangeBoundary.CLOSED, 0, 0); List result = Interval.invertOverDomain(a, domain); - assertThat(result, hasSize(2)); + assertThat(result).hasSize(2); assertInterval(result.get(0), RangeBoundary.CLOSED, Interval.NEG_INF, 0, RangeBoundary.OPEN, 1, 2); assertInterval(result.get(1), RangeBoundary.CLOSED, 3, Interval.POS_INF, RangeBoundary.CLOSED, 1, 2); } @@ -85,16 +79,16 @@ public void testInvertOverDomain2() { Interval domain = new Interval(RangeBoundary.CLOSED, "a", "u", RangeBoundary.CLOSED, 0, 0); List result = Interval.invertOverDomain(a, domain); - assertThat(result, hasSize(2)); + assertThat(result).hasSize(2); assertInterval(result.get(0), RangeBoundary.CLOSED, "a", "i", RangeBoundary.OPEN, 9, 8); assertInterval(result.get(1), RangeBoundary.CLOSED, "o", "u", RangeBoundary.CLOSED, 9, 8); } private static void assertInterval(Interval interval, RangeBoundary lowType, Comparable lowValue, Comparable hiValue, RangeBoundary hiType, int rule, int col) { - assertThat(interval.getLowerBound(), is(new Bound(lowValue, lowType, interval))); - assertThat(interval.getUpperBound(), is(new Bound(hiValue, hiType, interval))); - assertThat(interval.getRule(), is(rule)); - assertThat(interval.getCol(), is(col)); + assertThat(interval.getLowerBound()).isEqualTo(new Bound(lowValue, lowType, interval)); + assertThat(interval.getUpperBound()).isEqualTo(new Bound(hiValue, hiType, interval)); + assertThat(interval.getRule()).isEqualTo(rule); + assertThat(interval.getCol()).isEqualTo(col); } public static class DummyDomain implements Domain { @@ -138,13 +132,13 @@ public void testHumanFriendlyContinuous() { Interval domainInterval = new Interval(RangeBoundary.CLOSED, 0, 100, RangeBoundary.CLOSED, 0, 0); DummyDomain domain = new DummyDomain(domainInterval, Collections.emptyList()); - assertThat(new Interval(RangeBoundary.CLOSED, 1, 100, RangeBoundary.CLOSED, 0, 0).asHumanFriendly(domain), startsWith(">=")); - assertThat(new Interval(RangeBoundary.OPEN , 1, 100, RangeBoundary.CLOSED, 0, 0).asHumanFriendly(domain), startsWith(">")); - assertThat(new Interval(RangeBoundary.OPEN , 1, 100, RangeBoundary.CLOSED, 0, 0).asHumanFriendly(domain), not(startsWith(">="))); + assertThat(new Interval(RangeBoundary.CLOSED, 1, 100, RangeBoundary.CLOSED, 0, 0).asHumanFriendly(domain)).startsWith(">="); + assertThat(new Interval(RangeBoundary.OPEN , 1, 100, RangeBoundary.CLOSED, 0, 0).asHumanFriendly(domain)).startsWith(">"); + assertThat(new Interval(RangeBoundary.OPEN , 1, 100, RangeBoundary.CLOSED, 0, 0).asHumanFriendly(domain)).doesNotStartWith(">="); - assertThat(new Interval(RangeBoundary.CLOSED, 0, 99, RangeBoundary.CLOSED, 0, 0).asHumanFriendly(domain), startsWith("<=")); - assertThat(new Interval(RangeBoundary.CLOSED, 0, 99, RangeBoundary.OPEN , 0, 0).asHumanFriendly(domain), startsWith("<")); - assertThat(new Interval(RangeBoundary.CLOSED, 0, 99, RangeBoundary.OPEN , 0, 0).asHumanFriendly(domain), not(startsWith("<="))); + assertThat(new Interval(RangeBoundary.CLOSED, 0, 99, RangeBoundary.CLOSED, 0, 0).asHumanFriendly(domain)).startsWith("<="); + assertThat(new Interval(RangeBoundary.CLOSED, 0, 99, RangeBoundary.OPEN , 0, 0).asHumanFriendly(domain)).startsWith("<"); + assertThat(new Interval(RangeBoundary.CLOSED, 0, 99, RangeBoundary.OPEN , 0, 0).asHumanFriendly(domain)).doesNotStartWith("<="); } @Test @@ -153,7 +147,7 @@ public void testFlatten4() { Interval b = new Interval(RangeBoundary.CLOSED, LocalDate.parse("2021-04-01"), LocalDate.parse("2021-04-30"), RangeBoundary.CLOSED, 0, 0); List result = Interval.flatten(Arrays.asList(b, a)); - Assertions.assertThat(result).containsExactly(new Interval(RangeBoundary.CLOSED, LocalDate.parse("2021-01-01"), LocalDate.parse("2021-04-30"), RangeBoundary.CLOSED, 0, 0)); + assertThat(result).containsExactly(new Interval(RangeBoundary.CLOSED, LocalDate.parse("2021-01-01"), LocalDate.parse("2021-04-30"), RangeBoundary.CLOSED, 0, 0)); } @Test @@ -162,6 +156,6 @@ public void testNoFlatten() { Interval b = new Interval(RangeBoundary.OPEN, LocalDate.parse("2021-04-01"), LocalDate.parse("2021-04-30"), RangeBoundary.CLOSED, 0, 0); List result = Interval.flatten(Arrays.asList(b, a)); - Assertions.assertThat(result).containsExactly(a, b); + assertThat(result).containsExactly(a, b); } } diff --git a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/model/NullBoundImplTest.java b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/model/NullBoundImplTest.java index 33fc657f968..0bdd6a1c326 100644 --- a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/model/NullBoundImplTest.java +++ b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/model/NullBoundImplTest.java @@ -16,9 +16,10 @@ package org.kie.dmn.validation.dtanalysis.model; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; + import java.math.BigDecimal; -import org.assertj.core.api.Assertions; import org.junit.Test; import org.kie.dmn.feel.runtime.Range; import org.slf4j.Logger; @@ -33,12 +34,12 @@ public class NullBoundImplTest { */ @Test public void test() { - Assertions.assertThatIllegalStateException().isThrownBy(() -> NullBoundImpl.NULL.compareTo(new Bound<>(BigDecimal.ONE, Range.RangeBoundary.CLOSED, null))); - Assertions.assertThatIllegalStateException().isThrownBy(() -> NullBoundImpl.NULL.getValue()); - Assertions.assertThatIllegalStateException().isThrownBy(() -> NullBoundImpl.NULL.getBoundaryType()); - Assertions.assertThatIllegalStateException().isThrownBy(() -> NullBoundImpl.NULL.getParent()); - Assertions.assertThatIllegalStateException().isThrownBy(() -> NullBoundImpl.NULL.isLowerBound()); - Assertions.assertThatIllegalStateException().isThrownBy(() -> NullBoundImpl.NULL.isUpperBound()); + assertThatIllegalStateException().isThrownBy(() -> NullBoundImpl.NULL.compareTo(new Bound<>(BigDecimal.ONE, Range.RangeBoundary.CLOSED, null))); + assertThatIllegalStateException().isThrownBy(() -> NullBoundImpl.NULL.getValue()); + assertThatIllegalStateException().isThrownBy(() -> NullBoundImpl.NULL.getBoundaryType()); + assertThatIllegalStateException().isThrownBy(() -> NullBoundImpl.NULL.getParent()); + assertThatIllegalStateException().isThrownBy(() -> NullBoundImpl.NULL.isLowerBound()); + assertThatIllegalStateException().isThrownBy(() -> NullBoundImpl.NULL.isUpperBound()); } @Test From c5beba8eb42955aec7746730a66bb989e3357256 Mon Sep 17 00:00:00 2001 From: Paolo Bizzarri Date: Wed, 23 Mar 2022 14:16:44 +0100 Subject: [PATCH 2/9] Fix assertj imports for kie-pmml projects --- .../tests/ClusterWithTransformationsTest.java | 36 ++++---- .../tests/EuclideanDistanceTest.java | 7 +- .../tests/MultipleClustersSameClassTest.java | 9 +- .../tests/SingleIrisKMeansClusteringTest.java | 41 ++++----- .../tests/AirconditioningScorecardTest.java | 7 +- .../tests/BasicComplexPartialScoreTest.java | 11 +-- .../CompoundNestedPredicateScorecardTest.java | 11 +-- .../tests/CompoundPredicateScorecardTest.java | 13 +-- .../MultipleAirconditioningScorecardTest.java | 7 +- ...eCompoundNestedPredicateScorecardTest.java | 13 +-- .../tests/NestedComplexPartialScoreTest.java | 11 +-- .../tests/SimpleScorecardCategoricalTest.java | 14 ++-- .../SimpleScorecardMixedVariablesTest.java | 11 +-- .../scorecard/tests/SimpleScorecardTest.java | 14 ++-- ...impleScorecardWithTransformationsTest.java | 41 ++++----- .../tree/tests/BostonHousingDataTreeTest.java | 7 +- .../tree/tests/CompoundPredicateTreeTest.java | 8 +- .../drools/tree/tests/IrisDataTreeTest.java | 7 +- .../tree/tests/PlanActivityTreeTest.java | 17 ++-- .../ReturnLastPredictionStrategyTreeTest.java | 7 +- .../tree/tests/SampleMineTreeModelTest.java | 7 +- ...eMineTreeModelWithTransformationsTest.java | 40 ++++----- .../tests/SimpleClassificationTreeTest.java | 7 +- .../tests/SimpleSetPredicateTreeTest.java | 7 +- .../mining/tests/MiningModelChainTest.java | 7 +- .../mining/tests/MiningModelSummedTest.java | 7 +- .../tests/MiningWithNestedRefersTest.java | 20 ++--- .../pmml/mining/tests/MixedMiningTest.java | 48 +++++------ .../mining/tests/MultipleMixedMiningTest.java | 7 +- .../tests/MultiplePredicatesMiningTest.java | 18 ++-- .../mining/tests/PredicatesMiningTest.java | 18 ++-- .../RandomForestClassifierMiningTest.java | 7 +- ...entationClassificationSelectFirstTest.java | 7 +- .../SegmentationMajorityVoteMiningTest.java | 7 +- .../tests/SegmentationMaxMiningTest.java | 7 +- .../tests/SegmentationMeanMiningTest.java | 7 +- .../tests/SegmentationMedian2MiningTest.java | 7 +- .../tests/SegmentationMedianMiningTest.java | 7 +- .../SegmentationSelectFirstMiningTest.java | 7 +- .../tests/SegmentationSumMiningTest.java | 7 +- .../CategoricalVariablesRegressionTest.java | 9 +- ...gressionSampleWithTransformationsTest.java | 80 +++++++++--------- .../tests/LogisticRegressionIrisDataTest.java | 13 +-- ...gisticRegressionNoneNormalizationTest.java | 13 +-- ...cRegressionSimplemaxNormalizationTest.java | 13 +-- ...ticRegressionSoftmaxNormalizationTest.java | 13 +-- .../tests/LogisticRegressionTest.java | 11 +-- .../tests/MissingDataRegressionTest.java | 9 +- .../tests/MixedVariablesRegressionTest.java | 9 +- ...pleCategoricalVariablesRegressionTest.java | 9 +- .../tests/MultipleLogisticRegressionTest.java | 11 +-- ...cVariablesDecimalAndNegativeCoefsTest.java | 9 +- .../NumericVariablesLinearRegressionTest.java | 9 +- ...ericVariablesPolynomialRegressionTest.java | 9 +- .../tests/OrderApprovalRegressionTest.java | 11 +-- .../tests/PredictorTermRegressionTest.java | 9 +- .../tests/RegressionNormalizationExpTest.java | 9 +- .../RegressionNormalizationLogitTest.java | 9 +- .../RegressionNormalizationSoftmaxTest.java | 9 +- .../tests/AirconditioningScorecardTest.java | 17 ++-- .../tests/BasicComplexPartialScoreTest.java | 11 +-- .../CompoundNestedPredicateScorecardTest.java | 11 +-- .../tests/CompoundPredicateScorecardTest.java | 13 +-- .../MultipleAirconditioningScorecardTest.java | 7 +- ...eCompoundNestedPredicateScorecardTest.java | 13 +-- .../tests/NestedComplexPartialScoreTest.java | 11 +-- .../tests/SimpleScorecardCategoricalTest.java | 84 +++++++++++++++++-- .../SimpleScorecardMixedVariablesTest.java | 11 +-- .../scorecard/tests/SimpleScorecardTest.java | 14 ++-- ...impleScorecardWithTransformationsTest.java | 41 ++++----- .../tree/tests/BostonHousingDataTreeTest.java | 7 +- .../tree/tests/CompoundPredicateTreeTest.java | 8 +- .../models/tree/tests/IrisDataTreeTest.java | 19 +++-- .../ReturnLastPredictionStrategyTreeTest.java | 7 +- .../tree/tests/SampleMineTreeModelTest.java | 7 +- ...eMineTreeModelWithTransformationsTest.java | 41 +++++---- .../tests/SimpleClassificationTreeTest.java | 7 +- .../tests/SimpleSetPredicateTreeTest.java | 7 +- .../pmml/models/tree/tests/TestTreeTest.java | 7 +- 79 files changed, 640 insertions(+), 508 deletions(-) diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/ClusterWithTransformationsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/ClusterWithTransformationsTest.java index 34afa5d2e4b..d49ecfce068 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/ClusterWithTransformationsTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/ClusterWithTransformationsTest.java @@ -16,12 +16,14 @@ package org.kie.pmml.clustering.tests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,8 +33,6 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; -import static org.junit.Assert.assertNotNull; - @RunWith(Parameterized.class) public class ClusterWithTransformationsTest extends AbstractPMMLTest { @@ -95,25 +95,25 @@ public void testClusterWithTransformations() throws Exception { PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(irisClass); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMCONTINUOUS_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMCONTINUOUS_FIELD)).isEqualTo(outNormcontinuousField); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(irisClass); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMCONTINUOUS_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMCONTINUOUS_FIELD)).isEqualTo(outNormcontinuousField); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); if (irisClass.equals("1")) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo(1.0); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo(1.0); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo(0.0); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo(0.0); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); if (sepalLength > 4.7 && sepalLength < 5.2) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); } else if (sepalLength >= 5.6 && sepalLength < 5.9) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); String expected; switch (irisClass) { case "1": @@ -135,9 +135,9 @@ public void testClusterWithTransformations() throws Exception { default: throw new Exception("Unexpected irisClass " + irisClass); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isEqualTo(1.0); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); + assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isEqualTo(1.0); } @Test(expected = KiePMMLException.class) diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/EuclideanDistanceTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/EuclideanDistanceTest.java index 035f87bb120..a2922b98563 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/EuclideanDistanceTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/EuclideanDistanceTest.java @@ -1,11 +1,12 @@ package org.kie.pmml.clustering.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.assertj.core.api.InstanceOfAssertFactories; import org.assertj.core.data.Percentage; import org.junit.BeforeClass; @@ -60,8 +61,8 @@ public void test() { inputData.put("Dimension2", dimension2); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(CLUSTER_ID_FIELD)).isEqualTo(classId); - Assertions.assertThat(pmml4Result.getResultVariables().get(AFFINITY_FIELD)) + assertThat(pmml4Result.getResultVariables().get(CLUSTER_ID_FIELD)).isEqualTo(classId); + assertThat(pmml4Result.getResultVariables().get(AFFINITY_FIELD)) .asInstanceOf(InstanceOfAssertFactories.DOUBLE) .isCloseTo(affinity, Percentage.withPercentage(DOUBLE_VALID_PERCENTAGE)); } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/MultipleClustersSameClassTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/MultipleClustersSameClassTest.java index 9d7db749d23..6aad28bff6a 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/MultipleClustersSameClassTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/MultipleClustersSameClassTest.java @@ -1,11 +1,12 @@ package org.kie.pmml.clustering.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.assertj.core.api.InstanceOfAssertFactories; import org.assertj.core.data.Percentage; import org.junit.BeforeClass; @@ -73,15 +74,15 @@ public void test() { PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(CLUSTER_ID_FIELD)).isEqualTo(classId); - Assertions.assertThat(pmml4Result.getResultVariables().get(CLUSTER_NAME_FIELD)).isEqualTo(className); + assertThat(pmml4Result.getResultVariables().get(CLUSTER_ID_FIELD)).isEqualTo(classId); + assertThat(pmml4Result.getResultVariables().get(CLUSTER_NAME_FIELD)).isEqualTo(className); assertDoubleVariable(pmml4Result, AFFINITY_FIELD, affinity); assertDoubleVariable(pmml4Result, CLUSTER_AFFINITY_FIELD, affinity); } private static void assertDoubleVariable(PMML4Result pmml4Result, String variableName, double expectedValue) { - Assertions.assertThat(pmml4Result.getResultVariables().get(variableName)) + assertThat(pmml4Result.getResultVariables().get(variableName)) .asInstanceOf(InstanceOfAssertFactories.DOUBLE) .isCloseTo(expectedValue, Percentage.withPercentage(DOUBLE_VALID_PERCENTAGE)); } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/SingleIrisKMeansClusteringTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/SingleIrisKMeansClusteringTest.java index 2aa2ecc19a9..61562835caa 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/SingleIrisKMeansClusteringTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/SingleIrisKMeansClusteringTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.clustering.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -106,26 +107,26 @@ public void testLogisticRegressionIrisData() throws Exception { PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(irisClass); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(irisClass); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMCONTINUOUS_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMCONTINUOUS_FIELD)).isEqualTo(outNormcontinuousField); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMCONTINUOUS_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMCONTINUOUS_FIELD)).isEqualTo(outNormcontinuousField); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); if (irisClass.equals("1")) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo(1.0); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo(1.0); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo(0.0); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo(0.0); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); if (sepalLength > 4.7 && sepalLength < 5.2) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); } else if (sepalLength >= 5.6 && sepalLength < 5.9) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); String expected; switch (irisClass) { case "1": @@ -147,15 +148,15 @@ public void testLogisticRegressionIrisData() throws Exception { default: throw new Exception("Unexpected irisClass " + irisClass); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); - Assertions.assertThat(pmml4Result.getResultVariables().get(PREDICTED_CLUSTER_NAME_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(PREDICTED_CLUSTER_NAME_FIELD)).isEqualTo(predictedDisplayValue); + assertThat(pmml4Result.getResultVariables().get(PREDICTED_CLUSTER_NAME_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(PREDICTED_CLUSTER_NAME_FIELD)).isEqualTo(predictedDisplayValue); - Assertions.assertThat(pmml4Result.getResultVariables().get(PREDICTED_CLUSTER_INDEX_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(PREDICTED_CLUSTER_INDEX_FIELD)).isEqualTo(predictedEntityId); + assertThat(pmml4Result.getResultVariables().get(PREDICTED_CLUSTER_INDEX_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(PREDICTED_CLUSTER_INDEX_FIELD)).isEqualTo(predictedEntityId); - Assertions.assertThat(pmml4Result.getResultVariables().get(PREDICTED_CLUSTER_AFFINITY_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(PREDICTED_CLUSTER_AFFINITY_FIELD)).isEqualTo(predictedAffinity); + assertThat(pmml4Result.getResultVariables().get(PREDICTED_CLUSTER_AFFINITY_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(PREDICTED_CLUSTER_AFFINITY_FIELD)).isEqualTo(predictedAffinity); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/AirconditioningScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/AirconditioningScorecardTest.java index 91dacea1776..c3648ad4df1 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/AirconditioningScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/AirconditioningScorecardTest.java @@ -15,12 +15,13 @@ */ package org.kie.pmml.models.drools.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.assertj.core.data.Percentage; import org.junit.BeforeClass; import org.junit.Test; @@ -74,8 +75,8 @@ public void testAirconditioningScorecard() { inputData.put("humidity", humidity); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat((double) (pmml4Result.getResultVariables().get(TARGET_FIELD))) + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat((double) (pmml4Result.getResultVariables().get(TARGET_FIELD))) .isCloseTo(score, Percentage.withPercentage(0.1)); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/BasicComplexPartialScoreTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/BasicComplexPartialScoreTest.java index 0a51d473684..aba54015f0c 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/BasicComplexPartialScoreTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/BasicComplexPartialScoreTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.drools.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; @@ -80,9 +81,9 @@ public void testBasicPartialScore() { inputData.put("input2", input2); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundNestedPredicateScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundNestedPredicateScorecardTest.java index 546a9cd689a..2ada90d7441 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundNestedPredicateScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundNestedPredicateScorecardTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.drools.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -83,9 +84,9 @@ public void testCompoundNestedPredicateScorecard() { inputData.put("input2", input2); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundPredicateScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundPredicateScorecardTest.java index 0cdca4cae97..c93a283af91 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundPredicateScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundPredicateScorecardTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.drools.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -92,10 +93,10 @@ public void testCompoundPredicateScorecard() { inputData.put("input4", input4); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE3_FIELD)).isEqualTo(reasonCode3); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE3_FIELD)).isEqualTo(reasonCode3); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleAirconditioningScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleAirconditioningScorecardTest.java index 3dd5af9f1a1..e4382e9c10f 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleAirconditioningScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleAirconditioningScorecardTest.java @@ -15,12 +15,13 @@ */ package org.kie.pmml.models.drools.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.assertj.core.data.Percentage; import org.junit.BeforeClass; import org.junit.Test; @@ -74,8 +75,8 @@ public void testAirconditioningScorecard() { inputData.put("humidity", humidity); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat((double) (pmml4Result.getResultVariables().get(TARGET_FIELD))) + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat((double) (pmml4Result.getResultVariables().get(TARGET_FIELD))) .isCloseTo(score, Percentage.withPercentage(0.1)); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java index f4b6725312c..0031b281eb5 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.drools.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -82,12 +83,12 @@ public void testCompoundNestedPredicateScorecard() { inputData.put("input1", input1); inputData.put("input2", input2); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result).isNotNull(); + assertThat(pmml4Result).isNotNull(); // Currently unsupported for drools models -// Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); -// Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); -// Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); -// Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); +// assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); +// assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); +// assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); +// assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/NestedComplexPartialScoreTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/NestedComplexPartialScoreTest.java index bc9bec3eb5f..ca9ae027f11 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/NestedComplexPartialScoreTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/NestedComplexPartialScoreTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.drools.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; @@ -80,9 +81,9 @@ public void testNestedComplexPartialScore() { inputData.put("input2", input2); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardCategoricalTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardCategoricalTest.java index a2a9e6a586f..9b95aa11976 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardCategoricalTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardCategoricalTest.java @@ -16,6 +16,9 @@ package org.kie.pmml.models.drools.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertFalse; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -24,7 +27,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.assertj.core.api.Assertions; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -34,8 +36,6 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; -import static org.junit.Assert.assertFalse; - @RunWith(Parameterized.class) public class SimpleScorecardCategoricalTest extends AbstractPMMLTest { @@ -84,10 +84,10 @@ public void testSimpleScorecardCategorical() { inputData.put("input2", input2); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); } @Test diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardMixedVariablesTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardMixedVariablesTest.java index 6aaf7e0c6f5..4f7a8730272 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardMixedVariablesTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardMixedVariablesTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.drools.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -77,9 +78,9 @@ public void testSimpleScorecardMixedVariables() { inputData.put("input2", input2); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardTest.java index d22c35e6c30..179b2208ecf 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardTest.java @@ -16,12 +16,14 @@ package org.kie.pmml.models.drools.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,8 +33,6 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; -import static org.junit.Assert.assertNotNull; - @RunWith(Parameterized.class) public class SimpleScorecardTest extends AbstractPMMLTest { @@ -81,10 +81,10 @@ public void testSimpleScorecard() { inputData.put("input3", 34.1); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); } @Test(expected = KiePMMLException.class) diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardWithTransformationsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardWithTransformationsTest.java index 916630ed3d7..8fe911571f9 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardWithTransformationsTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardWithTransformationsTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.drools.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -90,34 +91,34 @@ public void testSimpleScorecard() throws Exception { PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_INPUT1)).isEqualTo(input1); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_INPUT2)).isEqualTo(input2); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_CONSTANT)).isEqualTo(CONSTANT); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_INPUT1)).isEqualTo(input1); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_INPUT2)).isEqualTo(input2); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_CONSTANT)).isEqualTo(CONSTANT); if (reasonCode1 != null) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); if (reasonCode1.equals("Input1ReasonCode")) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("1.0"); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("1.0"); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("0.0"); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("0.0"); } } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); if (input1 > 4.2 && input1 < 9.8) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); } else if (input1 >= 15.4 && input1 < 22.1) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); } if (reasonCode1 == null) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNull(); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); String expected; switch (reasonCode1) { case "Input1ReasonCode": @@ -129,9 +130,9 @@ public void testSimpleScorecard() throws Exception { default: throw new Exception("Unexpected reasonCode1 " + reasonCode1); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isEqualTo(1.0); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); + assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isEqualTo(1.0); } } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/BostonHousingDataTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/BostonHousingDataTreeTest.java index 4dddbd5a6b7..bd66dcdc1cc 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/BostonHousingDataTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/BostonHousingDataTreeTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.drools.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -111,7 +112,7 @@ public void testBostonHousesTree() { inputData.put("lstat", lstat); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/CompoundPredicateTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/CompoundPredicateTreeTest.java index 2cff3652831..39665ebbec6 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/CompoundPredicateTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/CompoundPredicateTreeTest.java @@ -16,14 +16,14 @@ package org.kie.pmml.models.drools.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -79,7 +79,7 @@ public void testCompoundPredicate() { inputData.put("input3", input3); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/IrisDataTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/IrisDataTreeTest.java index 8969f334564..9c66e789cde 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/IrisDataTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/IrisDataTreeTest.java @@ -1,11 +1,12 @@ package org.kie.pmml.models.drools.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -62,7 +63,7 @@ public void testIrisTree() { inputData.put("Petal.Width", petalWidth); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/PlanActivityTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/PlanActivityTreeTest.java index 36594ea15de..d5097fa06e1 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/PlanActivityTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/PlanActivityTreeTest.java @@ -16,7 +16,13 @@ package org.kie.pmml.models.drools.tree.tests; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,11 +31,6 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - @RunWith(Parameterized.class) public class PlanActivityTreeTest extends AbstractPMMLTest { @@ -79,7 +80,7 @@ public void testPlanActivity() { Object result = pmml4Result.getResultVariables().get(TARGET_FIELD); - Assertions.assertThat(result).isNotNull(); - Assertions.assertThat(result).isEqualTo(activity); + assertThat(result).isNotNull(); + assertThat(result).isEqualTo(activity); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/ReturnLastPredictionStrategyTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/ReturnLastPredictionStrategyTreeTest.java index 2c0ced3082d..d0c2bd63e45 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/ReturnLastPredictionStrategyTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/ReturnLastPredictionStrategyTreeTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.drools.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -74,7 +75,7 @@ public void testReturnLastPredictionStrategy() { inputData.put("input3", input3); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelTest.java index 63e3a692e14..80be1a1f2a0 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelTest.java @@ -15,12 +15,13 @@ */ package org.kie.pmml.models.drools.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -68,7 +69,7 @@ public void testTree() { inputData.put("humidity", humidity); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelWithTransformationsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelWithTransformationsTest.java index 00d12e967a8..4d1c2aae24b 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelWithTransformationsTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelWithTransformationsTest.java @@ -16,12 +16,14 @@ package org.kie.pmml.models.drools.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,8 +33,6 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; -import static org.junit.Assert.assertNotNull; - @RunWith(Parameterized.class) public class SampleMineTreeModelWithTransformationsTest extends AbstractPMMLTest { @@ -86,27 +86,27 @@ public void testSampleMineTreeModelWithTransformations() throws Exception { inputData.put("input3", 34.1); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_TEMPERATURE)).isEqualTo(temperature); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_HUMIDITY_APPLY)).isEqualTo(humidity); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_CONSTANT)).isEqualTo(CONSTANT); - Assertions.assertThat(pmml4Result.getResultVariables().get(WEATHERDECISION)).isEqualTo(expectedResult); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_TEMPERATURE)).isEqualTo(temperature); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_HUMIDITY_APPLY)).isEqualTo(humidity); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_CONSTANT)).isEqualTo(CONSTANT); + assertThat(pmml4Result.getResultVariables().get(WEATHERDECISION)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); if (expectedResult.equals("umbrella")) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("1.0"); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("1.0"); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("0.0"); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("0.0"); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); if (temperature > 4.2 && temperature < 9.8) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); } else if (temperature >= 15.4 && temperature < 32.1) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); String expected; switch (expectedResult) { case "sunglasses": @@ -121,9 +121,9 @@ public void testSampleMineTreeModelWithTransformations() throws Exception { default: throw new Exception("Unexpected expectedResult " + expectedResult); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isEqualTo(1.0); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); + assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isEqualTo(1.0); } @Test(expected = KiePMMLException.class) diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleClassificationTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleClassificationTreeTest.java index 9f3f6d2f9ac..f02ff4f8819 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleClassificationTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleClassificationTreeTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.drools.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -74,7 +75,7 @@ public void testSimpleClassificationTree() { inputData.put("input3", input3); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleSetPredicateTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleSetPredicateTreeTest.java index 93920c87796..4dde98c7dbc 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleSetPredicateTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleSetPredicateTreeTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.drools.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -76,7 +77,7 @@ public void testSetPredicateTree() { inputData.put("input3", input3); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelChainTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelChainTest.java index 14cb2bd5bec..9035144abf3 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelChainTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelChainTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -88,7 +89,7 @@ public void testMiningModelChain() throws Exception { PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelSummedTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelSummedTest.java index c72be583dc5..b8ac642f866 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelSummedTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelSummedTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -77,7 +78,7 @@ public void testMiningModelSummed() throws Exception { PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningWithNestedRefersTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningWithNestedRefersTest.java index c503e1c3050..a1ac139abad 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningWithNestedRefersTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningWithNestedRefersTest.java @@ -16,14 +16,14 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -100,13 +100,13 @@ public void testMiningWithNestedRefers() throws Exception { PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); -// Assertions.assertThat(pmml4Result.getResultVariables().get(PROBABILITY_IRIS_SETOSA)).isNotNull(); -// Assertions.assertThat(pmml4Result.getResultVariables().get(PROBABILITY_IRIS_SETOSA)).isEqualTo(pSetosa); -// Assertions.assertThat(pmml4Result.getResultVariables().get(PROBABILITY_IRIS_VERSICOLOR)).isNotNull(); -// Assertions.assertThat(pmml4Result.getResultVariables().get(PROBABILITY_IRIS_VERSICOLOR)).isEqualTo(pVersicolor); -// Assertions.assertThat(pmml4Result.getResultVariables().get(PROBABILITY_IRIS_VIRGINICA)).isNotNull(); -// Assertions.assertThat(pmml4Result.getResultVariables().get(PROBABILITY_IRIS_VIRGINICA)).isEqualTo(pVirginica); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); +// assertThat(pmml4Result.getResultVariables().get(PROBABILITY_IRIS_SETOSA)).isNotNull(); +// assertThat(pmml4Result.getResultVariables().get(PROBABILITY_IRIS_SETOSA)).isEqualTo(pSetosa); +// assertThat(pmml4Result.getResultVariables().get(PROBABILITY_IRIS_VERSICOLOR)).isNotNull(); +// assertThat(pmml4Result.getResultVariables().get(PROBABILITY_IRIS_VERSICOLOR)).isEqualTo(pVersicolor); +// assertThat(pmml4Result.getResultVariables().get(PROBABILITY_IRIS_VIRGINICA)).isNotNull(); +// assertThat(pmml4Result.getResultVariables().get(PROBABILITY_IRIS_VIRGINICA)).isEqualTo(pVirginica); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MixedMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MixedMiningTest.java index b923f9d2e3f..d2334994796 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MixedMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MixedMiningTest.java @@ -16,12 +16,14 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,8 +33,6 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; -import static org.junit.Assert.assertNotNull; - @RunWith(Parameterized.class) public class MixedMiningTest extends AbstractPMMLTest { @@ -109,31 +109,31 @@ public void testMixedMining() throws Exception { PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); - Assertions.assertThat(pmml4Result.getResultVariables().get(NUMBER_OF_CLAIMS)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(NUMBER_OF_CLAIMS)).isEqualTo(expectedResult); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_OCCUPATION)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_OCCUPATION)).isEqualTo(occupation); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_RESIDENCESTATE)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_RESIDENCESTATE)).isEqualTo(residenceState); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_FUN_OCCUPATION_REFERRED)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_FUN_OCCUPATION_REFERRED)).isEqualTo(CONSTANT_OCCUPATION); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(NUMBER_OF_CLAIMS)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(NUMBER_OF_CLAIMS)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_OCCUPATION)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_OCCUPATION)).isEqualTo(occupation); + assertThat(pmml4Result.getResultVariables().get(OUT_RESIDENCESTATE)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_RESIDENCESTATE)).isEqualTo(residenceState); + assertThat(pmml4Result.getResultVariables().get(OUT_FUN_OCCUPATION_REFERRED)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_FUN_OCCUPATION_REFERRED)).isEqualTo(CONSTANT_OCCUPATION); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); if (occupation.equals("SKYDIVER")) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("1.0"); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("1.0"); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("0.0"); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("0.0"); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); if (age > 4.2 && age < 30.5) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); } else if (age >= 114 && age < 250) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); String expected; switch (categoricalX) { case "red": @@ -154,9 +154,9 @@ public void testMixedMining() throws Exception { default: throw new Exception("Unexpected categoricalX " + categoricalX); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isEqualTo(1.0); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); + assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isEqualTo(1.0); } @Test(expected = KiePMMLException.class) diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultipleMixedMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultipleMixedMiningTest.java index 25ed2c8e3af..7c5fb497614 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultipleMixedMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultipleMixedMiningTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -91,7 +92,7 @@ public void testMixedMining() { inputData.put("validLicense", validLicense); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultiplePredicatesMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultiplePredicatesMiningTest.java index cfbdf54db1e..906e9922c56 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultiplePredicatesMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultiplePredicatesMiningTest.java @@ -16,12 +16,15 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.kie.pmml.api.enums.ResultCode.FAIL; +import static org.kie.pmml.api.enums.ResultCode.OK; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,9 +33,6 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; -import static org.kie.pmml.api.enums.ResultCode.FAIL; -import static org.kie.pmml.api.enums.ResultCode.OK; - @RunWith(Parameterized.class) public class MultiplePredicatesMiningTest extends AbstractPMMLTest { @@ -100,12 +100,12 @@ public void testPredicatesMining() { PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); if (expectedResult != null) { - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultCode()).isEqualTo(OK.getName()); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultCode()).isEqualTo(OK.getName()); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNull(); - Assertions.assertThat(pmml4Result.getResultCode()).isEqualTo(FAIL.getName()); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNull(); + assertThat(pmml4Result.getResultCode()).isEqualTo(FAIL.getName()); } - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/PredicatesMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/PredicatesMiningTest.java index da9c39eab9b..82c11f679a0 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/PredicatesMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/PredicatesMiningTest.java @@ -16,12 +16,15 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.kie.pmml.api.enums.ResultCode.FAIL; +import static org.kie.pmml.api.enums.ResultCode.OK; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,9 +33,6 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; -import static org.kie.pmml.api.enums.ResultCode.FAIL; -import static org.kie.pmml.api.enums.ResultCode.OK; - @RunWith(Parameterized.class) public class PredicatesMiningTest extends AbstractPMMLTest { @@ -100,12 +100,12 @@ public void testPredicatesMining() { PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); if (expectedResult != null) { - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultCode()).isEqualTo(OK.getName()); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultCode()).isEqualTo(OK.getName()); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNull(); - Assertions.assertThat(pmml4Result.getResultCode()).isEqualTo(FAIL.getName()); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNull(); + assertThat(pmml4Result.getResultCode()).isEqualTo(FAIL.getName()); } - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/RandomForestClassifierMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/RandomForestClassifierMiningTest.java index 63453340bcd..9e1bb8a8020 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/RandomForestClassifierMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/RandomForestClassifierMiningTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -80,7 +81,7 @@ public void testMixedMining() { inputData.put("Income", income); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationClassificationSelectFirstTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationClassificationSelectFirstTest.java index ec790c721bc..ebed256fc16 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationClassificationSelectFirstTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationClassificationSelectFirstTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -79,7 +80,7 @@ public void testSegmentationClassificationSelectFirstTest() { inputData.put("input3", input3); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMajorityVoteMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMajorityVoteMiningTest.java index 0f4d1d8c319..7b114b9fb31 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMajorityVoteMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMajorityVoteMiningTest.java @@ -1,11 +1,12 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -65,7 +66,7 @@ public void testSegmentationMajorityVoteTest() { inputData.put("input3", input3); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMaxMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMaxMiningTest.java index 48d3eeac0bc..51cdfc3dff1 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMaxMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMaxMiningTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -71,7 +72,7 @@ public void testSegmentationMedianMiningTest() { inputData.put("y", y); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + `pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMeanMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMeanMiningTest.java index 9020e63463c..99787bba113 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMeanMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMeanMiningTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -71,7 +72,7 @@ public void testSegmentationMeanMiningTest() { inputData.put("y", y); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedian2MiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedian2MiningTest.java index 12e59c89d7b..6a54a95ed13 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedian2MiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedian2MiningTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -71,7 +72,7 @@ public void testSegmentationMedianMiningTest() { inputData.put("y", y); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedianMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedianMiningTest.java index 34444a25529..0566cdeb34e 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedianMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedianMiningTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -72,7 +73,7 @@ public void testSegmentationMedianMiningTest() { inputData.put("y", y); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSelectFirstMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSelectFirstMiningTest.java index f1f653a2e34..bfb4b4b0fcd 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSelectFirstMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSelectFirstMiningTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -71,7 +72,7 @@ public void testSegmentationMedianMiningTest() { inputData.put("y", y); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSumMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSumMiningTest.java index 1c719ad2b6c..e73d0d17968 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSumMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSumMiningTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.mining.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -71,7 +72,7 @@ public void testSegmentationMedianMiningTest() { inputData.put("y", y); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/CategoricalVariablesRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/CategoricalVariablesRegressionTest.java index 6bb21cc3dd3..d3225fb3389 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/CategoricalVariablesRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/CategoricalVariablesRegressionTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -83,9 +84,9 @@ public void testCategoricalVariablesRegression() { inputData.put("y", y); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); - Assertions.assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) + assertThat(pmml4Result).isNotNull(); + assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); + assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) .isEqualTo(regressionFunction(x, y)); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LinearRegressionSampleWithTransformationsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LinearRegressionSampleWithTransformationsTest.java index 808dba91c3e..a0becea55d1 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LinearRegressionSampleWithTransformationsTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LinearRegressionSampleWithTransformationsTest.java @@ -16,12 +16,14 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.assertj.core.data.Percentage; import org.junit.BeforeClass; import org.junit.Test; @@ -32,8 +34,6 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; -import static org.junit.Assert.assertNotNull; - @RunWith(Parameterized.class) public class LinearRegressionSampleWithTransformationsTest extends AbstractPMMLTest { @@ -111,48 +111,48 @@ public void testLinearRegressionSampleWithTransformations() throws Exception { PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(TARGET_FIELD)).isCloseTo(expectedResult, + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat((double) pmml4Result.getResultVariables().get(TARGET_FIELD)).isCloseTo(expectedResult, TOLERANCE_PERCENTAGE); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NUMBER_OF_CLAIMS)).isNotNull(); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(OUT_NUMBER_OF_CLAIMS)).isCloseTo(expectedResult, TOLERANCE_PERCENTAGE); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_CAR_LOCATION_REFERRED)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_CAR_LOCATION_REFERRED)).isEqualTo(car_location); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_SALARY)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_SALARY)).isEqualTo(salary); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_AGE)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_AGE)).isEqualTo(age); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_SALARY)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_SALARY)).isEqualTo(salary); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_CAR_LOCATION)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_CAR_LOCATION)).isEqualTo(car_location); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_CAR_LOCATION_REFERRAL)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_CAR_LOCATION_REFERRAL)).isEqualTo(car_location); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_CONSTANT)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_CONSTANT)).isEqualTo(CONSTANT); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_FIELDREF)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_FIELDREF)).isEqualTo(DOUBLE_CONSTANT); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_CONSTANT)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_CONSTANT)).isEqualTo(FUN_SALARY_CONSTANT); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_APPLY)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_APPLY)).isEqualTo(FUN_SALARY_CONSTANT); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_APPLY_FUN_SALARY_FIELDREF)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_APPLY_FUN_SALARY_FIELDREF)).isEqualTo(STRING_CONSTANT); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_NUMBER_OF_CLAIMS)).isNotNull(); + assertThat((double) pmml4Result.getResultVariables().get(OUT_NUMBER_OF_CLAIMS)).isCloseTo(expectedResult, TOLERANCE_PERCENTAGE); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_CAR_LOCATION_REFERRED)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_CAR_LOCATION_REFERRED)).isEqualTo(car_location); + assertThat(pmml4Result.getResultVariables().get(OUT_SALARY)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_SALARY)).isEqualTo(salary); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_AGE)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_AGE)).isEqualTo(age); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_SALARY)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_SALARY)).isEqualTo(salary); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_CAR_LOCATION)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_CAR_LOCATION)).isEqualTo(car_location); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_CAR_LOCATION_REFERRAL)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_CAR_LOCATION_REFERRAL)).isEqualTo(car_location); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_CONSTANT)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_CONSTANT)).isEqualTo(CONSTANT); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_FIELDREF)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_FIELDREF)).isEqualTo(DOUBLE_CONSTANT); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_CONSTANT)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_CONSTANT)).isEqualTo(FUN_SALARY_CONSTANT); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_APPLY)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_APPLY)).isEqualTo(FUN_SALARY_CONSTANT); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_APPLY_FUN_SALARY_FIELDREF)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_SALARY_APPLY_FUN_SALARY_FIELDREF)).isEqualTo(STRING_CONSTANT); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); if (car_location.equals("carpark")) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo(1.0); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo(1.0); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo(0.0); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo(0.0); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); if (age > 4.2 && age < 30.5) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); } else if (age >= 114 && age < 250) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); String expected; switch (car_location) { case "carpark": @@ -164,9 +164,9 @@ public void testLinearRegressionSampleWithTransformations() throws Exception { default: throw new Exception("Unexpected car_location " + car_location); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isEqualTo(1.0); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); + assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isEqualTo(1.0); } @Test(expected = KiePMMLException.class) diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionIrisDataTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionIrisDataTest.java index 5c52ae16d0f..6b7658b1506 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionIrisDataTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionIrisDataTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.assertj.core.data.Percentage; import org.junit.BeforeClass; import org.junit.Test; @@ -85,14 +86,14 @@ public void testLogisticRegressionIrisData() { inputData.put("Petal.Width", petalWidth); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_SETOSA_FIELD)) + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_SETOSA_FIELD)) .isCloseTo(setosaProbability(), TOLERANCE_PERCENTAGE); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VERSICOLOR_FIELD)) + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VERSICOLOR_FIELD)) .isCloseTo(versicolorProbability(), TOLERANCE_PERCENTAGE); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VIRGINICA_FIELD)) + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VIRGINICA_FIELD)) .isCloseTo(virginicaProbability(), TOLERANCE_PERCENTAGE); } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionNoneNormalizationTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionNoneNormalizationTest.java index 33c2ce7901d..2fb845cb7b8 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionNoneNormalizationTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionNoneNormalizationTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.assertj.core.data.Percentage; import org.junit.BeforeClass; import org.junit.Test; @@ -90,14 +91,14 @@ public void testLogisticRegressionWithNormalization() throws Exception { inputData.put("Petal.Width", petalWidth); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_SETOSA_FIELD)) + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_SETOSA_FIELD)) .isCloseTo(expectedSetosaProbability, TOLERANCE_PERCENTAGE); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VERSICOLOR_FIELD)) + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VERSICOLOR_FIELD)) .isCloseTo(expectedVersicolorProbability, TOLERANCE_PERCENTAGE); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VIRGINICA_FIELD)) + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VIRGINICA_FIELD)) .isCloseTo(expectedVirginicaProbability, TOLERANCE_PERCENTAGE); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSimplemaxNormalizationTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSimplemaxNormalizationTest.java index fc79c90a6a1..6e41e0be9ed 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSimplemaxNormalizationTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSimplemaxNormalizationTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.assertj.core.data.Percentage; import org.junit.BeforeClass; import org.junit.Test; @@ -89,14 +90,14 @@ public void testLogisticRegressionWithNormalization() throws Exception { inputData.put("Petal.Width", petalWidth); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_SETOSA_FIELD)) + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_SETOSA_FIELD)) .isCloseTo(expectedSetosaProbability, TOLERANCE_PERCENTAGE); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VERSICOLOR_FIELD)) + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VERSICOLOR_FIELD)) .isCloseTo(expectedVersicolorProbability, TOLERANCE_PERCENTAGE); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VIRGINICA_FIELD)) + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VIRGINICA_FIELD)) .isCloseTo(expectedVirginicaProbability, TOLERANCE_PERCENTAGE); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSoftmaxNormalizationTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSoftmaxNormalizationTest.java index 5b606829dbc..fd5e742e625 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSoftmaxNormalizationTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSoftmaxNormalizationTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.assertj.core.data.Percentage; import org.junit.BeforeClass; import org.junit.Test; @@ -90,14 +91,14 @@ public void testLogisticRegressionWithNormalization() throws Exception { inputData.put("Petal.Width", petalWidth); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_SETOSA_FIELD)) + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_SETOSA_FIELD)) .isCloseTo(expectedSetosaProbability, TOLERANCE_PERCENTAGE); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VERSICOLOR_FIELD)) + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VERSICOLOR_FIELD)) .isCloseTo(expectedVersicolorProbability, TOLERANCE_PERCENTAGE); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VIRGINICA_FIELD)) + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VIRGINICA_FIELD)) .isCloseTo(expectedVirginicaProbability, TOLERANCE_PERCENTAGE); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionTest.java index 16e0140aab2..eb29ac727a0 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.assertj.core.data.Percentage; import org.junit.BeforeClass; import org.junit.Test; @@ -89,11 +90,11 @@ public void testLogisticRegression() { inputData.put("entropy", entropy); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_AUTHENTIC)) + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_AUTHENTIC)) .isCloseTo(expectedProbAuthentic, TOLERANCE_PERCENTAGE); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_COUNTERFEIT)) + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_COUNTERFEIT)) .isCloseTo(expectedProbCounterfeit, TOLERANCE_PERCENTAGE); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MissingDataRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MissingDataRegressionTest.java index 72df4346fc6..5610c9c21ed 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MissingDataRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MissingDataRegressionTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -73,9 +74,9 @@ public void testMissingValuesRegression() { } PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); - Assertions.assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) + assertThat(pmml4Result).isNotNull(); + assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); + assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) .isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MixedVariablesRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MixedVariablesRegressionTest.java index 04663f072aa..f9e71104081 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MixedVariablesRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MixedVariablesRegressionTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -75,9 +76,9 @@ public void testMixedVariablesRegression() throws Exception { inputData.put("y", y); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); - Assertions.assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) + assertThat(pmml4Result).isNotNull(); + assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); + assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) .isEqualTo(regressionFunction(x, y)); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleCategoricalVariablesRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleCategoricalVariablesRegressionTest.java index 5cf3e311f02..0844baaf575 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleCategoricalVariablesRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleCategoricalVariablesRegressionTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -83,9 +84,9 @@ public void testCategoricalVariablesRegression() { inputData.put("y", y); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); - Assertions.assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) + assertThat(pmml4Result).isNotNull(); + assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); + assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) .isEqualTo(regressionFunction(x, y)); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleLogisticRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleLogisticRegressionTest.java index 5e90785170a..468535080a0 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleLogisticRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleLogisticRegressionTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.assertj.core.data.Percentage; import org.junit.BeforeClass; import org.junit.Test; @@ -89,11 +90,11 @@ public void testLogisticRegression() { inputData.put("entropy", entropy); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_AUTHENTIC)) + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_AUTHENTIC)) .isCloseTo(expectedProbAuthentic, TOLERANCE_PERCENTAGE); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_COUNTERFEIT)) + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_COUNTERFEIT)) .isCloseTo(expectedProbCounterfeit, TOLERANCE_PERCENTAGE); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesDecimalAndNegativeCoefsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesDecimalAndNegativeCoefsTest.java index a5d1f6e02e7..9fef7aa4881 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesDecimalAndNegativeCoefsTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesDecimalAndNegativeCoefsTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -70,9 +71,9 @@ public void testNumericVariablesDecimalAndNegative() { inputData.put("y", y); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); - Assertions.assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) + assertThat(pmml4Result).isNotNull(); + assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); + assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) .isEqualTo(regressionFunction(x, y)); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesLinearRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesLinearRegressionTest.java index 19aa4d752b2..b0e2892d5e3 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesLinearRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesLinearRegressionTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -70,9 +71,9 @@ public void testNumericVariableLinearRegression() throws Exception { inputData.put("y", y); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); - Assertions.assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) + assertThat(pmml4Result).isNotNull(); + assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); + assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) .isEqualTo(regressionFunction(x, y)); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesPolynomialRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesPolynomialRegressionTest.java index e3e79b30a83..42524f59fca 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesPolynomialRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesPolynomialRegressionTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -70,9 +71,9 @@ public void testNumericVariablePolynomialRegression() throws Exception { inputData.put("y", y); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); - Assertions.assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) + assertThat(pmml4Result).isNotNull(); + assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); + assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) .isEqualTo(regressionFunction(x, y)); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/OrderApprovalRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/OrderApprovalRegressionTest.java index fe40bba02b6..c11e748773f 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/OrderApprovalRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/OrderApprovalRegressionTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.assertj.core.data.Percentage; import org.junit.BeforeClass; import org.junit.Test; @@ -91,11 +92,11 @@ public void testOrderApprovalRegression() { inputData.put("price", price); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_TRUE)) + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_TRUE)) .isCloseTo(expectedProbTrue, TOLERANCE_PERCENTAGE); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_FALSE)) + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_FALSE)) .isCloseTo(expectedProbFalse, TOLERANCE_PERCENTAGE); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/PredictorTermRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/PredictorTermRegressionTest.java index dd81e612401..3d01982abf0 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/PredictorTermRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/PredictorTermRegressionTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -73,9 +74,9 @@ public void testPredictorTermRegression() { inputData.put("z", z); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); - Assertions.assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) + assertThat(pmml4Result).isNotNull(); + assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); + assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) .isEqualTo(regressionFunction(x, y, z)); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationExpTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationExpTest.java index 97481b5a99f..4cce8daa0ab 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationExpTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationExpTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -71,9 +72,9 @@ public void testNormalizationMethodsRegression() throws Exception { inputData.put("y", y); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); - Assertions.assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) + assertThat(pmml4Result).isNotNull(); + assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); + assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) .isEqualTo(normalizedRegressionFunction(x, y)); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationLogitTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationLogitTest.java index 5e314963580..6d68794a3c8 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationLogitTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationLogitTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -71,9 +72,9 @@ public void testNormalizationMethodsRegression() throws Exception { inputData.put("y", y); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); - Assertions.assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) + assertThat(pmml4Result).isNotNull(); + assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); + assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) .isEqualTo(normalizedRegressionFunction(x, y)); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationSoftmaxTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationSoftmaxTest.java index 76480291506..12afd38c04f 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationSoftmaxTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationSoftmaxTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.regression.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -71,9 +72,9 @@ public void testNormalizationMethodsRegression() throws Exception { inputData.put("y", y); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); - Assertions.assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) + assertThat(pmml4Result).isNotNull(); + assertThat(pmml4Result.getResultVariables()).containsKey(TARGET_FIELD); + assertThat((Double) pmml4Result.getResultVariables().get(TARGET_FIELD)) .isEqualTo(normalizedRegressionFunction(x, y/*, normalizationMethod*/)); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/AirconditioningScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/AirconditioningScorecardTest.java index d846be6edb5..d15691eb408 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/AirconditioningScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/AirconditioningScorecardTest.java @@ -15,7 +15,13 @@ */ package org.kie.pmml.models.scorecard.tests; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + import org.assertj.core.data.Percentage; import org.junit.BeforeClass; import org.junit.Test; @@ -25,11 +31,6 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - @RunWith(Parameterized.class) public class AirconditioningScorecardTest extends AbstractPMMLTest { private static final String FILE_NAME = "air-conditioning-weather-scorecard.pmml"; @@ -74,8 +75,8 @@ public void testAirconditioningScorecard() { inputData.put("humidity", humidity); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat((double) (pmml4Result.getResultVariables().get(TARGET_FIELD))) + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat((double) (pmml4Result.getResultVariables().get(TARGET_FIELD))) .isCloseTo(score, Percentage.withPercentage(0.1)); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/BasicComplexPartialScoreTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/BasicComplexPartialScoreTest.java index 6a406653acd..b1e9dc4e5ba 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/BasicComplexPartialScoreTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/BasicComplexPartialScoreTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; @@ -80,9 +81,9 @@ public void testBasicPartialScore() { inputData.put("input2", input2); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundNestedPredicateScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundNestedPredicateScorecardTest.java index babca87da5d..3d6428669a8 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundNestedPredicateScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundNestedPredicateScorecardTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -83,9 +84,9 @@ public void testCompoundNestedPredicateScorecard() { inputData.put("input2", input2); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundPredicateScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundPredicateScorecardTest.java index 0f46ea8a954..16052dcfc02 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundPredicateScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundPredicateScorecardTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -92,10 +93,10 @@ public void testCompoundPredicateScorecard() { inputData.put("input4", input4); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE3_FIELD)).isEqualTo(reasonCode3); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE3_FIELD)).isEqualTo(reasonCode3); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleAirconditioningScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleAirconditioningScorecardTest.java index ff242bbbb0e..7ee39f452c9 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleAirconditioningScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleAirconditioningScorecardTest.java @@ -15,12 +15,13 @@ */ package org.kie.pmml.models.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.assertj.core.data.Percentage; import org.junit.BeforeClass; import org.junit.Test; @@ -74,8 +75,8 @@ public void testAirconditioningScorecard() { inputData.put("humidity", humidity); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat((double) (pmml4Result.getResultVariables().get(TARGET_FIELD))) + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat((double) (pmml4Result.getResultVariables().get(TARGET_FIELD))) .isCloseTo(score, Percentage.withPercentage(0.1)); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java index 26b54b2f9a5..def295d5ea3 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -82,11 +83,11 @@ public void testCompoundNestedPredicateScorecard() { inputData.put("input1", input1); inputData.put("input2", input2); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result).isNotNull(); + assertThat(pmml4Result).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/NestedComplexPartialScoreTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/NestedComplexPartialScoreTest.java index 70d516369eb..55b1761dd06 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/NestedComplexPartialScoreTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/NestedComplexPartialScoreTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; @@ -80,9 +81,9 @@ public void testNestedComplexPartialScore() { inputData.put("input2", input2); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardCategoricalTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardCategoricalTest.java index 12a41e22405..9a98feae953 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardCategoricalTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardCategoricalTest.java @@ -16,6 +16,9 @@ package org.kie.pmml.models.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertFalse; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -24,7 +27,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.assertj.core.api.Assertions; +import org.assertj.core.data.Percentage; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -34,8 +37,6 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; -import static org.junit.Assert.assertFalse; - @RunWith(Parameterized.class) public class SimpleScorecardCategoricalTest extends AbstractPMMLTest { @@ -81,13 +82,80 @@ public static Collection data() { public void testSimpleScorecardCategorical() { final Map inputData = new HashMap<>(); inputData.put("input1", input1); - inputData.put("input2", input2); + inputData.put("input2", input2); * Copyright 2021 Red Hat, Inc. and/or its affiliates. + package org.kie.pmml.models.scorecard.tests; + + import java.util.Arrays; + import java.util.Collection; + import java.util.HashMap; + import java.util.Map; + + import static org.assertj.core.api.Assertions.assertThat; + import org.assertj.core.data.Percentage; + import org.junit.BeforeClass; + import org.junit.Test; + import org.junit.runner.RunWith; + import org.junit.runners.Parameterized; + import org.kie.api.pmml.PMML4Result; + import org.kie.pmml.api.runtime.PMMLRuntime; + import org.kie.pmml.models.tests.AbstractPMMLTest; + + @RunWith(Parameterized.class) + public class MultipleAirconditioningScorecardTest extends AbstractPMMLTest { + private static final String FILE_NAME = "MultipleScorecard.pmml"; + private static final String MODEL_NAME = "Forecast Score"; + private static final String TARGET_FIELD = "forecastScore"; + private static PMMLRuntime pmmlRuntime; + + private String period; + private String worldContinent; + private boolean precipitation; + private double humidity; + private double score; + + public MultipleAirconditioningScorecardTest(String period, String worldContinent, boolean precipitation, double humidity, + double score) { + this.period = period; + this.worldContinent = worldContinent; + this.precipitation = precipitation; + this.humidity = humidity; + this.score = score; + } + + @BeforeClass + public static void setupClass() { + pmmlRuntime = getPMMLRuntime(FILE_NAME); + } + + @Parameterized.Parameters + public static Collection data() { + return Arrays.asList(new Object[][]{ + {"SPRING", "EUROPE", true, 25.0, 9.5}, + {"SUMMER", "ASIA", true, 35.0, 10.0}, + }); + } + + @Test + public void testAirconditioningScorecard() { + final Map inputData = new HashMap<>(); + inputData.put("period", period); + inputData.put("worldcontinent", worldContinent); + inputData.put("precipitation", precipitation); + inputData.put("humidity", humidity); + PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); + + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat((double) (pmml4Result.getResultVariables().get(TARGET_FIELD))) + .isCloseTo(score, Percentage.withPercentage(0.1)); + } + } + PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); } @Test diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardMixedVariablesTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardMixedVariablesTest.java index 52ae9cb7b75..cbb9786d1bd 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardMixedVariablesTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardMixedVariablesTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -77,9 +78,9 @@ public void testSimpleScorecardMixedVariables() { inputData.put("input2", input2); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardTest.java index f7ea9dbde72..4b3f6e26698 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardTest.java @@ -16,12 +16,14 @@ package org.kie.pmml.models.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,8 +33,6 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; -import static org.junit.Assert.assertNotNull; - @RunWith(Parameterized.class) public class SimpleScorecardTest extends AbstractPMMLTest { @@ -81,10 +81,10 @@ public void testSimpleScorecard() { inputData.put("input3", 34.1); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); } @Test(expected = KiePMMLException.class) diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardWithTransformationsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardWithTransformationsTest.java index d6f488e8368..734ab8ed5aa 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardWithTransformationsTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardWithTransformationsTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.scorecard.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -90,34 +91,34 @@ public void testSimpleScorecard() throws Exception { PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(score); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); - Assertions.assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_INPUT1)).isEqualTo(input1); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_INPUT2)).isEqualTo(input2); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_CONSTANT)).isEqualTo(CONSTANT); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE1_FIELD)).isEqualTo(reasonCode1); + assertThat(pmml4Result.getResultVariables().get(REASON_CODE2_FIELD)).isEqualTo(reasonCode2); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_INPUT1)).isEqualTo(input1); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_INPUT2)).isEqualTo(input2); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_CONSTANT)).isEqualTo(CONSTANT); if (reasonCode1 != null) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); if (reasonCode1.equals("Input1ReasonCode")) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("1.0"); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("1.0"); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("0.0"); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("0.0"); } } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); if (input1 > 4.2 && input1 < 9.8) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); } else if (input1 >= 15.4 && input1 < 22.1) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); } if (reasonCode1 == null) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNull(); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); String expected; switch (reasonCode1) { case "Input1ReasonCode": @@ -129,9 +130,9 @@ public void testSimpleScorecard() throws Exception { default: throw new Exception("Unexpected reasonCode1 " + reasonCode1); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isEqualTo(1.0); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); + assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isEqualTo(1.0); } } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/BostonHousingDataTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/BostonHousingDataTreeTest.java index e7c36aa2ac0..3c33930104c 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/BostonHousingDataTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/BostonHousingDataTreeTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -112,7 +113,7 @@ public void testBostonHousesTree() { inputData.put("lstat", lstat); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/CompoundPredicateTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/CompoundPredicateTreeTest.java index 16540bc365e..c4aec0f8e2b 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/CompoundPredicateTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/CompoundPredicateTreeTest.java @@ -16,14 +16,14 @@ package org.kie.pmml.models.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -79,7 +79,7 @@ public void testCompoundPredicate() { inputData.put("input3", input3); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/IrisDataTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/IrisDataTreeTest.java index 8633ee09703..c859625785f 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/IrisDataTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/IrisDataTreeTest.java @@ -1,11 +1,12 @@ package org.kie.pmml.models.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.assertj.core.data.Percentage; import org.junit.BeforeClass; import org.junit.Test; @@ -77,14 +78,14 @@ public void testIrisTree() { inputData.put("Petal.Width", petalWidth); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); - Assertions.assertThat(pmml4Result.getResultVariables().get(PROBABILITY_SETOSA)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(PROBABILITY_SETOSA)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(PROBABILITY_SETOSA)).isEqualTo(probabilitySetosa); - Assertions.assertThat(pmml4Result.getResultVariables().get(PROBABILITY_VERSICOLOR)).isNotNull(); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VERSICOLOR)).isCloseTo(probabilityVersicolor, TOLERANCE_PERCENTAGE); - Assertions.assertThat(pmml4Result.getResultVariables().get(PROBABILITY_VIRGINICA)).isNotNull(); - Assertions.assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VIRGINICA)).isCloseTo(probabilityVirginica, TOLERANCE_PERCENTAGE); + assertThat(pmml4Result.getResultVariables().get(PROBABILITY_SETOSA)).isEqualTo(probabilitySetosa); + assertThat(pmml4Result.getResultVariables().get(PROBABILITY_VERSICOLOR)).isNotNull(); + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VERSICOLOR)).isCloseTo(probabilityVersicolor, TOLERANCE_PERCENTAGE); + assertThat(pmml4Result.getResultVariables().get(PROBABILITY_VIRGINICA)).isNotNull(); + assertThat((double) pmml4Result.getResultVariables().get(PROBABILITY_VIRGINICA)).isCloseTo(probabilityVirginica, TOLERANCE_PERCENTAGE); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/ReturnLastPredictionStrategyTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/ReturnLastPredictionStrategyTreeTest.java index 7d58fc99131..c084bbd62bd 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/ReturnLastPredictionStrategyTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/ReturnLastPredictionStrategyTreeTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -74,7 +75,7 @@ public void testReturnLastPredictionStrategy() { inputData.put("input3", input3); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelTest.java index 621e77a1387..9f09af0a55f 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelTest.java @@ -15,12 +15,13 @@ */ package org.kie.pmml.models.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -68,7 +69,7 @@ public void testTree() { inputData.put("humidity", humidity); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelWithTransformationsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelWithTransformationsTest.java index 75de0859ca3..8ebdd76ef70 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelWithTransformationsTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelWithTransformationsTest.java @@ -16,14 +16,15 @@ package org.kie.pmml.models.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -32,8 +33,6 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; -import static org.junit.Assert.assertNotNull; - @RunWith(Parameterized.class) public class SampleMineTreeModelWithTransformationsTest extends AbstractPMMLTest { @@ -87,27 +86,27 @@ public void testSampleMineTreeModelWithTransformations() throws Exception { inputData.put("input3", 34.1); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_TEMPERATURE)).isEqualTo(temperature); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_HUMIDITY_APPLY)).isEqualTo(humidity); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DER_CONSTANT)).isEqualTo(CONSTANT); - Assertions.assertThat(pmml4Result.getResultVariables().get(WEATHERDECISION)).isEqualTo(expectedResult); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_TEMPERATURE)).isEqualTo(temperature); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_FUN_HUMIDITY_APPLY)).isEqualTo(humidity); + assertThat(pmml4Result.getResultVariables().get(OUT_DER_CONSTANT)).isEqualTo(CONSTANT); + assertThat(pmml4Result.getResultVariables().get(WEATHERDECISION)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isNotNull(); if (expectedResult.equals("umbrella")) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("1.0"); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("1.0"); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("0.0"); + assertThat(pmml4Result.getResultVariables().get(OUT_NORMDISCRETE_FIELD)).isEqualTo("0.0"); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isNotNull(); if (temperature > 4.2 && temperature < 9.8) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("abc"); } else if (temperature >= 15.4 && temperature < 32.1) { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("def"); } else { - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); + assertThat(pmml4Result.getResultVariables().get(OUT_DISCRETIZE_FIELD)).isEqualTo("defaultValue"); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isNotNull(); String expected; switch (expectedResult) { case "sunglasses": @@ -122,9 +121,9 @@ public void testSampleMineTreeModelWithTransformations() throws Exception { default: throw new Exception("Unexpected expectedResult " + expectedResult); } - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isEqualTo(1.0); + assertThat(pmml4Result.getResultVariables().get(OUT_MAPVALUED_FIELD)).isEqualTo(expected); + assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(OUT_TEXT_INDEX_NORMALIZATION_FIELD)).isEqualTo(1.0); } @Test(expected = KiePMMLException.class) diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleClassificationTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleClassificationTreeTest.java index 80b19d0c9f2..aa573708d70 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleClassificationTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleClassificationTreeTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -74,7 +75,7 @@ public void testSimpleClassificationTree() { inputData.put("input3", input3); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleSetPredicateTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleSetPredicateTreeTest.java index 2adeed943c8..235911e69db 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleSetPredicateTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleSetPredicateTreeTest.java @@ -16,12 +16,13 @@ package org.kie.pmml.models.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -76,7 +77,7 @@ public void testSetPredicateTree() { inputData.put("input3", input3); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/TestTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/TestTreeTest.java index 6231617ca5c..687ad024d6d 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/TestTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/TestTreeTest.java @@ -15,12 +15,13 @@ */ package org.kie.pmml.models.tree.tests; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -67,7 +68,7 @@ public void testIrisTree() { inputData.put("humidity", humidity); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - Assertions.assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(expectedResult); } } From 6689d13f7a6ea924e0b186fd805c887b579135ae Mon Sep 17 00:00:00 2001 From: Paolo Bizzarri Date: Wed, 23 Mar 2022 14:22:45 +0100 Subject: [PATCH 3/9] Fix assertj imports for drools-model projects --- .../drools/modelcompiler/AccumulateTest.java | 47 ++++++------- .../drools/modelcompiler/CompilerTest.java | 34 +++++---- .../ConstraintNormalizationTest.java | 14 ++-- .../org/drools/modelcompiler/EvalTest.java | 8 +-- .../modelcompiler/ExternalisedLambdaTest.java | 18 ++--- .../org/drools/modelcompiler/FromTest.java | 32 ++++----- .../org/drools/modelcompiler/GroupByTest.java | 69 +++++++++---------- .../drools/modelcompiler/HalfBinaryTest.java | 10 +-- .../IncrementalCompilationTest.java | 54 +++++++-------- .../modelcompiler/MaterializedLambdaTest.java | 10 +-- .../drools/modelcompiler/MvelDialectTest.java | 19 +++-- .../modelcompiler/MvelOperatorsTest.java | 17 +++-- .../modelcompiler/NamedConsequencesTest.java | 12 ++-- .../NullSafeDereferencingTest.java | 18 ++--- .../org/drools/modelcompiler/OOPathTest.java | 37 +++++----- .../java/org/drools/modelcompiler/OrTest.java | 16 ++--- .../drools/modelcompiler/PatternDSLTest.java | 64 ++++++++--------- .../org/drools/modelcompiler/QueryTest.java | 30 ++++---- .../modelcompiler/RuleAttributesTest.java | 26 +++---- .../drools/modelcompiler/ToStringTest.java | 22 +++--- .../modelcompiler/TypeCoercionTest.java | 10 +-- .../modelcompiler/TypeObjectCoercionTest.java | 14 ++-- .../drlxparse/CoercedExpressionTest.java | 6 +- 23 files changed, 291 insertions(+), 296 deletions(-) diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/AccumulateTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/AccumulateTest.java index 9c17f8c9d60..c29931a47e3 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/AccumulateTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/AccumulateTest.java @@ -16,6 +16,14 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; @@ -45,7 +53,6 @@ import java.util.stream.IntStream; import org.apache.commons.math3.util.Pair; -import org.assertj.core.api.Assertions; import org.drools.core.base.accumulators.IntegerMaxAccumulateFunction; import org.drools.core.spi.Activation; import org.drools.model.functions.accumulate.GroupKey; @@ -64,12 +71,6 @@ import org.kie.api.runtime.rule.AccumulateFunction; import org.kie.api.runtime.rule.FactHandle; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - public class AccumulateTest extends BaseModelTest { public AccumulateTest( RUN_TYPE testRunType ) { @@ -1259,7 +1260,7 @@ public void testBigDecimalOperationsInAccumulateConstraint() { ksession1.insert(p2); assertEquals( 1, ksession1.fireAllRules() ); - Assertions.assertThat(results).containsExactly(BigDecimal.valueOf(8)); + assertThat(results).containsExactly(BigDecimal.valueOf(8)); } @@ -1284,7 +1285,7 @@ public void testAccumulateWithMax() { StockTick st = new StockTick("RHT"); st.setTimeField(new Date().getTime()); ksession.insert(st); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(ksession.fireAllRules()).isEqualTo(1); } @Test @@ -1305,7 +1306,7 @@ public void testAccumulateWithMaxCalendar() { StockTick st = new StockTick("RHT"); st.setDueDate(Calendar.getInstance()); ksession.insert(st); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(ksession.fireAllRules()).isEqualTo(1); } @Test @@ -1332,7 +1333,7 @@ public void testAccumulateWithMaxCalendarAndConstraint() { c.setCode("RHT"); ksession.insert(st); ksession.insert(c); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(ksession.fireAllRules()).isEqualTo(1); } @Test @@ -2009,7 +2010,7 @@ public void testGroupBy3WithExists2() { FactHandle toRemove = ksession.insert(child1); ksession.insert(child2); ksession.fireAllRules(); - Assertions.assertThat(results) + assertThat(results) .containsOnly(Arrays.asList(child1, 2L), Arrays.asList(child2, 2L)); // Remove child1, therefore it does not exist, therefore there should be no groupBy matches for the child. @@ -2018,7 +2019,7 @@ public void testGroupBy3WithExists2() { // Yet, we still get (Child2, 0). ksession.fireAllRules(); - Assertions.assertThat(results) + assertThat(results) .containsOnly(Arrays.asList(child2, 1L)); } @@ -2496,7 +2497,7 @@ public void testAccumulateWithTwoFunctions1() { ksession.insert( new Shift( OffsetDateTime.now()) ); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(ksession.fireAllRules()).isEqualTo(1); } @Test @@ -2521,7 +2522,7 @@ public void testAccumulateWithTwoFunctions2() { ksession.insert( new Shift( OffsetDateTime.now()) ); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(ksession.fireAllRules()).isEqualTo(1); } public class Shift { @@ -3474,7 +3475,7 @@ public void testAccumulateSubnetworkEval() { FactHandle fh2 = ksession.insert( new Person("name2", 40)); FactHandle fh3 = ksession.insert( new Person("name3", 25)); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(ksession.fireAllRules()).isEqualTo(1); assertEquals(0, (int)holder.get()); } @@ -3607,7 +3608,7 @@ public void testAccumulateWithMaxCalendarNullDate() { StockTick st2 = new StockTick("IBM"); st2.setDueDate(new GregorianCalendar(2020, Calendar.FEBRUARY, 4)); ksession.insert(st2); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(ksession.fireAllRules()).isEqualTo(1); } @Test @@ -3760,8 +3761,8 @@ public void testAccumulateWithIndirectArgument() { ksession.insert(mario); int rulesFired = ksession.fireAllRules(); - Assertions.assertThat(rulesFired).isGreaterThan(0); - Assertions.assertThat(resultTotal).contains(1l); + assertThat(rulesFired).isGreaterThan(0); + assertThat(resultTotal).contains(1l); List resultPairItem = resultPair.iterator().next(); Pair firstPair = resultPairItem.iterator().next(); @@ -4058,7 +4059,7 @@ public void testBindVariableUsedInSubsequentAccumulateString() { ksession.fireAllRules(); - Assertions.assertThat(result).containsExactly(50); + assertThat(result).containsExactly(50); } @Test @@ -4090,7 +4091,7 @@ public void testBindVariableUsedInSubsequentAccumulateBigDecimal() { ksession.fireAllRules(); - Assertions.assertThat(result).containsExactly(50); + assertThat(result).containsExactly(50); } @Test @@ -4127,9 +4128,9 @@ public void testCollectAfterAccumulate() { ksession.fireAllRules(); - Assertions.assertThat(result).containsExactlyInAnyOrder(paul, george); + assertThat(result).containsExactlyInAnyOrder(paul, george); } catch (Throwable ex) { - Assertions.fail("Should not have thrown.", ex); + fail("Should not have thrown.", ex); } } } diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/CompilerTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/CompilerTest.java index 9b9739f62b1..fa9c8de1ac4 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/CompilerTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/CompilerTest.java @@ -16,6 +16,15 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import java.math.BigDecimal; import java.math.BigInteger; import java.util.ArrayList; @@ -30,7 +39,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import org.assertj.core.api.Assertions; import org.drools.modelcompiler.domain.Address; import org.drools.modelcompiler.domain.Adult; import org.drools.modelcompiler.domain.Child; @@ -42,7 +50,6 @@ import org.drools.modelcompiler.domain.StockTick; import org.drools.modelcompiler.domain.Toy; import org.drools.modelcompiler.domain.Woman; -import org.junit.Assert; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -52,15 +59,6 @@ import org.kie.api.runtime.process.ProcessContext; import org.kie.api.runtime.rule.FactHandle; -import static org.assertj.core.api.Assertions.assertThat; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - public class CompilerTest extends BaseModelTest { public CompilerTest( RUN_TYPE testRunType ) { @@ -2393,7 +2391,7 @@ public void testCastingIntegerToShort() { ksession.insert(integerToShort); int rulesFired = ksession.fireAllRules(); - Assert.assertEquals(1, rulesFired); + assertEquals(1, rulesFired); assertThat(integerToShort).isEqualTo(new IntegerToShort(true, Short.MAX_VALUE, Short.MAX_VALUE, (double)0)); } @@ -2421,7 +2419,7 @@ public void testCastingIntegerToShortWithNegativeNumbers() { ksession.insert(integerToShort); int rulesFired = ksession.fireAllRules(); - Assert.assertEquals(1, rulesFired); + assertEquals(1, rulesFired); assertThat(integerToShort).isEqualTo(new IntegerToShort(true, Short.MAX_VALUE, (short)-12, (double)0)); } @@ -2450,7 +2448,7 @@ public void testCastingIntegerToShortWithDoubleVar() { ksession.insert(integerToShort); int rulesFired = ksession.fireAllRules(); - Assert.assertEquals(1, rulesFired); + assertEquals(1, rulesFired); assertThat(integerToShort).isEqualTo(new IntegerToShort(true, Short.MAX_VALUE, (short)17, (double)1)); } @@ -2481,7 +2479,7 @@ public void testUseOfVarCreatedAsInputArgInGlobalFuntionAsA_Var() { ksession.setGlobal("functions", new GlobalFunctions()); int rulesFired = ksession.fireAllRules(); - Assert.assertEquals(1, rulesFired); + assertEquals(1, rulesFired); assertThat(integerToShort).isEqualTo(new IntegerToShort(true, 1, (short)0)); } @@ -2524,7 +2522,7 @@ public void testConsequenceInsertThenUpdate() throws Exception { kSession.insert( luca ); assertEquals(1, kSession.fireAllRules()); - Assertions.assertThat(children).containsOnly("Andrea"); + assertThat(children).containsOnly("Andrea"); } @Test // DROOLS-6034 @@ -2554,7 +2552,7 @@ public void testConsequenceInsertThenModify() throws Exception { kSession.insert( luca ); assertEquals(1, kSession.fireAllRules()); - Assertions.assertThat(children).containsOnly("Andrea"); + assertThat(children).containsOnly("Andrea"); } @Test // DROOLS-6034 @@ -2585,7 +2583,7 @@ public void testConsequenceInsertThenUpdateWithPatternInitializer() throws Excep kSession.insert( luca ); assertEquals(1, kSession.fireAllRules()); - Assertions.assertThat(children).containsOnly("Luca"); + assertThat(children).containsOnly("Luca"); } @Test diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ConstraintNormalizationTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ConstraintNormalizationTest.java index 2d4f12cf1c8..0ec3c36f206 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ConstraintNormalizationTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ConstraintNormalizationTest.java @@ -16,18 +16,21 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.assertj.core.api.Assertions; -import org.drools.kiesession.entrypoints.NamedEntryPoint; import org.drools.core.reteoo.AlphaNode; import org.drools.core.reteoo.CompositeObjectSinkAdapter; import org.drools.core.reteoo.ObjectSinkPropagator; import org.drools.core.reteoo.ObjectTypeNode; +import org.drools.kiesession.entrypoints.NamedEntryPoint; import org.drools.modelcompiler.domain.Address; import org.drools.modelcompiler.domain.Person; import org.drools.modelcompiler.domain.Toy; @@ -35,9 +38,6 @@ import org.kie.api.definition.type.FactType; import org.kie.api.runtime.KieSession; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - public class ConstraintNormalizationTest extends BaseModelTest { public ConstraintNormalizationTest(RUN_TYPE testRunType) { @@ -446,7 +446,7 @@ public void testNegateComplex() throws Exception { ksession.insert(p3); assertEquals(4, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("John", "George", "John", "George"); + assertThat(list).containsExactlyInAnyOrder("John", "George", "John", "George"); } @Test @@ -486,7 +486,7 @@ public void testNegateComplex2() throws Exception { ksession.insert(p3); assertEquals(4, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("John", "George", "John", "George"); + assertThat(list).containsExactlyInAnyOrder("John", "George", "John", "George"); } @Test diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/EvalTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/EvalTest.java index 39e62e0d37f..1476586c4f2 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/EvalTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/EvalTest.java @@ -16,9 +16,11 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.modelcompiler.domain.CalcFact; import org.drools.modelcompiler.domain.Overloaded; import org.drools.modelcompiler.domain.Person; @@ -26,8 +28,6 @@ import org.junit.Test; import org.kie.api.runtime.KieSession; -import static org.junit.Assert.assertEquals; - public class EvalTest extends BaseModelTest { public EvalTest( RUN_TYPE testRunType ) { @@ -435,7 +435,7 @@ public void testEvalExprWithFunctionCall() { Person first = new Person("First", 10); ksession.insert(first); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(ksession.fireAllRules()).isEqualTo(1); } public static class GlobalFunctions { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ExternalisedLambdaTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ExternalisedLambdaTest.java index 9ecee21f9dd..8b6b4398273 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ExternalisedLambdaTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ExternalisedLambdaTest.java @@ -16,11 +16,14 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.core.ClockType; import org.drools.modelcompiler.builder.RuleWriter; import org.drools.modelcompiler.domain.Child; @@ -40,9 +43,6 @@ import org.kie.api.runtime.conf.ClockTypeOption; import org.kie.api.time.SessionPseudoClock; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - /** * This test class enables CheckNonExternalisedLambda option * so it will throw NonExternalisedLambdaFoundException if non-externalized lambda is found. @@ -119,7 +119,7 @@ public void testExternalizeBindingVariableLambda() throws Exception { ksession.insert(me); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("Mario"); + assertThat(list).containsExactlyInAnyOrder("Mario"); } @Test @@ -148,7 +148,7 @@ public void testExternalizeLambdaPredicate() throws Exception { ksession.insert(me); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("Mario"); + assertThat(list).containsExactlyInAnyOrder("Mario"); } @Test @@ -178,7 +178,7 @@ public void testExternalizeLambdaUsingVariable() throws Exception { ksession.insert(new Person("John", 44)); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder(43); + assertThat(list).containsExactlyInAnyOrder(43); } @Test @@ -244,7 +244,7 @@ public void testFromExpression() { ksession.insert(bob); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("Charles"); + assertThat(list).containsExactlyInAnyOrder("Charles"); } @Test @@ -316,7 +316,7 @@ public void testOOPath() { ksession.insert( carl ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("Bob"); + assertThat(list).containsExactlyInAnyOrder("Bob"); } @Test diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/FromTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/FromTest.java index 185d9341ed2..b69042e28af 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/FromTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/FromTest.java @@ -16,6 +16,11 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.util.AbstractMap; import java.util.ArrayList; import java.util.Arrays; @@ -27,7 +32,6 @@ import java.util.Map; import java.util.Optional; -import org.assertj.core.api.Assertions; import org.drools.modelcompiler.FunctionsTest.Pojo; import org.drools.modelcompiler.domain.Address; import org.drools.modelcompiler.domain.Adult; @@ -42,10 +46,6 @@ import org.junit.Test; import org.kie.api.runtime.KieSession; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class FromTest extends BaseModelTest { public FromTest( RUN_TYPE testRunType ) { @@ -105,7 +105,7 @@ public void testFromVariable() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("Charles"); + assertThat(list).containsExactlyInAnyOrder("Charles"); } @Test @@ -138,7 +138,7 @@ public void testFromExpression() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("Charles"); + assertThat(list).containsExactlyInAnyOrder("Charles"); } @Test @@ -197,7 +197,7 @@ public void testFromExternalFunction() { ksession.insert("Hello World!"); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("received long message: Hello World!"); + assertThat(list).containsExactlyInAnyOrder("received long message: Hello World!"); } @Test @@ -223,7 +223,7 @@ public void testFromExternalFunctionMultipleBindingArguments() { ksession.insert(4); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("received long message: Hello!"); + assertThat(list).containsExactlyInAnyOrder("received long message: Hello!"); } @Test @@ -422,7 +422,7 @@ public void testThisArray() { ksession.insert(john); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder(2); + assertThat(list).containsExactlyInAnyOrder(2); } @Test @@ -451,7 +451,7 @@ public void testFromArray() { ksession.insert(john); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("Julian", "Sean"); + assertThat(list).containsExactlyInAnyOrder("Julian", "Sean"); } @Test @@ -501,7 +501,7 @@ public void testInnerClassWithInstanceMethod() { ksession.insert(john); assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("Dummy"); + assertThat(list).containsExactlyInAnyOrder("Dummy"); } @Test @@ -522,7 +522,7 @@ public void testInnerClassWithStaticMethod() { ksession.setGlobal("list", list); assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("Dummy"); + assertThat(list).containsExactlyInAnyOrder("Dummy"); } @Test @@ -546,7 +546,7 @@ public void testInnerClassWithStaticMethodWithArg() { ksession.insert("John"); assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("DummyJohn"); + assertThat(list).containsExactlyInAnyOrder("DummyJohn"); } public static class MyPerson { @@ -668,7 +668,7 @@ public void testFromOr() { ksession.fireAllRules(); - Assertions.assertThat(list).contains("Toystore1"); + assertThat(list).contains("Toystore1"); } public static class Measurement { @@ -1036,7 +1036,7 @@ public void testFromStringConcatenation() { ksession.insert( "B" ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("AA", "AB", "BA", "BB"); + assertThat(list).containsExactlyInAnyOrder("AA", "AB", "BA", "BB"); } @Test diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/GroupByTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/GroupByTest.java index 8289c8034c4..bc5ea9b1911 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/GroupByTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/GroupByTest.java @@ -14,6 +14,12 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.model.DSL.from; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -27,7 +33,6 @@ import java.util.function.ToIntFunction; import org.apache.commons.math3.util.Pair; -import org.assertj.core.api.Assertions; import org.drools.core.base.accumulators.CollectListAccumulateFunction; import org.drools.core.base.accumulators.CountAccumulateFunction; import org.drools.core.base.accumulators.IntegerMaxAccumulateFunction; @@ -66,12 +71,6 @@ import org.kie.internal.event.rule.RuleEventListener; import org.kie.internal.event.rule.RuleEventManager; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.model.DSL.from; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - public class GroupByTest { @Test @@ -329,7 +328,7 @@ public void testGroupPersonsInitial() throws Exception { ksession.fireAllRules(); assertEquals( 3, results.size() ); - Assertions.assertThat(results) + assertThat(results) .containsExactlyInAnyOrder("G", "E", "M"); results.clear(); @@ -337,7 +336,7 @@ public void testGroupPersonsInitial() throws Exception { ksession.fireAllRules(); assertEquals( 1, results.size() ); - Assertions.assertThat(results) + assertThat(results) .containsExactlyInAnyOrder("M"); results.clear(); @@ -346,7 +345,7 @@ public void testGroupPersonsInitial() throws Exception { ksession.fireAllRules(); assertEquals( 2, results.size() ); - Assertions.assertThat(results) + assertThat(results) .containsExactlyInAnyOrder("G", "M"); } @@ -594,7 +593,7 @@ public void testWithNull() { // Side issue: this number is unusually high. Perhaps we should try to implement some cache for this? System.out.println("GroupKey mapping function was called " + mappingFunctionCallCounter.get() + " times."); - Assertions.assertThat(result).containsOnly(objectWithoutNestedObject); + assertThat(result).containsOnly(objectWithoutNestedObject); } @Test @@ -797,7 +796,7 @@ public void testUnexpectedRuleMatch() { // Yet, we still get (Child1, 0). ksession.fireAllRules(); - Assertions.assertThat(results) + assertThat(results) .containsOnly(Arrays.asList(child2, 1L)); } @@ -1379,9 +1378,9 @@ public void testEmptyPatternOnGroupByKey() throws Exception { ksession.insert( "test" ); ksession.insert(new Person("Mark", 42)); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); - Assertions.assertThat(results.size()).isEqualTo(1); - Assertions.assertThat(results.get(0)).isEqualTo("M"); + assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(results.size()).isEqualTo(1); + assertThat(results.get(0)).isEqualTo("M"); } @Test @@ -1415,9 +1414,9 @@ public void testFilterOnGroupByKey() throws Exception { ksession.insert( "test" ); ksession.insert(new Person("Mark", 42)); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); - Assertions.assertThat(results.size()).isEqualTo(1); - Assertions.assertThat(results.get(0)).isEqualTo("M"); + assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(results.size()).isEqualTo(1); + assertThat(results.get(0)).isEqualTo("M"); } @Test @@ -1461,9 +1460,9 @@ public void testDecomposedGroupByKey() throws Exception { ksession.insert( "test" ); ksession.insert(new Person("Mark", 42)); assertThat(ksession.fireAllRules()).isEqualTo(1); - Assertions.assertThat(results.size()).isEqualTo(2); - Assertions.assertThat(results.get(0)).isEqualTo("M"); - Assertions.assertThat(results.get(1)).isEqualTo("a"); + assertThat(results.size()).isEqualTo(2); + assertThat(results.get(0)).isEqualTo("M"); + assertThat(results.get(1)).isEqualTo("a"); } @Test @@ -1511,10 +1510,10 @@ public void testDecomposedGroupByKeyAndAccumulate() throws Exception { ksession.insert( "test" ); ksession.insert(new Person("Mark", 42)); assertThat(ksession.fireAllRules()).isEqualTo(1); - Assertions.assertThat(results.size()).isEqualTo(3); - Assertions.assertThat(results.get(0)).isEqualTo("M"); - Assertions.assertThat(results.get(1)).isEqualTo("a"); - Assertions.assertThat(results.get(2)).isEqualTo(1L); + assertThat(results.size()).isEqualTo(3); + assertThat(results.get(0)).isEqualTo("M"); + assertThat(results.get(1)).isEqualTo("a"); + assertThat(results.get(2)).isEqualTo(1L); } @Test @@ -1570,9 +1569,9 @@ public void testDecomposedGroupByKeyAnd2Accumulates() throws Exception { ksession.insert( "test" ); ksession.insert(new Person("Mark", 42)); assertThat(ksession.fireAllRules()).isEqualTo(1); - Assertions.assertThat(results.size()).isEqualTo(3); - Assertions.assertThat(results.get(0)).isEqualTo("M"); - Assertions.assertThat(results.get(1)).isEqualTo("a"); + assertThat(results.size()).isEqualTo(3); + assertThat(results.get(0)).isEqualTo("M"); + assertThat(results.get(1)).isEqualTo("a"); } @Test @@ -1623,7 +1622,7 @@ public void testDecomposedGroupByKeyAnd2AccumulatesInConsequence() throws Except ksession.insert( "test" ); ksession.insert(new Person("Mark", 42)); assertThat(ksession.fireAllRules()).isEqualTo(1); - Assertions.assertThat(results.size()).isEqualTo(1); + assertThat(results.size()).isEqualTo(1); } @Test @@ -1665,7 +1664,7 @@ public void testNestedGroupBy1a() throws Exception { ksession.insert(new Person("Mark", 42)); assertThat(ksession.fireAllRules()).isEqualTo(1); System.out.println(results); - Assertions.assertThat(results).containsOnly(Collections.singletonList(42)); + assertThat(results).containsOnly(Collections.singletonList(42)); } @Test @@ -1705,7 +1704,7 @@ public void testNestedGroupBy1b() throws Exception { ksession.insert(new Person("Mark", 42)); assertThat(ksession.fireAllRules()).isEqualTo(1); - Assertions.assertThat(results).containsOnly(Collections.singletonList(42)); + assertThat(results).containsOnly(Collections.singletonList(42)); } @Test @@ -1847,10 +1846,10 @@ public void testFilterOnAccumulateResultWithDecomposedGroupByKey() throws Except ksession.insert( "test" ); ksession.insert(new Person("Mark", 42)); assertThat(ksession.fireAllRules()).isEqualTo(1); - Assertions.assertThat(results.size()).isEqualTo(3); - Assertions.assertThat(results.get(0)).isEqualTo("M"); - Assertions.assertThat(results.get(1)).isEqualTo("a"); - Assertions.assertThat(results.get(2)).isEqualTo(42); + assertThat(results.size()).isEqualTo(3); + assertThat(results.get(0)).isEqualTo("M"); + assertThat(results.get(1)).isEqualTo("a"); + assertThat(results.get(2)).isEqualTo(42); } // These two test are commented out, until we figure out the correct way to do this and limitations. // If no correct way can be found, the tests can be deleted. diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/HalfBinaryTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/HalfBinaryTest.java index 3efd605edea..722f37965b2 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/HalfBinaryTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/HalfBinaryTest.java @@ -14,17 +14,17 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + import java.util.ArrayList; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.modelcompiler.domain.Address; import org.drools.modelcompiler.domain.Person; import org.junit.Test; import org.kie.api.runtime.KieSession; -import static org.junit.Assert.assertEquals; - public class HalfBinaryTest extends BaseModelTest { public HalfBinaryTest( RUN_TYPE testRunType ) { @@ -251,7 +251,7 @@ public void testHalfBinaryOrAndAmpersand() { ksession.insert(new Person("D", 40)); ksession.fireAllRules(); - Assertions.assertThat(result).containsExactlyInAnyOrder("A", "C"); + assertThat(result).containsExactlyInAnyOrder("A", "C"); } @Test @@ -275,6 +275,6 @@ public void testNestedHalfBinaryOrAndAmpersand() { ksession.insert(new Person("D", 40)); ksession.fireAllRules(); - Assertions.assertThat(result).containsExactlyInAnyOrder("A", "C"); + assertThat(result).containsExactlyInAnyOrder("A", "C"); } } diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/IncrementalCompilationTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/IncrementalCompilationTest.java index 3fbafe90069..2aa992542ff 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/IncrementalCompilationTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/IncrementalCompilationTest.java @@ -16,11 +16,13 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.modelcompiler.domain.Address; import org.drools.modelcompiler.domain.Person; import org.junit.Test; @@ -31,8 +33,6 @@ import org.kie.api.runtime.KieSession; import org.kie.internal.builder.conf.AlphaNetworkCompilerOption; -import static org.junit.Assert.assertEquals; - public class IncrementalCompilationTest extends BaseModelTest { public IncrementalCompilationTest( RUN_TYPE testRunType ) { @@ -355,7 +355,7 @@ public void testKJarUpgradeWithChangedFunctionForRHSWithoutExternalizeLambda() t ksession.insert(new Person("John")); assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("Hello John"); + assertThat(list).containsExactlyInAnyOrder("Hello John"); // Create a new jar for version 1.1.0 ReleaseId releaseId2 = ks.newReleaseId("org.kie", "test-upgrade", "1.1.0"); @@ -369,7 +369,7 @@ public void testKJarUpgradeWithChangedFunctionForRHSWithoutExternalizeLambda() t ksession.insert(new Person("Paul")); assertEquals(2, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("Hello John", "Good bye Paul", "Good bye John"); + assertThat(list).containsExactlyInAnyOrder("Hello John", "Good bye Paul", "Good bye John"); // try with a new session KieSession ksession2 = kc.newKieSession(); @@ -378,7 +378,7 @@ public void testKJarUpgradeWithChangedFunctionForRHSWithoutExternalizeLambda() t ksession2.insert(new Person("George")); assertEquals(1, ksession2.fireAllRules()); - Assertions.assertThat(list2).containsExactlyInAnyOrder("Good bye George"); + assertThat(list2).containsExactlyInAnyOrder("Good bye George"); } @Test @@ -420,7 +420,7 @@ public void testKJarUpgradeWithChangedFunctionForRHSWithExternalizeLambda() thro ksession.insert(new Person("John")); assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("Hello John"); + assertThat(list).containsExactlyInAnyOrder("Hello John"); // Create a new jar for version 1.1.0 ReleaseId releaseId2 = ks.newReleaseId("org.kie", "test-upgrade", "1.1.0"); @@ -434,7 +434,7 @@ public void testKJarUpgradeWithChangedFunctionForRHSWithExternalizeLambda() thro ksession.insert(new Person("Paul")); assertEquals(2, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("Hello John", "Good bye Paul", "Good bye John"); + assertThat(list).containsExactlyInAnyOrder("Hello John", "Good bye Paul", "Good bye John"); // try with a new session KieSession ksession2 = kc.newKieSession(); @@ -443,7 +443,7 @@ public void testKJarUpgradeWithChangedFunctionForRHSWithExternalizeLambda() thro ksession2.insert(new Person("George")); assertEquals(1, ksession2.fireAllRules()); - Assertions.assertThat(list2).containsExactlyInAnyOrder("Good bye George"); + assertThat(list2).containsExactlyInAnyOrder("Good bye George"); } @Test @@ -491,7 +491,7 @@ public void testKJarUpgradeWithChangedJavaFunctionForRHSWithoutExternalizeLambda ksession.insert(new Person("John")); assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("Hello John"); + assertThat(list).containsExactlyInAnyOrder("Hello John"); // Create a new jar for version 1.1.0 ReleaseId releaseId2 = ks.newReleaseId("org.kie", "test-upgrade", "1.1.0"); @@ -506,7 +506,7 @@ public void testKJarUpgradeWithChangedJavaFunctionForRHSWithoutExternalizeLambda ksession.insert(new Person("Paul")); assertEquals(2, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("Hello John", "Good bye Paul", "Good bye John"); + assertThat(list).containsExactlyInAnyOrder("Hello John", "Good bye Paul", "Good bye John"); // try with a new session KieSession ksession2 = kc.newKieSession(); @@ -515,7 +515,7 @@ public void testKJarUpgradeWithChangedJavaFunctionForRHSWithoutExternalizeLambda ksession2.insert(new Person("George")); assertEquals(1, ksession2.fireAllRules()); - Assertions.assertThat(list2).containsExactlyInAnyOrder("Good bye George"); + assertThat(list2).containsExactlyInAnyOrder("Good bye George"); } @Test @@ -563,7 +563,7 @@ public void testKJarUpgradeWithChangedJavaFunctionForRHSWithExternalizeLambda() ksession.insert(new Person("John")); assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("Hello John"); + assertThat(list).containsExactlyInAnyOrder("Hello John"); // Create a new jar for version 1.1.0 ReleaseId releaseId2 = ks.newReleaseId("org.kie", "test-upgrade", "1.1.0"); @@ -579,7 +579,7 @@ public void testKJarUpgradeWithChangedJavaFunctionForRHSWithExternalizeLambda() ksession.insert(new Person("Paul")); assertEquals(2, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("Hello John", "Good bye Paul", "Good bye John"); + assertThat(list).containsExactlyInAnyOrder("Hello John", "Good bye Paul", "Good bye John"); // try with a new session KieSession ksession2 = kc.newKieSession(); @@ -588,7 +588,7 @@ public void testKJarUpgradeWithChangedJavaFunctionForRHSWithExternalizeLambda() ksession2.insert(new Person("George")); assertEquals(1, ksession2.fireAllRules()); - Assertions.assertThat(list2).containsExactlyInAnyOrder("Good bye George"); + assertThat(list2).containsExactlyInAnyOrder("Good bye George"); } @Test @@ -631,7 +631,7 @@ public void testKJarUpgradeWithChangedFunctionForLHSWithoutExternalizeLambda() t assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("John"); + assertThat(list).containsExactlyInAnyOrder("John"); // Create a new jar for version 1.1.0 ReleaseId releaseId2 = ks.newReleaseId("org.kie", "test-upgrade", "1.1.0"); @@ -647,7 +647,7 @@ public void testKJarUpgradeWithChangedFunctionForLHSWithoutExternalizeLambda() t // re-fire assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("John", "John"); + assertThat(list).containsExactlyInAnyOrder("John", "John"); // try with a new session KieSession ksession2 = kc.newKieSession(); @@ -656,7 +656,7 @@ public void testKJarUpgradeWithChangedFunctionForLHSWithoutExternalizeLambda() t ksession2.insert(new Person("John")); assertEquals(1, ksession2.fireAllRules()); - Assertions.assertThat(list2).containsExactlyInAnyOrder("John"); + assertThat(list2).containsExactlyInAnyOrder("John"); } @Test @@ -699,7 +699,7 @@ public void testKJarUpgradeWithChangedFunctionForLHSWithExternalizeLambda() thro assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("John"); + assertThat(list).containsExactlyInAnyOrder("John"); // Create a new jar for version 1.1.0 ReleaseId releaseId2 = ks.newReleaseId("org.kie", "test-upgrade", "1.1.0"); @@ -715,7 +715,7 @@ public void testKJarUpgradeWithChangedFunctionForLHSWithExternalizeLambda() thro // re-fire assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("John", "John"); + assertThat(list).containsExactlyInAnyOrder("John", "John"); // try with a new session KieSession ksession2 = kc.newKieSession(); @@ -724,7 +724,7 @@ public void testKJarUpgradeWithChangedFunctionForLHSWithExternalizeLambda() thro ksession2.insert(new Person("John")); assertEquals(1, ksession2.fireAllRules()); - Assertions.assertThat(list2).containsExactlyInAnyOrder("John"); + assertThat(list2).containsExactlyInAnyOrder("John"); } @Test @@ -775,7 +775,7 @@ public void testKJarUpgradeWithChangedJavaFunctionForLHSWithoutExternalizeLambda assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("John"); + assertThat(list).containsExactlyInAnyOrder("John"); // Create a new jar for version 1.1.0 ReleaseId releaseId2 = ks.newReleaseId("org.kie", "test-upgrade", "1.1.0"); @@ -793,7 +793,7 @@ public void testKJarUpgradeWithChangedJavaFunctionForLHSWithoutExternalizeLambda // re-fire assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("John", "John"); + assertThat(list).containsExactlyInAnyOrder("John", "John"); // try with a new session KieSession ksession2 = kc.newKieSession(); @@ -802,7 +802,7 @@ public void testKJarUpgradeWithChangedJavaFunctionForLHSWithoutExternalizeLambda ksession2.insert(new Person("John")); assertEquals(1, ksession2.fireAllRules()); - Assertions.assertThat(list2).containsExactlyInAnyOrder("John"); + assertThat(list2).containsExactlyInAnyOrder("John"); } @Test @@ -853,7 +853,7 @@ public void testKJarUpgradeWithChangedJavaFunctionForLHSWithExternalizeLambda() assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("John"); + assertThat(list).containsExactlyInAnyOrder("John"); // Create a new jar for version 1.1.0 ReleaseId releaseId2 = ks.newReleaseId("org.kie", "test-upgrade", "1.1.0"); @@ -871,7 +871,7 @@ public void testKJarUpgradeWithChangedJavaFunctionForLHSWithExternalizeLambda() // re-fire assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(list).containsExactlyInAnyOrder("John", "John"); + assertThat(list).containsExactlyInAnyOrder("John", "John"); // try with a new session KieSession ksession2 = kc.newKieSession(); @@ -880,6 +880,6 @@ public void testKJarUpgradeWithChangedJavaFunctionForLHSWithExternalizeLambda() ksession2.insert(new Person("John")); assertEquals(1, ksession2.fireAllRules()); - Assertions.assertThat(list2).containsExactlyInAnyOrder("John"); + assertThat(list2).containsExactlyInAnyOrder("John"); } } diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MaterializedLambdaTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MaterializedLambdaTest.java index 29436108ed0..f3785c0381a 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MaterializedLambdaTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MaterializedLambdaTest.java @@ -1,15 +1,15 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + import java.time.Instant; import java.util.Date; -import org.assertj.core.api.Assertions; import org.drools.modelcompiler.domain.Result; import org.junit.Test; import org.kie.api.runtime.KieSession; -import static org.junit.Assert.*; - public class MaterializedLambdaTest extends BaseModelTest { public MaterializedLambdaTest(RUN_TYPE testRunType) { @@ -52,7 +52,7 @@ public void testMaterializeLambda() { Result r = new Result(); ksession.setGlobal("result", r); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(ksession.fireAllRules()).isEqualTo(1); assertEquals(0, r.getValue()); } @@ -87,7 +87,7 @@ public void testMaterializeLambdaWithNested() { ksession.setGlobal("result", r); int actual = ksession.fireAllRules(); - Assertions.assertThat(actual).isEqualTo(1); + assertThat(actual).isEqualTo(1); assertEquals(42, r.getValue()); } } diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelDialectTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelDialectTest.java index 43e771a06f2..1951e285d56 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelDialectTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelDialectTest.java @@ -16,6 +16,12 @@ package org.drools.modelcompiler; +import static java.math.BigDecimal.valueOf; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.math.BigDecimal; import java.math.BigInteger; import java.util.ArrayList; @@ -26,7 +32,6 @@ import java.util.Map; import java.util.Set; -import org.assertj.core.api.Assertions; import org.drools.modelcompiler.domain.Address; import org.drools.modelcompiler.domain.InternationalAddress; import org.drools.modelcompiler.domain.Person; @@ -36,12 +41,6 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; -import static java.math.BigDecimal.valueOf; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class MvelDialectTest extends BaseModelTest { public MvelDialectTest( RUN_TYPE testRunType ) { @@ -928,7 +927,7 @@ public void testCollectSubtypeInConsequence() { Arrays.asList(mario, luca, leonardo).forEach(ksession::insert); assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(names).containsExactlyInAnyOrder("Mario", "Luca", "Leonardo"); + assertThat(names).containsExactlyInAnyOrder("Mario", "Luca", "Leonardo"); } @Test @@ -973,8 +972,8 @@ public void testCollectSubtypeInConsequenceNested() { ksession.insert(a); assertEquals(1, ksession.fireAllRules()); - Assertions.assertThat(names).containsExactlyInAnyOrder("Mario", "Luca", "Leonardo"); - Assertions.assertThat(addresses).contains("Milan"); + assertThat(names).containsExactlyInAnyOrder("Mario", "Luca", "Leonardo"); + assertThat(addresses).contains("Milan"); } @Test diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelOperatorsTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelOperatorsTest.java index bbfd1e93c36..3a43dd34c62 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelOperatorsTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelOperatorsTest.java @@ -16,24 +16,23 @@ package org.drools.modelcompiler; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import org.assertj.core.api.Assertions; import org.drools.modelcompiler.domain.Person; import org.junit.Test; import org.kie.api.builder.Message; import org.kie.api.builder.Results; import org.kie.api.runtime.KieSession; -import static java.util.Arrays.asList; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class MvelOperatorsTest extends BaseModelTest { public MvelOperatorsTest( RUN_TYPE testRunType ) { @@ -352,7 +351,7 @@ public void testMatchesOnNullString() { Person first = new Person("686878"); ksession.insert(first); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(ksession.fireAllRules()).isEqualTo(1); } public static class DoubleFact { @@ -502,7 +501,7 @@ public void testListLiteralCreation() { Object obj = result.get(0); assertTrue(obj instanceof List); - Assertions.assertThat((List)obj).containsExactlyInAnyOrder("aaa", "bbb", "ccc"); + assertThat((List)obj).containsExactlyInAnyOrder("aaa", "bbb", "ccc"); } @Test diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NamedConsequencesTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NamedConsequencesTest.java index 54aa6543d02..c0a39f98a75 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NamedConsequencesTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NamedConsequencesTest.java @@ -16,12 +16,16 @@ package org.drools.modelcompiler; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.assertj.core.api.Assertions; import org.drools.modelcompiler.domain.Cheese; import org.drools.modelcompiler.domain.Person; import org.drools.modelcompiler.domain.Result; @@ -31,10 +35,6 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; -import static java.util.Arrays.asList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - public class NamedConsequencesTest extends BaseModelTest { public NamedConsequencesTest( RUN_TYPE testRunType ) { @@ -551,7 +551,7 @@ public void test2ModifyBlocksInNamedConsequences() { int fired = ksession.fireAllRules(); assertEquals(2, fired); - Assertions.assertThat(results).containsExactlyInAnyOrder(10, 15); + assertThat(results).containsExactlyInAnyOrder(10, 15); } @Test diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NullSafeDereferencingTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NullSafeDereferencingTest.java index 440e9bd00ea..1377473abe2 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NullSafeDereferencingTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NullSafeDereferencingTest.java @@ -16,11 +16,13 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.modelcompiler.domain.Address; import org.drools.modelcompiler.domain.MysteriousMan; import org.drools.modelcompiler.domain.Person; @@ -28,8 +30,6 @@ import org.junit.Test; import org.kie.api.runtime.KieSession; -import static org.junit.Assert.assertEquals; - public class NullSafeDereferencingTest extends BaseModelTest { public NullSafeDereferencingTest( RUN_TYPE testRunType ) { @@ -270,7 +270,7 @@ public void testNullSafeDereferncingWithOrHalfBinary() { ksession.insert(new Person("George", 21, new Address("George"))); ksession.fireAllRules(); - Assertions.assertThat(result).containsExactlyInAnyOrder("John", "George"); + assertThat(result).containsExactlyInAnyOrder("John", "George"); } @Test @@ -293,7 +293,7 @@ public void testNullSafeDereferencingNonPredicate() { ksession.insert(new Person("George", 21, new Address("Tokyo"))); ksession.fireAllRules(); - Assertions.assertThat(result).containsExactlyInAnyOrder("London", "Tokyo"); + assertThat(result).containsExactlyInAnyOrder("London", "Tokyo"); } @Test @@ -316,7 +316,7 @@ public void testMultipleNullSafeDereferencingNonPredicate() { ksession.insert(new Person("George", 21, new Address(null))); ksession.fireAllRules(); - Assertions.assertThat(result).containsExactlyInAnyOrder(6); + assertThat(result).containsExactlyInAnyOrder(6); } @Test @@ -339,7 +339,7 @@ public void testNullSafeDereferencingPredicateMethod() { ksession.insert(new Person("George", 21, new Address("Tokyo"))); ksession.fireAllRules(); - Assertions.assertThat(result).containsExactlyInAnyOrder(true, false); + assertThat(result).containsExactlyInAnyOrder(true, false); } @Test @@ -396,7 +396,7 @@ public void testNullSafeDereferncingWithOr() { ksession.fireAllRules(); - Assertions.assertThat(result).containsExactlyInAnyOrder("Bob", "Paul"); + assertThat(result).containsExactlyInAnyOrder("Bob", "Paul"); } @Test @@ -429,6 +429,6 @@ public void testNullSafeDereferncingWithInstanceof() { ksession.fireAllRules(); - Assertions.assertThat(result).containsExactlyInAnyOrder("Paul"); + assertThat(result).containsExactlyInAnyOrder("Paul"); } } diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OOPathTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OOPathTest.java index d3800790b37..7bd6f1fe0a1 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OOPathTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OOPathTest.java @@ -16,10 +16,12 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.modelcompiler.domain.Employee.createEmployee; + import java.util.ArrayList; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.modelcompiler.domain.Address; import org.drools.modelcompiler.domain.Child; import org.drools.modelcompiler.domain.Employee; @@ -27,12 +29,9 @@ import org.drools.modelcompiler.domain.Man; import org.drools.modelcompiler.domain.Toy; import org.drools.modelcompiler.domain.Woman; -import org.junit.Ignore; import org.junit.Test; import org.kie.api.runtime.KieSession; -import static org.drools.modelcompiler.domain.Employee.createEmployee; - public class OOPathTest extends BaseModelTest { public OOPathTest( RUN_TYPE testRunType ) { @@ -70,7 +69,7 @@ public void testOOPath() { ksession.insert( carl ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("Bob"); + assertThat(list).containsExactlyInAnyOrder("Bob"); } @Test @@ -99,7 +98,7 @@ public void testOOPathBinding() { ksession.insert( carl ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder(38); + assertThat(list).containsExactlyInAnyOrder(38); } @Test @@ -135,13 +134,13 @@ public void testReactiveOOPath() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("car", "ball"); + assertThat(list).containsExactlyInAnyOrder("car", "ball"); list.clear(); debbie.setAge( 11 ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("doll"); + assertThat(list).containsExactlyInAnyOrder("doll"); } @@ -179,7 +178,7 @@ public void testBackReferenceConstraint() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("ball", "guitar"); + assertThat(list).containsExactlyInAnyOrder("ball", "guitar"); } @Test @@ -203,7 +202,7 @@ public void testSimpleOOPathCast1() { ksession.insert(bob); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("Bob"); + assertThat(list).containsExactlyInAnyOrder("Bob"); } @Test @@ -227,7 +226,7 @@ public void testSimpleOOPathCast2() { ksession.insert(bob); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("Bob"); + assertThat(list).containsExactlyInAnyOrder("Bob"); } @Test @@ -251,7 +250,7 @@ public void testSimpleOOPathCast3() { ksession.insert(bob); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("Bob"); + assertThat(list).containsExactlyInAnyOrder("Bob"); } @Test @@ -280,7 +279,7 @@ public void testOOPathMultipleConditions() { kieSession.fireAllRules(); - Assertions.assertThat(results).containsExactlyInAnyOrder("Big City"); + assertThat(results).containsExactlyInAnyOrder("Big City"); } @Test @@ -311,7 +310,7 @@ public void testOOPathMultipleConditionsWithBinding() { kieSession.fireAllRules(); - Assertions.assertThat(results).containsExactlyInAnyOrder("Alice"); + assertThat(results).containsExactlyInAnyOrder("Alice"); } @Test @@ -344,7 +343,7 @@ public void testOrConditionalElementNoBinding() { kieSession.fireAllRules(); - Assertions.assertThat(results).containsExactlyInAnyOrder("Bruno", "Alice"); + assertThat(results).containsExactlyInAnyOrder("Bruno", "Alice"); } @Test @@ -375,7 +374,7 @@ public void testOrConditionalElement() { kieSession.fireAllRules(); - Assertions.assertThat(results).containsExactlyInAnyOrder("Big City", "Small City"); + assertThat(results).containsExactlyInAnyOrder("Big City", "Small City"); } @Test @@ -405,7 +404,7 @@ public void testOrConstraintNoBinding() { kieSession.fireAllRules(); - Assertions.assertThat(results).containsExactlyInAnyOrder("Bruno", "Alice"); + assertThat(results).containsExactlyInAnyOrder("Bruno", "Alice"); } @Test @@ -435,7 +434,7 @@ public void testOrConstraintWithJoin() { kieSession.fireAllRules(); - Assertions.assertThat(results).containsExactlyInAnyOrder("Big City", "Small City"); + assertThat(results).containsExactlyInAnyOrder("Big City", "Small City"); } @Test @@ -464,7 +463,7 @@ public void testOrConstraint() { kieSession.insert(alice); kieSession.fireAllRules(); - Assertions.assertThat(results).containsExactlyInAnyOrder("Big City", "Small City"); + assertThat(results).containsExactlyInAnyOrder("Big City", "Small City"); } } diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OrTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OrTest.java index 0d9b60d9199..2216f931b83 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OrTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OrTest.java @@ -16,10 +16,15 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.modelcompiler.domain.Employee.createEmployee; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.modelcompiler.domain.Address; import org.drools.modelcompiler.domain.Employee; import org.drools.modelcompiler.domain.Person; @@ -27,11 +32,6 @@ import org.kie.api.builder.Results; import org.kie.api.runtime.KieSession; -import static org.drools.modelcompiler.domain.Employee.createEmployee; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - public class OrTest extends BaseModelTest { public OrTest( RUN_TYPE testRunType ) { @@ -161,7 +161,7 @@ public void testOrConditional() { kieSession.fireAllRules(); - Assertions.assertThat(results).containsExactlyInAnyOrder("Big City", "Small City"); + assertThat(results).containsExactlyInAnyOrder("Big City", "Small City"); } @Test @@ -190,7 +190,7 @@ public void testOrConstraint() { kieSession.fireAllRules(); - Assertions.assertThat(results).containsExactlyInAnyOrder("Big City", "Small City"); + assertThat(results).containsExactlyInAnyOrder("Big City", "Small City"); } @Test diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/PatternDSLTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/PatternDSLTest.java index 5870bd280ba..8125f6cce46 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/PatternDSLTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/PatternDSLTest.java @@ -16,6 +16,34 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.model.DSL.accFunction; +import static org.drools.model.DSL.accumulate; +import static org.drools.model.DSL.after; +import static org.drools.model.DSL.and; +import static org.drools.model.DSL.declarationOf; +import static org.drools.model.DSL.execute; +import static org.drools.model.DSL.globalOf; +import static org.drools.model.DSL.not; +import static org.drools.model.DSL.on; +import static org.drools.model.DSL.or; +import static org.drools.model.DSL.reactiveFrom; +import static org.drools.model.DSL.supply; +import static org.drools.model.DSL.valueOf; +import static org.drools.model.PatternDSL.alphaIndexedBy; +import static org.drools.model.PatternDSL.betaIndexedBy; +import static org.drools.model.PatternDSL.pattern; +import static org.drools.model.PatternDSL.query; +import static org.drools.model.PatternDSL.reactOn; +import static org.drools.model.PatternDSL.rule; +import static org.drools.model.PatternDSL.when; +import static org.drools.modelcompiler.BaseModelTest.getObjectsIntoList; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; + import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -25,7 +53,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.math3.util.Pair; -import org.assertj.core.api.Assertions; import org.drools.core.ClockType; import org.drools.core.base.ClassObjectType; import org.drools.core.base.accumulators.CollectSetAccumulateFunction; @@ -70,33 +97,6 @@ import org.kie.api.runtime.rule.QueryResults; import org.kie.api.time.SessionPseudoClock; -import static org.drools.model.DSL.supply; -import static org.drools.model.PatternDSL.accFunction; -import static org.drools.model.PatternDSL.accumulate; -import static org.drools.model.PatternDSL.after; -import static org.drools.model.PatternDSL.alphaIndexedBy; -import static org.drools.model.PatternDSL.and; -import static org.drools.model.PatternDSL.betaIndexedBy; -import static org.drools.model.PatternDSL.declarationOf; -import static org.drools.model.PatternDSL.execute; -import static org.drools.model.PatternDSL.globalOf; -import static org.drools.model.PatternDSL.not; -import static org.drools.model.PatternDSL.on; -import static org.drools.model.PatternDSL.or; -import static org.drools.model.PatternDSL.pattern; -import static org.drools.model.PatternDSL.query; -import static org.drools.model.PatternDSL.reactOn; -import static org.drools.model.PatternDSL.reactiveFrom; -import static org.drools.model.PatternDSL.rule; -import static org.drools.model.PatternDSL.valueOf; -import static org.drools.model.PatternDSL.when; -import static org.drools.modelcompiler.BaseModelTest.getObjectsIntoList; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; - public class PatternDSLTest { @Test @@ -188,7 +188,7 @@ public void testBetaWithBinding() { ksession.fireAllRules(); Collection results = getObjectsIntoList(ksession, String.class); - Assertions.assertThat(results).containsExactlyInAnyOrder("Mario is older than Mark"); + assertThat(results).containsExactlyInAnyOrder("Mario is older than Mark"); ksession.delete(marioFH); ksession.fireAllRules(); @@ -198,7 +198,7 @@ public void testBetaWithBinding() { ksession.fireAllRules(); results = getObjectsIntoList(ksession, String.class); - Assertions.assertThat(results).containsExactlyInAnyOrder("Mario is older than Mark", "Edson is older than Mark"); + assertThat(results).containsExactlyInAnyOrder("Mario is older than Mark", "Edson is older than Mark"); } @Test @@ -630,13 +630,13 @@ public void testReactiveOOPath() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("car", "ball"); + assertThat(list).containsExactlyInAnyOrder("car", "ball"); list.clear(); debbie.setAge( 11 ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("doll"); + assertThat(list).containsExactlyInAnyOrder("doll"); } @Test diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/QueryTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/QueryTest.java index 9d7b440971b..bba9b103738 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/QueryTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/QueryTest.java @@ -16,13 +16,16 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.core.QueryResultsImpl; import org.drools.core.rule.QueryImpl; import org.drools.modelcompiler.domain.Person; @@ -41,9 +44,6 @@ import org.kie.api.runtime.rule.QueryResultsRow; import org.kie.api.runtime.rule.Variable; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - public class QueryTest extends BaseModelTest { public QueryTest( RUN_TYPE testRunType ) { @@ -470,8 +470,8 @@ private void checkRecursiveQuery( String query ) throws InstantiationException, ksession.insert("pull"); ksession.fireAllRules(); - Assertions.assertThat(listener.isRuleFired("testPullQueryRule")).isTrue(); - Assertions.assertThat(listener.isRuleFired("testPushQueryRule")).isFalse(); + assertThat(listener.isRuleFired("testPullQueryRule")).isTrue(); + assertThat(listener.isRuleFired("testPushQueryRule")).isFalse(); listener.clear(); // when location is changed of what Peter likes, pull query should @@ -488,8 +488,8 @@ private void checkRecursiveQuery( String query ) throws InstantiationException, ksession.delete(tableHandle); ksession.fireAllRules(); - Assertions.assertThat(listener.isRuleFired("testPullQueryRule")).isFalse(); - Assertions.assertThat(listener.isRuleFired("testPushQueryRule")).isFalse(); + assertThat(listener.isRuleFired("testPullQueryRule")).isFalse(); + assertThat(listener.isRuleFired("testPushQueryRule")).isFalse(); listener.clear(); final Person paul = new Person("Paul"); @@ -497,8 +497,8 @@ private void checkRecursiveQuery( String query ) throws InstantiationException, ksession.insert(paul); ksession.fireAllRules(); - Assertions.assertThat(listener.isRuleFired("testPullQueryRule")).isTrue(); - Assertions.assertThat(listener.isRuleFired("testPushQueryRule")).isFalse(); + assertThat(listener.isRuleFired("testPullQueryRule")).isTrue(); + assertThat(listener.isRuleFired("testPushQueryRule")).isFalse(); } @Test @@ -569,11 +569,11 @@ public void testRecursiveQueryWithBatchCommand() throws Exception { } // items in the office should be the following - Assertions.assertThat(l.size()).isEqualTo(4); - Assertions.assertThat(l.contains("desk")).isTrue(); - Assertions.assertThat(l.contains("flashlight")).isTrue(); - Assertions.assertThat(l.contains("envelope")).isTrue(); - Assertions.assertThat(l.contains("key")).isTrue(); + assertThat(l.size()).isEqualTo(4); + assertThat(l.contains("desk")).isTrue(); + assertThat(l.contains("flashlight")).isTrue(); + assertThat(l.contains("envelope")).isTrue(); + assertThat(l.contains("key")).isTrue(); } @Test diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/RuleAttributesTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/RuleAttributesTest.java index 621c0456716..11f398d1cbb 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/RuleAttributesTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/RuleAttributesTest.java @@ -16,6 +16,10 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -23,7 +27,6 @@ import java.util.List; import java.util.Map; -import org.assertj.core.api.Assertions; import org.drools.modelcompiler.domain.Person; import org.drools.modelcompiler.domain.Result; import org.junit.Test; @@ -32,9 +35,6 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - public class RuleAttributesTest extends BaseModelTest { public RuleAttributesTest( RUN_TYPE testRunType ) { @@ -344,7 +344,7 @@ public void testAutoFocus() { // disable, we won't succeed final FactHandle withoutAutoFocus = ksession.insert("withoutAutoFocus"); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(0); + assertThat(listener.size()).isEqualTo(0); // second test - we try to fire rule in agenda group with auto focus // enabled @@ -353,10 +353,10 @@ public void testAutoFocus() { ksession.insert("autoFocus"); ksession.delete(withoutAutoFocus); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(2); + assertThat(listener.size()).isEqualTo(2); final String[] expected = {"b2", "b1"}; for (int i = 0; i < listener.size(); i++) { - Assertions.assertThat(listener.get(i)).isEqualTo(expected[i]); + assertThat(listener.get(i)).isEqualTo(expected[i]); } } @@ -396,8 +396,8 @@ public void testMetadataBasics() { final Map metadata = ksession.getKieBase().getRule(PACKAGE_NAME, RULE_NAME).getMetaData(); - Assertions.assertThat(metadata.containsKey(RULE_KEY)).isTrue(); - Assertions.assertThat(metadata.get(RULE_KEY)).isEqualTo("\"" + RULE_VALUE + "\""); + assertThat(metadata.containsKey(RULE_KEY)).isTrue(); + assertThat(metadata.get(RULE_KEY)).isEqualTo("\"" + RULE_VALUE + "\""); } @Test @@ -417,10 +417,10 @@ public void testMetadataValue() { final Map metadata = ksession.getKieBase().getRule("org.test", "R1").getMetaData(); - Assertions.assertThat(metadata.get("metaValueString")).isEqualTo("asd"); - Assertions.assertThat(metadata.get("metaValueCheck1")).isSameAs(java.math.BigDecimal.ONE); - Assertions.assertThat(metadata.get("metaValueCheck2")).isSameAs(Boolean.TRUE); - Assertions.assertThat(metadata.get("metaValueCheck3")).isSameAs(System.out); + assertThat(metadata.get("metaValueString")).isEqualTo("asd"); + assertThat(metadata.get("metaValueCheck1")).isSameAs(java.math.BigDecimal.ONE); + assertThat(metadata.get("metaValueCheck2")).isSameAs(Boolean.TRUE); + assertThat(metadata.get("metaValueCheck3")).isSameAs(System.out); } @Test diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ToStringTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ToStringTest.java index cbd7eca07e8..7a12f40f9cc 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ToStringTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ToStringTest.java @@ -15,9 +15,18 @@ */ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.model.DSL.accFunction; +import static org.drools.model.DSL.accumulate; +import static org.drools.model.DSL.declarationOf; +import static org.drools.model.DSL.on; +import static org.drools.model.PatternDSL.alphaIndexedBy; +import static org.drools.model.PatternDSL.betaIndexedBy; +import static org.drools.model.PatternDSL.pattern; +import static org.drools.model.PatternDSL.rule; + import java.util.function.Supplier; -import org.assertj.core.api.Assertions; import org.drools.core.base.accumulators.AverageAccumulateFunction; import org.drools.model.Index; import org.drools.model.PatternDSL; @@ -31,15 +40,6 @@ import org.junit.Test; import org.kie.api.runtime.rule.AccumulateFunction; -import static org.drools.model.DSL.accFunction; -import static org.drools.model.DSL.accumulate; -import static org.drools.model.DSL.declarationOf; -import static org.drools.model.DSL.on; -import static org.drools.model.PatternDSL.alphaIndexedBy; -import static org.drools.model.PatternDSL.betaIndexedBy; -import static org.drools.model.PatternDSL.pattern; -import static org.drools.model.PatternDSL.rule; - public class ToStringTest { /** @@ -109,6 +109,6 @@ public void testToString() { "consequences: {default=" + consequenceToString + "}), consequences: {default=" + consequenceToString + "})"; - Assertions.assertThat(rule).hasToString(expectedToString); + assertThat(rule).hasToString(expectedToString); } } diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeCoercionTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeCoercionTest.java index bbf9f7ecd4a..4fe2c71a977 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeCoercionTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeCoercionTest.java @@ -16,13 +16,16 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.modelcompiler.domain.ChildFactWithObject; import org.drools.modelcompiler.domain.DateTimeHolder; import org.drools.modelcompiler.domain.Person; @@ -30,9 +33,6 @@ import org.junit.Test; import org.kie.api.runtime.KieSession; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - public class TypeCoercionTest extends BaseModelTest { public TypeCoercionTest( RUN_TYPE testRunType ) { @@ -278,7 +278,7 @@ public void testPrimitivePromotionInLHS() { Collection results = getObjectsIntoList( ksession, Result.class ); assertEquals( 1, results.size() ); - Assertions.assertThat(results.stream().map(Result::getValue)).containsExactlyInAnyOrder(luca); + assertThat(results.stream().map(Result::getValue)).containsExactlyInAnyOrder(luca); } @Test diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeObjectCoercionTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeObjectCoercionTest.java index 0e1b747f868..a22f918caf3 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeObjectCoercionTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeObjectCoercionTest.java @@ -16,19 +16,19 @@ package org.drools.modelcompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.assertj.core.api.Assertions; import org.junit.Test; import org.kie.api.runtime.KieSession; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - public class TypeObjectCoercionTest extends BaseModelTest { public TypeObjectCoercionTest(RUN_TYPE testRunType) { @@ -445,7 +445,7 @@ public void testCoercionStringVsObjectIntegerWithMap() { ksession.fireAllRules(); - Assertions.assertThat(list).containsExactly(holder1); // If we do String comparison, cheese10 is also contained + assertThat(list).containsExactly(holder1); // If we do String comparison, cheese10 is also contained } finally { ksession.dispose(); } @@ -487,7 +487,7 @@ public void testCoercionStringVsExplicitIntegerWithMap() { ksession.fireAllRules(); - Assertions.assertThat(list).containsExactly(holder1); // If we do String comparison, cheese10 is also contained + assertThat(list).containsExactly(holder1); // If we do String comparison, cheese10 is also contained } finally { ksession.dispose(); } diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/builder/generator/drlxparse/CoercedExpressionTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/builder/generator/drlxparse/CoercedExpressionTest.java index b141492a6c5..f549b080f53 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/builder/generator/drlxparse/CoercedExpressionTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/builder/generator/drlxparse/CoercedExpressionTest.java @@ -18,7 +18,7 @@ import java.util.Map; import com.github.javaparser.ast.expr.StringLiteralExpr; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.drools.core.util.MethodUtils; import org.drools.modelcompiler.builder.generator.DrlxParseUtil; import org.drools.modelcompiler.builder.generator.TypedExpression; @@ -218,7 +218,7 @@ public void testStringToBooleanFalse() { public void testStringToBooleanRandomStringError() { final TypedExpression left = expr(THIS_PLACEHOLDER + ".getBooleanValue", Boolean.class); final TypedExpression right = expr("\"randomString\"", String.class); - Assertions.assertThatThrownBy(() -> new CoercedExpression(left, right, false).coerce()) + assertThatThrownBy(() -> new CoercedExpression(left, right, false).coerce()) .isInstanceOf(CoercedExpression.CoercedExpressionException.class); } @@ -226,7 +226,7 @@ public void testStringToBooleanRandomStringError() { public void testIntegerToBooleanError() { final TypedExpression left = expr(THIS_PLACEHOLDER + ".getBooleanValue", Boolean.class); final TypedExpression right = expr("1", Integer.class); - Assertions.assertThatThrownBy(() -> new CoercedExpression(left, right, false).coerce()) + assertThatThrownBy(() -> new CoercedExpression(left, right, false).coerce()) .isInstanceOf(CoercedExpression.CoercedExpressionException.class); } From 5a8f87dc74858683529e547f95c7414b0171a6c5 Mon Sep 17 00:00:00 2001 From: Paolo Bizzarri Date: Wed, 23 Mar 2022 14:24:25 +0100 Subject: [PATCH 4/9] Fix assertj imports for drools-test-coverage projects --- .../kieci/withdomain/KJarLoadingTest.java | 23 +-- .../kieci/withoutdomain/KJarLoadingTest.java | 7 +- .../integrationtests/AccumulateTest.java | 102 ++++++------- .../AlphaNodeRangeIndexingTest.java | 18 +-- .../AnnotationsOnPatternTest.java | 14 +- .../integrationtests/AnnotationsTest.java | 16 +- .../compiler/integrationtests/CepEspTest.java | 61 ++++---- .../integrationtests/CepJavaTypeTest.java | 10 +- .../integrationtests/ConstraintsTest.java | 14 +- .../JoinNodeRangeIndexingTest.java | 28 ++-- .../integrationtests/StreamsTest.java | 61 ++++---- .../TimerAndCalendarExceptionTest.java | 8 +- .../TimerAndCalendarWithPseudoTimeTest.java | 12 +- .../integrationtests/drl/BindTest.java | 20 +-- .../integrationtests/drl/ConsequenceTest.java | 18 +-- .../integrationtests/drl/DRLCepTest.java | 5 +- .../integrationtests/drl/DRLTest.java | 34 ++--- .../drl/DrlSpecificFeaturesTest.java | 14 +- .../integrationtests/drl/ExceptionTest.java | 5 +- .../integrationtests/drl/ImportsTest.java | 16 +- .../integrationtests/drl/PatternTest.java | 26 ++-- .../equalitymode/EqualityModeTest.java | 13 +- .../AddRemoveRulesAddDeleteFactsTest.java | 9 +- .../AddRemoveRulesAdvOperatorsTest.java | 19 +-- .../AddRemoveRulesTest.java | 138 +++++++++--------- .../AddRemoveTestCases.java | 83 +++++------ .../integrationtests/operators/FromTest.java | 18 +-- .../NativeJavaCompilerSettingsTest.java | 29 ++-- .../mvel/compiler/compiler/DrlParserTest.java | 16 +- .../compiler/xml/rules/DumperTest.java | 16 +- .../compiler/xml/rules/DumperTestHelper.java | 14 +- .../xml/rules/XmlPackageReaderTest.java | 22 +-- ...ojectTransformUrlToFileSystemPathTest.java | 5 +- .../MemoryKieModuleResourceProviderTest.java | 19 +-- .../mvel/compiler/kproject/ReleaseIdTest.java | 14 +- .../mvel/compiler/lang/RuleParserTest.java | 19 +-- .../compiler/lang/api/DescrBuilderTest.java | 34 ++--- .../lang/descr/ConnectiveDescrTest.java | 11 +- .../compiler/oopath/OOPathAccumulateTest.java | 9 +- .../compiler/oopath/OOPathBenchmarkTest.java | 12 +- .../mvel/compiler/oopath/OOPathBindTest.java | 16 +- .../mvel/compiler/oopath/OOPathCastTest.java | 10 +- .../compiler/oopath/OOPathMultilevelTest.java | 9 +- .../compiler/oopath/OOPathQueriesTest.java | 7 +- .../compiler/oopath/OOPathReactiveTest.java | 70 ++++----- .../mvel/compiler/oopath/OOPathTest.java | 18 +-- .../mvel/integrationtests/ExpirationTest.java | 26 ++-- .../mvel/integrationtests/FunctionsTest.java | 10 +- .../mvel/integrationtests/JittingTest.java | 16 +- .../mvel/integrationtests/KieBuilderTest.java | 18 +-- .../integrationtests/KieContainerTest.java | 16 +- .../mvel/integrationtests/Misc2Test.java | 38 ++--- .../NamedConsequencesTest.java | 14 +- .../PropertySpecificTest.java | 32 ++-- .../integrationtests/XSDResourceTest.java | 5 +- .../AbstractConcurrentInsertionsTest.java | 5 +- .../concurrency/AbstractConcurrentTest.java | 5 +- .../ConcurrentBasesParallelTest.java | 65 +++++---- ...aTypeEvaluationConcurrentSessionsTest.java | 7 +- .../concurrency/MultithreadTest.java | 18 ++- .../SharedSessionParallelTest.java | 27 ++-- .../phreak/PhreakLiaNodeTest.java | 5 +- .../integrationtests/session/DeleteTest.java | 50 +++---- .../session/SessionsPoolTest.java | 20 +-- .../testcoverage/common/util/KieUtil.java | 5 +- .../testcoverage/common/util/Session.java | 4 +- .../functional/ActivationGroupTest.java | 19 +-- .../functional/DecisionTableTest.java | 138 +++++++++--------- .../functional/DeclarativeAgendaTest.java | 53 +++---- .../functional/DuplicityTest.java | 7 +- .../functional/FactHandleTest.java | 5 +- .../functional/KieContainerDefaultsTest.java | 34 +++-- .../functional/KieContainerTest.java | 8 +- .../functional/KieRepositoryTest.java | 13 +- .../functional/LiveQueriesBadResultTest.java | 5 +- .../LogicalInsertFromCollectionTest.java | 22 +-- .../functional/QueryBadResultTest.java | 14 +- .../functional/ResourcesTest.java | 29 ++-- .../functional/RuleTemplateTest.java | 11 +- .../functional/TemplatesTest.java | 21 +-- .../testcoverage/functional/UnicodeTest.java | 59 ++++---- .../DecisionTableKieContainerTest.java | 9 +- .../functional/oopath/OOPathCepTest.java | 72 ++++----- .../oopath/OOPathLogicalBranchesTest.java | 27 ++-- .../functional/oopath/OOPathSmokeTest.java | 10 +- .../AbstractCompositeRestrictionTest.java | 5 +- .../AccumulateRecalculationTest.java | 11 +- .../regression/DateExtendingFactTest.java | 5 +- .../regression/DeclarationWithOrTest.java | 5 +- ...serializationWithCompositeTriggerTest.java | 5 +- .../regression/DroolsGcCausesNPETest.java | 18 ++- .../regression/EqualityKeyOverrideTest.java | 18 ++- .../regression/EscapesInMetadataTest.java | 7 +- .../EventDeserializationInPastTest.java | 5 +- .../regression/FixedPatternTest.java | 7 +- .../regression/FromGenericCollectionTest.java | 5 +- .../regression/FusionAfterBeforeTest.java | 16 +- .../regression/GlobalOnLHSTest.java | 18 ++- .../regression/InaccurateComparisonTest.java | 5 +- .../LogicalInsertionsSerializationTest.java | 23 ++- .../MultiRestrictionPatternTest.java | 25 ++-- .../MultipleKieBaseListenersTest.java | 9 +- .../MultipleSalienceUpdateFactTest.java | 25 ++-- .../regression/MultipleSheetsLoadingTest.java | 9 +- .../MvelOverloadedMethodsUsageTest.java | 20 ++- .../regression/NonStringCompareTest.java | 9 +- .../regression/NotInFusionTest.java | 36 +++-- .../regression/PropertyListenerTest.java | 5 +- .../SerializationWithCollectTest.java | 11 +- .../SessionInsertMultiThreadingTest.java | 13 +- .../regression/StarImportTest.java | 29 ++-- .../UnwantedStringConversionTest.java | 9 +- .../regression/XSDResourceTest.java | 5 +- .../regression/mvel/MvelLinkageErrorTest.java | 8 +- 114 files changed, 1264 insertions(+), 1186 deletions(-) diff --git a/drools-test-coverage/standalone/kie-ci-with-domain/tests/src/test/java/org/drools/testcoverage/kieci/withdomain/KJarLoadingTest.java b/drools-test-coverage/standalone/kie-ci-with-domain/tests/src/test/java/org/drools/testcoverage/kieci/withdomain/KJarLoadingTest.java index a9b6bb5f001..9777f09dace 100644 --- a/drools-test-coverage/standalone/kie-ci-with-domain/tests/src/test/java/org/drools/testcoverage/kieci/withdomain/KJarLoadingTest.java +++ b/drools-test-coverage/standalone/kie-ci-with-domain/tests/src/test/java/org/drools/testcoverage/kieci/withdomain/KJarLoadingTest.java @@ -1,6 +1,7 @@ package org.drools.testcoverage.kieci.withdomain; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + import org.drools.testcoverage.domain.Customer; import org.drools.testcoverage.domain.Drink; import org.drools.testcoverage.domain.Order; @@ -41,8 +42,8 @@ public void dispose() { @Test public void testLoadingKJarWithDeps() { - Assertions.assertThat(this.kieSession).as("Failed to create KieSession.").isNotNull(); - Assertions.assertThat(this.kieSession.getKieBase().getKiePackages()).as("No rules compiled.").isNotEmpty(); + assertThat(this.kieSession).as("Failed to create KieSession.").isNotNull(); + assertThat(this.kieSession.getKieBase().getKiePackages()).as("No rules compiled.").isNotEmpty(); } @Test @@ -54,8 +55,8 @@ public void testRulesFireOldCustomerWithAlcohol() { this.kieSession.insert(order); this.kieSession.fireAllRules(); - Assertions.assertThat(order.isApproved()).as("Order should have been processed by the rules.").isNotNull(); - Assertions.assertThat(order.isApproved()).as("Order should have been approved.").isTrue(); + assertThat(order.isApproved()).as("Order should have been processed by the rules.").isNotNull(); + assertThat(order.isApproved()).as("Order should have been approved.").isTrue(); } @Test @@ -67,8 +68,8 @@ public void testRulesFireYoungCustomerWithAlcohol() { this.kieSession.insert(order); this.kieSession.fireAllRules(); - Assertions.assertThat(order.isApproved()).as("Order should have been processed by the rules.").isNotNull(); - Assertions.assertThat(order.isApproved()).as("Order should have been disapproved.").isFalse(); + assertThat(order.isApproved()).as("Order should have been processed by the rules.").isNotNull(); + assertThat(order.isApproved()).as("Order should have been disapproved.").isFalse(); } @Test @@ -80,8 +81,8 @@ public void testRulesFireOldCustomerWithNonAlcohol() { this.kieSession.insert(order); this.kieSession.fireAllRules(); - Assertions.assertThat(order.isApproved()).as("Order should have been processed by the rules.").isNotNull(); - Assertions.assertThat(order.isApproved()).as("Order should have been approved.").isTrue(); + assertThat(order.isApproved()).as("Order should have been processed by the rules.").isNotNull(); + assertThat(order.isApproved()).as("Order should have been approved.").isTrue(); } @Test @@ -93,7 +94,7 @@ public void testRulesFireYoungCustomerWithNonAlcohol() { this.kieSession.insert(order); this.kieSession.fireAllRules(); - Assertions.assertThat(order.isApproved()).as("Order should have been processed by the rules.").isNotNull(); - Assertions.assertThat(order.isApproved()).as("Order should have been approved.").isTrue(); + assertThat(order.isApproved()).as("Order should have been processed by the rules.").isNotNull(); + assertThat(order.isApproved()).as("Order should have been approved.").isTrue(); } } diff --git a/drools-test-coverage/standalone/kie-ci-without-domain/tests/src/test/java/org/drools/testcoverage/kieci/withoutdomain/KJarLoadingTest.java b/drools-test-coverage/standalone/kie-ci-without-domain/tests/src/test/java/org/drools/testcoverage/kieci/withoutdomain/KJarLoadingTest.java index 6b6039e6bed..503db052fb3 100644 --- a/drools-test-coverage/standalone/kie-ci-without-domain/tests/src/test/java/org/drools/testcoverage/kieci/withoutdomain/KJarLoadingTest.java +++ b/drools-test-coverage/standalone/kie-ci-without-domain/tests/src/test/java/org/drools/testcoverage/kieci/withoutdomain/KJarLoadingTest.java @@ -1,6 +1,7 @@ package org.drools.testcoverage.kieci.withoutdomain; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + import org.drools.testcoverage.kieci.withoutdomain.util.KJarLoadUtils; import org.junit.After; import org.junit.Before; @@ -39,7 +40,7 @@ public void dispose() { @Test public void testLoadingKJarWithDeps() { // BZ 1305798 - Assertions.assertThat(this.kieSession).as("Failed to create KieSession.").isNotNull(); - Assertions.assertThat(this.kieSession.getKieBase().getKiePackages()).as("No rules compiled.").isNotEmpty(); + assertThat(this.kieSession).as("Failed to create KieSession.").isNotNull(); + assertThat(this.kieSession.getKieBase().getKiePackages()).as("No rules compiled.").isNotEmpty(); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AccumulateTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AccumulateTest.java index b7fefccbab1..99bc755586d 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AccumulateTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AccumulateTest.java @@ -15,6 +15,15 @@ package org.drools.compiler.integrationtests; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + import java.io.ObjectInput; import java.io.ObjectOutput; import java.io.Serializable; @@ -29,7 +38,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.assertj.core.api.Assertions; import org.drools.compiler.integrationtests.incrementalcompilation.TestUtil; import org.drools.core.SessionConfiguration; import org.drools.core.command.runtime.rule.InsertElementsCommand; @@ -68,16 +76,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import static java.util.Arrays.asList; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - @RunWith(Parameterized.class) public class AccumulateTest { @@ -1032,12 +1030,9 @@ public void testAccumulateMultipleFunctionsConstraint() { Mockito.verify(ael).afterMatchFired(cap.capture()); Match activation = cap.getValue().getMatch(); - assertThat(((Number) activation.getDeclarationValue("$sum")).intValue(), - is(18)); - assertThat(((Number) activation.getDeclarationValue("$min")).intValue(), - is(3)); - assertThat(((Number) activation.getDeclarationValue("$avg")).intValue(), - is(6)); + assertThat(((Number) activation.getDeclarationValue("$sum")).intValue()).isEqualTo(18); + assertThat(((Number) activation.getDeclarationValue("$min")).intValue()).isEqualTo(3); + assertThat(((Number) activation.getDeclarationValue("$avg")).intValue()).isEqualTo(6); Mockito.reset(ael); // ---------------- 2nd scenario @@ -1059,12 +1054,9 @@ public void testAccumulateMultipleFunctionsConstraint() { Mockito.verify(ael).afterMatchFired(cap.capture()); activation = cap.getValue().getMatch(); - assertThat(((Number) activation.getDeclarationValue("$sum")).intValue(), - is(20)); - assertThat(((Number) activation.getDeclarationValue("$min")).intValue(), - is(3)); - assertThat(((Number) activation.getDeclarationValue("$avg")).intValue(), - is(10)); + assertThat(((Number) activation.getDeclarationValue("$sum")).intValue()).isEqualTo(20); + assertThat(((Number) activation.getDeclarationValue("$min")).intValue()).isEqualTo(3); + assertThat(((Number) activation.getDeclarationValue("$avg")).intValue()).isEqualTo(10); } finally { ksession.dispose(); } @@ -1855,11 +1847,11 @@ public void testAccumulateNonExistingFunction() { final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); - Assertions.assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText) - .anySatisfy(text -> Assertions.assertThat(text).contains("Unknown accumulate function: 'nonExistingFunction' on rule 'Accumulate non existing function - Java'.")); - Assertions.assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText) - .anySatisfy(text -> Assertions.assertThat(text).contains("Unknown accumulate function: 'nonExistingFunction' on rule 'Accumulate non existing function - MVEL'.")); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText) + .anySatisfy(text -> assertThat(text).contains("Unknown accumulate function: 'nonExistingFunction' on rule 'Accumulate non existing function - Java'.")); + assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText) + .anySatisfy(text -> assertThat(text).contains("Unknown accumulate function: 'nonExistingFunction' on rule 'Accumulate non existing function - MVEL'.")); } @Test(timeout = 10000) @@ -1924,12 +1916,9 @@ private void execTestAccumulateMultipleFunctions(final String fileName) { Mockito.verify(ael).afterMatchFired(cap.capture()); Match activation = cap.getValue().getMatch(); - assertThat(((Number) activation.getDeclarationValue("$sum")).intValue(), - is(18)); - assertThat(((Number) activation.getDeclarationValue("$min")).intValue(), - is(3)); - assertThat(((Number) activation.getDeclarationValue("$avg")).intValue(), - is(6)); + assertThat(((Number) activation.getDeclarationValue("$sum")).intValue()).isEqualTo(18); + assertThat(((Number) activation.getDeclarationValue("$min")).intValue()).isEqualTo(3); + assertThat(((Number) activation.getDeclarationValue("$avg")).intValue()).isEqualTo(6); Mockito.reset(ael); // ---------------- 2nd scenario @@ -1942,12 +1931,9 @@ private void execTestAccumulateMultipleFunctions(final String fileName) { Mockito.verify(ael).afterMatchFired(cap.capture()); activation = cap.getValue().getMatch(); - assertThat(((Number) activation.getDeclarationValue("$sum")).intValue(), - is(24)); - assertThat(((Number) activation.getDeclarationValue("$min")).intValue(), - is(5)); - assertThat(((Number) activation.getDeclarationValue("$avg")).intValue(), - is(8)); + assertThat(((Number) activation.getDeclarationValue("$sum")).intValue()).isEqualTo(24); + assertThat(((Number) activation.getDeclarationValue("$min")).intValue()).isEqualTo(5); + assertThat(((Number) activation.getDeclarationValue("$avg")).intValue()).isEqualTo(8); Mockito.reset(ael); // ---------------- 3rd scenario @@ -1959,12 +1945,9 @@ private void execTestAccumulateMultipleFunctions(final String fileName) { Mockito.verify(ael).afterMatchFired(cap.capture()); activation = cap.getValue().getMatch(); - assertThat(((Number) activation.getDeclarationValue("$sum")).intValue(), - is(32)); - assertThat(((Number) activation.getDeclarationValue("$min")).intValue(), - is(15)); - assertThat(((Number) activation.getDeclarationValue("$avg")).intValue(), - is(16)); + assertThat(((Number) activation.getDeclarationValue("$sum")).intValue()).isEqualTo(32); + assertThat(((Number) activation.getDeclarationValue("$min")).intValue()).isEqualTo(15); + assertThat(((Number) activation.getDeclarationValue("$avg")).intValue()).isEqualTo(16); Mockito.reset(ael); // ---------------- 4th scenario @@ -1974,12 +1957,9 @@ private void execTestAccumulateMultipleFunctions(final String fileName) { Mockito.verify(ael).afterMatchFired(cap.capture()); activation = cap.getValue().getMatch(); - assertThat(((Number) activation.getDeclarationValue("$sum")).intValue(), - is(17)); - assertThat(((Number) activation.getDeclarationValue("$min")).intValue(), - is(17)); - assertThat(((Number) activation.getDeclarationValue("$avg")).intValue(), - is(17)); + assertThat(((Number) activation.getDeclarationValue("$sum")).intValue()).isEqualTo(17); + assertThat(((Number) activation.getDeclarationValue("$min")).intValue()).isEqualTo(17); + assertThat(((Number) activation.getDeclarationValue("$avg")).intValue()).isEqualTo(17); } finally { ksession.dispose(); } @@ -2679,7 +2659,7 @@ private void testImportAccumulateFunction(final String drl) { final ArgumentCaptor ac = ArgumentCaptor.forClass(AfterMatchFiredEvent.class); verify(ael).afterMatchFired(ac.capture()); - assertThat(ac.getValue().getMatch().getDeclarationValue("$v"), is(1)); + assertThat(ac.getValue().getMatch().getDeclarationValue("$v")).isEqualTo(1); } finally { ksession.dispose(); } @@ -2852,7 +2832,7 @@ public void testAccumulateWithoutSeparator() { "end "; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } @Test @@ -2868,7 +2848,7 @@ public void testFromAccumulateWithoutSeparator() { "end"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } public static class ExpectedMessage { @@ -3100,7 +3080,7 @@ public void testIncompatibleTypeOnAccumulateFunction() { "end\n"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } @Test @@ -3118,7 +3098,7 @@ public void testIncompatibleListOnAccumulateFunction() { "end\n"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } @Test @@ -3638,7 +3618,7 @@ public void testCompileFailureOnMissingImport() { "end"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } @Test @@ -3760,9 +3740,9 @@ public void testAccumlateResultCannotBeUsedInFunctions() { "end"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); - Assertions.assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText) - .anySatisfy(text -> Assertions.assertThat(text).contains("openAlarms")); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText) + .anySatisfy(text -> assertThat(text).contains("openAlarms")); } @Test diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AlphaNodeRangeIndexingTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AlphaNodeRangeIndexingTest.java index 6bbb0b5eaa9..328dc7ffd18 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AlphaNodeRangeIndexingTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AlphaNodeRangeIndexingTest.java @@ -16,12 +16,16 @@ package org.drools.compiler.integrationtests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.ancompiler.CompiledNetwork; import org.drools.core.reteoo.CompositeObjectSinkAdapter; import org.drools.core.reteoo.ObjectSink; @@ -51,10 +55,6 @@ import org.kie.api.runtime.KieSession; import org.kie.internal.conf.AlphaRangeIndexThresholdOption; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - @RunWith(Parameterized.class) public class AlphaNodeRangeIndexingTest { @@ -434,7 +434,7 @@ public void testDate() { ksession.insert(o1); int fired = ksession.fireAllRules(); assertEquals(4, fired); - Assertions.assertThat(results).containsOnly("test1", "test2", "test3", "test4"); + assertThat(results).containsOnly("test1", "test2", "test3", "test4"); results.clear(); Order o2 = new Order(); @@ -442,7 +442,7 @@ public void testDate() { ksession.insert(o2); fired = ksession.fireAllRules(); assertEquals(4, fired); - Assertions.assertThat(results).containsOnly("test2", "test3", "test4", "test6"); + assertThat(results).containsOnly("test2", "test3", "test4", "test6"); } @Test @@ -981,12 +981,12 @@ public void testMixedRangeHashAndOther() { ksession.insert(new Person("John", 18)); ksession.fireAllRules(); - Assertions.assertThat(results).containsOnly("test1", "test2", "test3"); + assertThat(results).containsOnly("test1", "test2", "test3"); results.clear(); ksession.insert(new Person("Paul", 60)); ksession.fireAllRules(); - Assertions.assertThat(results).containsOnly("test1", "test3", "test4", "test7"); + assertThat(results).containsOnly("test1", "test3", "test4", "test7"); } @Ignore("No need to test. Fails with standard-drl") diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsOnPatternTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsOnPatternTest.java index b9a40a444b0..2555ab16a2e 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsOnPatternTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsOnPatternTest.java @@ -16,12 +16,16 @@ package org.drools.compiler.integrationtests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Map; -import org.assertj.core.api.Assertions; import org.drools.core.definitions.rule.impl.RuleImpl; import org.drools.core.factmodel.AnnotationDefinition; import org.drools.core.rule.Pattern; @@ -37,10 +41,6 @@ import org.kie.api.builder.KieBuilder; import org.kie.api.definition.rule.Rule; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - @RunWith(Parameterized.class) public class AnnotationsOnPatternTest { @@ -68,7 +68,7 @@ public void testAnnotationWithUnknownProperty() { "end "; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).hasSize(1); + assertThat(kieBuilder.getResults().getMessages()).hasSize(1); } @Test @@ -83,7 +83,7 @@ public void testAnnotationWithUnknownClass() { "end "; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).hasSize(1); + assertThat(kieBuilder.getResults().getMessages()).hasSize(1); } @Test diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsTest.java index b3107d87bda..9e464ee3fc8 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsTest.java @@ -16,6 +16,12 @@ package org.drools.compiler.integrationtests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -24,7 +30,6 @@ import java.lang.reflect.Field; import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; import org.drools.testcoverage.common.util.KieUtil; @@ -39,11 +44,6 @@ import org.kie.api.definition.type.Position; import org.kie.api.definition.type.Role; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - @RunWith(Parameterized.class) public class AnnotationsTest { @@ -225,7 +225,7 @@ public void annotationErrorTest() { " end \n "; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isEmpty(); final String drl2 = "package org.drools.compiler.test;\n " + "" + @@ -239,7 +239,7 @@ public void annotationErrorTest() { " end \n "; final KieBuilder kieBuilder2 = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl2); - Assertions.assertThat(kieBuilder2.getResults().getMessages()).hasSize(3); + assertThat(kieBuilder2.getResults().getMessages()).hasSize(3); } @Test diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepEspTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepEspTest.java index 4b872e4cd3c..6b4f2a5cac4 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepEspTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepEspTest.java @@ -15,6 +15,17 @@ package org.drools.compiler.integrationtests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -41,10 +52,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.assertj.core.api.Assertions; import org.drools.core.WorkingMemory; import org.drools.core.base.ClassObjectType; -import org.drools.core.util.TimeIntervalParser; import org.drools.core.common.DefaultFactHandle; import org.drools.core.common.EventFactHandle; import org.drools.core.common.InternalFactHandle; @@ -60,6 +69,7 @@ import org.drools.core.time.impl.DurationTimer; import org.drools.core.time.impl.PseudoClockScheduler; import org.drools.core.util.DateUtils; +import org.drools.core.util.TimeIntervalParser; import org.drools.kiesession.audit.WorkingMemoryFileLogger; import org.drools.kiesession.session.StatefulKnowledgeSessionImpl; import org.drools.testcoverage.common.model.OrderEvent; @@ -98,18 +108,6 @@ import org.kie.api.time.SessionPseudoClock; import org.mockito.ArgumentCaptor; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - @RunWith(Parameterized.class) public class CepEspTest extends AbstractCepEspTest { @@ -1653,19 +1651,19 @@ public void testMultipleSlidingWindows() { final List values = captor.getAllValues(); // first rule Match act = values.get(0).getMatch(); - assertThat(act.getRule().getName(), is("launch")); + assertThat(act.getRule().getName()).isEqualTo("launch"); // second rule act = values.get(1).getMatch(); - assertThat(act.getRule().getName(), is("ba")); - assertThat(((Number) act.getDeclarationValue("$a")).intValue(), is(3)); - assertThat(((Number) act.getDeclarationValue("$b")).intValue(), is(2)); + assertThat(act.getRule().getName()).isEqualTo("ba"); + assertThat(((Number) act.getDeclarationValue("$a")).intValue()).isEqualTo(3); + assertThat(((Number) act.getDeclarationValue("$b")).intValue()).isEqualTo(2); // third rule act = values.get(2).getMatch(); - assertThat(act.getRule().getName(), is("ab")); - assertThat(((Number) act.getDeclarationValue("$a")).intValue(), is(3)); - assertThat(((Number) act.getDeclarationValue("$b")).intValue(), is(2)); + assertThat(act.getRule().getName()).isEqualTo("ab"); + assertThat(((Number) act.getDeclarationValue("$a")).intValue()).isEqualTo(3); + assertThat(((Number) act.getDeclarationValue("$b")).intValue()).isEqualTo(2); } finally { ksession.dispose(); } @@ -1720,10 +1718,10 @@ public void testSalienceWithEventsPseudoClock() { verify(ael, times(4)).afterMatchFired(captor.capture()); final List aafe = captor.getAllValues(); - assertThat(aafe.get(0).getMatch().getRule().getName(), is("R1")); - assertThat(aafe.get(1).getMatch().getRule().getName(), is("R1")); - assertThat(aafe.get(2).getMatch().getRule().getName(), is("R1")); - assertThat(aafe.get(3).getMatch().getRule().getName(), is("R3")); + assertThat(aafe.get(0).getMatch().getRule().getName()).isEqualTo("R1"); + assertThat(aafe.get(1).getMatch().getRule().getName()).isEqualTo("R1"); + assertThat(aafe.get(2).getMatch().getRule().getName()).isEqualTo("R1"); + assertThat(aafe.get(3).getMatch().getRule().getName()).isEqualTo("R3"); } finally { ksession.dispose(); } @@ -1774,11 +1772,12 @@ public void testSalienceWithEventsRealtimeClock() throws InterruptedException { final ArgumentCaptor captor = ArgumentCaptor.forClass(AfterMatchFiredEvent.class); verify(ael, times(4)).afterMatchFired(captor.capture()); final List aafe = captor.getAllValues(); + - assertThat(aafe.get(0).getMatch().getRule().getName(), is("R1")); - assertThat(aafe.get(1).getMatch().getRule().getName(), is("R1")); - assertThat(aafe.get(2).getMatch().getRule().getName(), is("R1")); - assertThat(aafe.get(3).getMatch().getRule().getName(), is("R3")); + assertThat(aafe.get(0).getMatch().getRule().getName()).isEqualTo("R1"); + assertThat(aafe.get(1).getMatch().getRule().getName()).isEqualTo("R1"); + assertThat(aafe.get(2).getMatch().getRule().getName()).isEqualTo("R1"); + assertThat(aafe.get(3).getMatch().getRule().getName()).isEqualTo("R3"); } finally { ksession.dispose(); } @@ -2118,7 +2117,7 @@ public void testTimeStampOnNonExistingField() { "end\n"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } @Test (timeout=10000) @@ -5611,7 +5610,7 @@ public void testInvalidWindowPredicate() { "end"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } @Role(Role.Type.EVENT) diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepJavaTypeTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepJavaTypeTest.java index 2add2c538b7..c6eeb2f37cc 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepJavaTypeTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepJavaTypeTest.java @@ -15,9 +15,11 @@ package org.drools.compiler.integrationtests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; import org.drools.testcoverage.common.util.KieUtil; @@ -33,8 +35,6 @@ import org.kie.api.definition.type.Timestamp; import org.kie.api.runtime.KieSession; -import static org.junit.Assert.assertEquals; - @RunWith(Parameterized.class) public class CepJavaTypeTest { @@ -65,7 +65,7 @@ public void testJavaTypeAnnotatedWithRole_WindowTime() { + "end\n"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isEmpty(); } @Test @@ -81,7 +81,7 @@ public void testJavaTypeAnnotatedWithRole_WindowLength() { + "end\n"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isEmpty(); } @Role(value = Role.Type.EVENT) diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/ConstraintsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/ConstraintsTest.java index 11d37acd48b..15c79788236 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/ConstraintsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/ConstraintsTest.java @@ -15,6 +15,10 @@ package org.drools.compiler.integrationtests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -22,7 +26,6 @@ import java.util.List; import java.util.Map; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.model.Cheese; import org.drools.testcoverage.common.model.Message; import org.drools.testcoverage.common.model.Person; @@ -38,9 +41,6 @@ import org.kie.api.builder.KieBuilder; import org.kie.api.runtime.KieSession; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - @RunWith(Parameterized.class) public class ConstraintsTest { @@ -208,7 +208,7 @@ public void testDeeplyNestedCompactExpressions() { "end\n"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } @Test @@ -450,8 +450,8 @@ public void testNonBooleanConstraint() { final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); List messages = kieBuilder.getResults().getMessages(); - Assertions.assertThat(messages).hasSize(1); - Assertions.assertThat(messages.iterator().next().getText()) + assertThat(messages).hasSize(1); + assertThat(messages.iterator().next().getText()) .contains("Predicate 'name + name' must be a Boolean expression") .isNotEmpty(); } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/JoinNodeRangeIndexingTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/JoinNodeRangeIndexingTest.java index d19fead48c4..59d4b79cdaf 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/JoinNodeRangeIndexingTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/JoinNodeRangeIndexingTest.java @@ -16,6 +16,11 @@ package org.drools.compiler.integrationtests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; @@ -25,7 +30,6 @@ import java.util.Map; import java.util.Set; -import org.assertj.core.api.Assertions; import org.drools.ancompiler.CompiledNetwork; import org.drools.core.common.BetaConstraints; import org.drools.core.reteoo.JoinNode; @@ -49,10 +53,6 @@ import org.kie.api.conf.BetaRangeIndexOption; import org.kie.api.runtime.KieSession; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - @RunWith(Parameterized.class) public class JoinNodeRangeIndexingTest { @@ -165,7 +165,7 @@ public void testCoercionBigDecimalVsInt() { ksession.insert(new Cheese("gorgonzola", 43)); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactly(bd42); + assertThat(list).containsExactly(bd42); } finally { ksession.dispose(); } @@ -210,7 +210,7 @@ public void testCoercionIntVsBigDecimal() { ksession.insert(john); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactly(i42); + assertThat(list).containsExactly(i42); } finally { ksession.dispose(); } @@ -258,7 +258,7 @@ public void testCoercionStringVsIntWithMap() { ksession.fireAllRules(); - Assertions.assertThat(list).containsExactly(cheese1); // If we do String comparison, cheese10 is also contained + assertThat(list).containsExactly(cheese1); // If we do String comparison, cheese10 is also contained } finally { ksession.dispose(); } @@ -308,7 +308,7 @@ public void testCoercionIntVsStringWithMap() { ksession.fireAllRules(); - Assertions.assertThat(list).containsExactly(holder1); + assertThat(list).containsExactly(holder1); } finally { ksession.dispose(); } @@ -406,20 +406,20 @@ public void testInsertUpdateDelete() { ksession.insert(new Person("Paul", 10)); assertEquals(2, ksession.fireAllRules()); - Assertions.assertThat(result).containsExactlyInAnyOrder("John > Oliver", "Paul > Oliver"); + assertThat(result).containsExactlyInAnyOrder("John > Oliver", "Paul > Oliver"); ksession.insert("trigger R2"); // set Paul's age = 20 assertEquals(3, ksession.fireAllRules()); - Assertions.assertThat(result).containsExactlyInAnyOrder("John > Oliver", "Paul > Oliver", "Paul > Leo"); + assertThat(result).containsExactlyInAnyOrder("John > Oliver", "Paul > Oliver", "Paul > Leo"); ksession.insert("trigger R3"); // set all Pets' age minus 5 assertEquals(8, ksession.fireAllRules()); - Assertions.assertThat(result).containsExactlyInAnyOrder("John > Oliver", "John > Leo", "Paul > Oliver", "Paul > Leo", "Paul > Milo"); + assertThat(result).containsExactlyInAnyOrder("John > Oliver", "John > Leo", "Paul > Oliver", "Paul > Leo", "Paul > Milo"); ksession.insert("trigger R4"); // delete Oliver ksession.insert(new Person("George", 15)); assertEquals(2, ksession.fireAllRules()); - Assertions.assertThat(result).containsExactlyInAnyOrder("John > Oliver", "John > Leo", "Paul > Oliver", "Paul > Leo", "Paul > Milo", "George > Leo"); + assertThat(result).containsExactlyInAnyOrder("John > Oliver", "John > Leo", "Paul > Oliver", "Paul > Leo", "Paul > Milo", "George > Leo"); } finally { ksession.dispose(); @@ -525,7 +525,7 @@ public void testMultipleFacts() { assertEquals(8, ksession.fireAllRules()); - Assertions.assertThat(result).containsExactlyInAnyOrder("Paul > Charlie", "George > Charlie", "George > Max", "George > Buddy", "Ringo > Charlie", "Ringo > Max", "Ringo > Buddy", "Ringo > Oscar"); + assertThat(result).containsExactlyInAnyOrder("Paul > Charlie", "George > Charlie", "George > Max", "George > Buddy", "Ringo > Charlie", "Ringo > Max", "Ringo > Buddy", "Ringo > Oscar"); } finally { ksession.dispose(); diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/StreamsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/StreamsTest.java index fd249596815..0aa3e0ecb62 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/StreamsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/StreamsTest.java @@ -15,19 +15,29 @@ */ package org.drools.compiler.integrationtests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.core.rule.TypeDeclaration.NEVER_EXPIRES; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.concurrent.TimeUnit; -import org.assertj.core.api.Assertions; import org.drools.core.base.ClassObjectType; import org.drools.core.common.InternalFactHandle; -import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.core.reteoo.ObjectTypeNode; import org.drools.core.rule.EntryPointId; import org.drools.core.spi.ObjectType; import org.drools.core.time.impl.PseudoClockScheduler; +import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.testcoverage.common.model.Cheese; import org.drools.testcoverage.common.model.StockTick; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; @@ -50,19 +60,6 @@ import org.kie.api.runtime.rule.EntryPoint; import org.mockito.ArgumentCaptor; -import static org.drools.core.rule.TypeDeclaration.NEVER_EXPIRES; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - /** * Tests related to the stream support features */ @@ -319,9 +316,9 @@ public void testModifyOnEntryPointFacts() { verify(ael, times(3)).afterMatchFired(captor.capture()); final List aafe = captor.getAllValues(); - assertThat(aafe.get(0).getMatch().getRule().getName(), is("R1")); - assertThat(aafe.get(1).getMatch().getRule().getName(), is("R2")); - assertThat(aafe.get(2).getMatch().getRule().getName(), is("R3")); + assertThat(aafe.get(0).getMatch().getRule().getName()).isEqualTo("R1"); + assertThat(aafe.get(1).getMatch().getRule().getName()).isEqualTo("R2"); + assertThat(aafe.get(2).getMatch().getRule().getName()).isEqualTo("R3"); } finally { ksession.dispose(); } @@ -355,7 +352,7 @@ public void testEntryPointWithAccumulateAndMVEL() { verify(ael, times(1)).afterMatchFired(captor.capture()); final List aafe = captor.getAllValues(); - assertThat(aafe.get(0).getMatch().getRule().getName(), is("R1")); + assertThat(aafe.get(0).getMatch().getRule().getName()).isEqualTo("R1"); } finally { ksession.dispose(); } @@ -414,15 +411,15 @@ public void testEventDoesNotExpireIfNotInPattern() { ksession.insert(st2); verify(wml, times(2)).objectInserted(any(org.kie.api.event.rule.ObjectInsertedEvent.class)); - assertThat(ksession.getObjects().size(), equalTo(2)); - assertThat((Collection) ksession.getObjects(), CoreMatchers.hasItems(st1, st2)); + assertThat(ksession.getObjects()).hasSize(2); + assertThat((Collection) ksession.getObjects()).contains(st1, st2); ksession.fireAllRules(); clock.advanceTime(3, TimeUnit.SECONDS); ksession.fireAllRules(); - assertThat(ksession.getObjects().size(), equalTo(0)); + assertThat(ksession.getObjects()).hasSize(0); } finally { ksession.dispose(); } @@ -460,17 +457,17 @@ public void testEventExpirationSetToZero() { ksession.insert(st1); ksession.insert(st2); - assertThat(ksession.fireAllRules(), equalTo(2)); + assertThat(ksession.fireAllRules()).isEqualTo(2); verify(wml, times(2)).objectInserted(any(org.kie.api.event.rule.ObjectInsertedEvent.class)); verify(ael, times(2)).matchCreated(any(MatchCreatedEvent.class)); - assertThat(ksession.getObjects().size(), equalTo(2)); - assertThat((Collection) ksession.getObjects(), CoreMatchers.hasItems(st1, st2)); + assertThat(ksession.getObjects()).hasSize(2); + assertThat((Collection) ksession.getObjects()).contains(st1, st2); clock.advanceTime(3, TimeUnit.SECONDS); ksession.fireAllRules(); - assertThat(ksession.getObjects().size(), equalTo(0)); + assertThat(ksession.getObjects()).hasSize(0); } finally { ksession.dispose(); } @@ -574,8 +571,8 @@ public void testWindowDeclaration() { verify(ael, times(1)).afterMatchFired(captor.capture()); final AfterMatchFiredEvent aafe = captor.getValue(); - assertThat(((Number) aafe.getMatch().getDeclarationValue("$sum")).intValue(), is(95)); - assertThat(((Number) aafe.getMatch().getDeclarationValue("$cnt")).intValue(), is(3)); + assertThat(((Number) aafe.getMatch().getDeclarationValue("$sum")).intValue()).isEqualTo(95); + assertThat(((Number) aafe.getMatch().getDeclarationValue("$cnt")).intValue()).isEqualTo(3); } finally { ksession.dispose(); } @@ -617,7 +614,7 @@ public void testWindowDeclaration2() { verify(ael, times(1)).afterMatchFired(captor.capture()); final AfterMatchFiredEvent aafe = captor.getValue(); - assertThat(((Number) aafe.getMatch().getDeclarationValue("$sum")).intValue(), is(33)); + assertThat(((Number) aafe.getMatch().getDeclarationValue("$sum")).intValue()).isEqualTo(33); } finally { ksession.dispose(); } @@ -654,8 +651,8 @@ public void testMultipleWindows() { verify(ael, times(1)).afterMatchFired(captor.capture()); final AfterMatchFiredEvent aafe = captor.getValue(); - assertThat(aafe.getMatch().getDeclarationValue("f1"), CoreMatchers.is(st1)); - assertThat(aafe.getMatch().getDeclarationValue("f2"), CoreMatchers.is(st2)); + assertThat(aafe.getMatch().getDeclarationValue("f1")).isEqualTo(st1); + assertThat(aafe.getMatch().getDeclarationValue("f2")).isEqualTo(st2); } finally { ksession.dispose(); } @@ -674,7 +671,7 @@ public void testWindowWithEntryPointCompilationError() { "end\n"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()) + assertThat(kieBuilder.getResults().getMessages()) .withFailMessage("Should have raised a compilation error as Cheese is not declared as an event.") .isNotEmpty(); } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarExceptionTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarExceptionTest.java index 05fca5ef8dc..054858b434a 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarExceptionTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarExceptionTest.java @@ -16,9 +16,11 @@ package org.drools.compiler.integrationtests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.fail; + import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.core.base.UndefinedCalendarExcption; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; @@ -31,8 +33,6 @@ import org.kie.api.builder.KieBuilder; import org.kie.api.runtime.KieSession; -import static org.junit.Assert.fail; - @RunWith(Parameterized.class) public class TimerAndCalendarExceptionTest { @@ -86,7 +86,7 @@ private void wrongTimerExpression(final String timer) { kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } @Test diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarWithPseudoTimeTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarWithPseudoTimeTest.java index 015699dcca5..69d2fcd4f3b 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarWithPseudoTimeTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarWithPseudoTimeTest.java @@ -16,6 +16,11 @@ package org.drools.compiler.integrationtests; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -27,7 +32,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.assertj.core.api.Assertions; import org.drools.core.base.UndefinedCalendarExcption; import org.drools.core.time.impl.PseudoClockScheduler; import org.drools.core.util.DateUtils; @@ -59,10 +63,6 @@ import org.kie.api.time.SessionClock; import org.kie.api.time.SessionPseudoClock; -import static java.util.Arrays.asList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - @RunWith(Parameterized.class) public class TimerAndCalendarWithPseudoTimeTest { @@ -300,7 +300,7 @@ private void wrongTimerExpression(final String timer) { kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } @Test(timeout = 10000) diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/BindTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/BindTest.java index 0784f2d1268..e8cb6bd21d7 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/BindTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/BindTest.java @@ -16,11 +16,18 @@ package org.drools.compiler.integrationtests.drl; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.model.Cheese; import org.drools.testcoverage.common.model.Person; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; @@ -38,13 +45,6 @@ import org.kie.api.runtime.rule.FactHandle; import org.mockito.ArgumentCaptor; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - @RunWith(Parameterized.class) public class BindTest { @@ -119,7 +119,7 @@ public void testBindingToMissingField() { final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } @Test @@ -156,7 +156,7 @@ private void testBingWrongFieldName(final String drl) { final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } catch (final Exception e) { e.printStackTrace(); fail("Exception should not be thrown "); diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ConsequenceTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ConsequenceTest.java index 8d29744d47f..dcb6c90c38b 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ConsequenceTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ConsequenceTest.java @@ -16,11 +16,18 @@ package org.drools.compiler.integrationtests.drl; +import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.model.Cheese; import org.drools.testcoverage.common.model.Person; import org.drools.testcoverage.common.model.Pet; @@ -40,13 +47,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - @RunWith(Parameterized.class) public class ConsequenceTest { @@ -115,7 +115,7 @@ public void testConsequenceBuilderException() { final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } @Test diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLCepTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLCepTest.java index fcc6d784bcc..bcb2ccb1cc1 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLCepTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLCepTest.java @@ -16,9 +16,10 @@ package org.drools.compiler.integrationtests.drl; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.model.StockTick; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; @@ -60,7 +61,7 @@ public void testEventsInDifferentPackages() { final KieBase kbase = KieBaseUtil.getKieBaseFromKieModuleFromDrl("drl-cep-test", kieBaseTestConfiguration, drl); final KieSession ksession = kbase.newKieSession(); try { - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(ksession.fireAllRules()).isEqualTo(1); } finally { ksession.dispose(); } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLTest.java index 55c7c3c44bd..b37886c2cdd 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLTest.java @@ -16,13 +16,19 @@ package org.drools.compiler.integrationtests.drl; +import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.model.A; import org.drools.testcoverage.common.model.B; import org.drools.testcoverage.common.model.C; @@ -44,12 +50,6 @@ import org.kie.api.definition.type.FactType; import org.kie.api.runtime.KieSession; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; - @RunWith(Parameterized.class) public class DRLTest { @@ -75,7 +75,7 @@ public void testDuplicateRuleName() { "end\n"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } @Test @@ -154,8 +154,8 @@ public void testWithInvalidRule() { "end"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); - Assertions.assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText).doesNotContain(""); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText).doesNotContain(""); } @Test @@ -173,8 +173,8 @@ public void testWithInvalidRule2() { "end"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); - Assertions.assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText).doesNotContain(""); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText).doesNotContain(""); } @Test @@ -263,8 +263,8 @@ public void testDeclarationUsage() { "end"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); - Assertions.assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText).doesNotContain(""); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText).doesNotContain(""); } @Test @@ -281,8 +281,8 @@ public void testDeclarationNonExistingField() { "end"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); - Assertions.assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText).doesNotContain(""); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText).doesNotContain(""); } @Test @@ -375,7 +375,7 @@ public void testLargeDRL() { kieSession.insert(new D(100003)); kieSession.insert(new E(100004)); - Assertions.assertThat(kieSession.fireAllRules()).isEqualTo(50); + assertThat(kieSession.fireAllRules()).isEqualTo(50); } finally { kieSession.dispose(); } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DrlSpecificFeaturesTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DrlSpecificFeaturesTest.java index 090ba11801f..138a7be0ea3 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DrlSpecificFeaturesTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DrlSpecificFeaturesTest.java @@ -16,11 +16,14 @@ package org.drools.compiler.integrationtests.drl; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.model.Address; import org.drools.testcoverage.common.model.Person; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; @@ -35,9 +38,6 @@ import org.kie.api.builder.Message; import org.kie.api.runtime.KieSession; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - @RunWith(Parameterized.class) public class DrlSpecificFeaturesTest { @@ -72,7 +72,7 @@ public void testMVELConsequenceUsingFactConstructors() { final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } @Test @@ -241,7 +241,7 @@ public void testRHSClone() { "end\n"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); - Assertions.assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText).doesNotContain(""); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText).doesNotContain(""); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ExceptionTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ExceptionTest.java index be2597031c7..e0a7b3fc505 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ExceptionTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ExceptionTest.java @@ -16,9 +16,10 @@ package org.drools.compiler.integrationtests.drl; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.model.Cheese; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; @@ -71,7 +72,7 @@ public void testReturnValueException() { try { final Cheese brie = new Cheese("brie", 12); - Assertions.assertThatThrownBy(() -> { + assertThatThrownBy(() -> { ksession.insert(brie); ksession.fireAllRules(); }).hasRootCauseInstanceOf(TestException.class); diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ImportsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ImportsTest.java index 8380b5690fd..46fc70525fd 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ImportsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ImportsTest.java @@ -16,11 +16,14 @@ package org.drools.compiler.integrationtests.drl; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.testcoverage.common.model.Cheese; import org.drools.testcoverage.common.model.Cheesery; @@ -42,9 +45,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; - @RunWith(Parameterized.class) public class ImportsTest { @@ -176,8 +176,8 @@ public void testMissingImport() { "end \n"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); - Assertions.assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText).doesNotContain(""); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText).doesNotContain(""); } @Test @@ -193,8 +193,8 @@ public void testMissingImports() { "end"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); - Assertions.assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText).doesNotContain(""); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).extracting(Message::getText).doesNotContain(""); } @Test diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/PatternTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/PatternTest.java index 7c9e46662e9..e07c685f9aa 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/PatternTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/PatternTest.java @@ -16,12 +16,16 @@ package org.drools.compiler.integrationtests.drl; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.core.RuleBaseConfiguration; import org.drools.core.common.InternalFactHandle; import org.drools.core.impl.RuleBase; @@ -56,10 +60,6 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - @RunWith(Parameterized.class) public class PatternTest { @@ -865,8 +865,8 @@ public void testCheckDuplicateVariables() { "end"; KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); - Assertions.assertThat(kieBuilder.getResults().getMessages()).extracting(org.kie.api.builder.Message::getText).doesNotContain(""); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).extracting(org.kie.api.builder.Message::getText).doesNotContain(""); drl = "package org.drools.compiler.integrationtests.drl;\n" + "rule R1 when\n" + @@ -875,8 +875,8 @@ public void testCheckDuplicateVariables() { "end"; kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); - Assertions.assertThat(kieBuilder.getResults().getMessages()).extracting(org.kie.api.builder.Message::getText).doesNotContain(""); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).extracting(org.kie.api.builder.Message::getText).doesNotContain(""); drl = "package org.drools.compiler.integrationtests.drl;\n" + "rule R1 when\n" + @@ -885,8 +885,8 @@ public void testCheckDuplicateVariables() { "end"; kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); - Assertions.assertThat(kieBuilder.getResults().getMessages()).extracting(org.kie.api.builder.Message::getText).doesNotContain(""); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).extracting(org.kie.api.builder.Message::getText).doesNotContain(""); } @Test @@ -909,7 +909,7 @@ public void testCompilationFailureOnTernaryComparison() { "end"; final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); - Assertions.assertThat(kieBuilder.getResults().getMessages()).extracting(org.kie.api.builder.Message::getText).doesNotContain(""); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).extracting(org.kie.api.builder.Message::getText).doesNotContain(""); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/equalitymode/EqualityModeTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/equalitymode/EqualityModeTest.java index b9877eec4c1..11099f9b690 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/equalitymode/EqualityModeTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/equalitymode/EqualityModeTest.java @@ -16,11 +16,12 @@ package org.drools.compiler.integrationtests.equalitymode; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.util.EngineTestConfiguration; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; @@ -65,12 +66,12 @@ public void testBasicFactEquality() { try { ksession.insert(new FactWithEquals(10)); ksession.insert(new FactWithEquals(10)); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(ksession.fireAllRules()).isEqualTo(1); ksession.insert(new FactWithEquals(10)); ksession.insert(new FactWithEquals(11)); ksession.insert(new FactWithEquals(12)); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(2); + assertThat(ksession.fireAllRules()).isEqualTo(2); } finally { ksession.dispose(); } @@ -100,9 +101,9 @@ public void testAccumulate() { ksession.insert(new FactWithEquals(10)); ksession.insert(new FactWithEquals(11)); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); - Assertions.assertThat(resultList).hasSize(1); - Assertions.assertThat(resultList).containsExactly(2L); + assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(resultList).hasSize(1); + assertThat(resultList).containsExactly(2L); } finally { ksession.dispose(); } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAddDeleteFactsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAddDeleteFactsTest.java index fecfdaffc71..a89e9609fa4 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAddDeleteFactsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAddDeleteFactsTest.java @@ -1,5 +1,7 @@ package org.drools.compiler.integrationtests.incrementalcompilation; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -7,7 +9,6 @@ import java.util.List; import java.util.Set; -import org.assertj.core.api.Assertions; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -51,14 +52,14 @@ public void testAddRemoveRulesAddRemoveFacts() { kieSession.setGlobal("list", resultsList); final List insertedFacts = TestUtil.insertFacts(kieSession, getFacts()); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, TestUtil.RULE3_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, TestUtil.RULE3_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rulesPermutation.getPermutation()); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.removeFacts(kieSession, insertedFacts); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAdvOperatorsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAdvOperatorsTest.java index 3079c55aa81..b3639124371 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAdvOperatorsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAdvOperatorsTest.java @@ -15,13 +15,14 @@ package org.drools.compiler.integrationtests.incrementalcompilation; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.assertj.core.api.Assertions; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -634,19 +635,19 @@ public void testAddRemoveRuleContainsExists3Rules() { kieSession.setGlobal("globalInt", new AtomicInteger(0)); TestUtil.insertFacts(kieSession, mapFact, 1, "1"); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); resultsList.clear(); TestUtil.addRules(kieSession, rule2); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); resultsList.clear(); TestUtil.addRules(kieSession, rule3); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE3_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE3_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, TestUtil.RULE3_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -705,19 +706,19 @@ public void testAddRemoveRuleContainsExists3RulesDoubledExists() { kieSession.setGlobal("globalInt", new AtomicInteger(0)); TestUtil.insertFacts(kieSession, mapFact, 1, "1"); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); resultsList.clear(); TestUtil.addRules(kieSession, rule2); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); resultsList.clear(); TestUtil.addRules(kieSession, rule3); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE3_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE3_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, TestUtil.RULE3_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesTest.java index f948f445948..92d3366035c 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesTest.java @@ -15,6 +15,15 @@ package org.drools.compiler.integrationtests.incrementalcompilation; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.core.util.DroolsTestUtil.rulestoMap; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.io.StringReader; import java.util.ArrayList; import java.util.Collection; @@ -24,12 +33,11 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.assertj.core.api.Assertions; import org.drools.core.common.InternalFactHandle; -import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.core.reteoo.LeftTuple; import org.drools.core.reteoo.RightTuple; import org.drools.core.reteoo.SubnetworkTuple; +import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.kiesession.rulebase.KnowledgeBaseFactory; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieUtil; @@ -52,14 +60,6 @@ import org.kie.internal.builder.KnowledgeBuilderFactory; import org.kie.internal.io.ResourceFactory; -import static org.drools.core.util.DroolsTestUtil.rulestoMap; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - @RunWith(Parameterized.class) public class AddRemoveRulesTest { @@ -1092,11 +1092,11 @@ public void testRemoveWithSplitStartAfterSubnetwork3Rules() { kieSession.setGlobal("globalInt", new AtomicInteger(0)); TestUtil.insertFacts(kieSession, 1, 2, "1"); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, TestUtil.RULE3_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, TestUtil.RULE3_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, TestUtil.RULE3_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -1149,22 +1149,22 @@ public void testRemoveWithSplitStartAfterSubnetwork3RulesAddOneAfterAnother() { kieSession.setGlobal("globalInt", new AtomicInteger(0)); TestUtil.insertFacts(kieSession, 1, 1, "1"); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); resultsList.clear(); TestUtil.addRules(kieSession, rule2); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); resultsList.clear(); TestUtil.addRules(kieSession, rule3); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE3_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE3_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, TestUtil.RULE3_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -1214,11 +1214,11 @@ public void testRemoveWithSplitStartAfterSubnetwork3RulesReaddRule() { TestUtil.insertFacts(kieSession, 1, 2, "1"); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE3_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE3_NAME); resultsList.clear(); TestUtil.addRules(kieSession, rule2); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); } finally { kieSession.dispose(); } @@ -1280,7 +1280,7 @@ public void testRemoveRuleChangeFHFirstLeftTuple() { kieSession.setGlobal("list", resultsList); TestUtil.insertFacts(kieSession, 3); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME); kieSession.fireAllRules(); @@ -1302,7 +1302,7 @@ public void testRemoveRuleChangeFHLastLeftTuple() { kieSession.setGlobal("list", resultsList); TestUtil.insertFacts(kieSession, 3); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME); kieSession.fireAllRules(); @@ -1324,7 +1324,7 @@ public void testRemoveRightTupleThatWasFirst() { kieSession.setGlobal("list", resultsList); TestUtil.insertFacts(kieSession, 3); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME); kieSession.fireAllRules(); @@ -1349,7 +1349,7 @@ public void testRemoveRightTupleThatWasLast() { kieSession.setGlobal("list", resultsList); TestUtil.insertFacts(kieSession, 3); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME); kieSession.fireAllRules(); @@ -1412,7 +1412,7 @@ public void testRemoveChildLeftTupleThatWasFirst() { kieSession.setGlobal("list", resultsList); TestUtil.insertFacts(kieSession, 3); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME); kieSession.fireAllRules(); @@ -1439,7 +1439,7 @@ public void testRemoveChildLeftTupleThatWasLast() { kieSession.setGlobal("list", resultsList); TestUtil.insertFacts(kieSession, 3); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME); kieSession.fireAllRules(); @@ -1466,7 +1466,7 @@ public void testRemoveChildLeftTupleThatWasMiddle() { kieSession.setGlobal("list", resultsList); TestUtil.insertFacts(kieSession, 3); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, TestUtil.RULE3_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME, TestUtil.RULE3_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME); kieSession.fireAllRules(); @@ -1496,7 +1496,7 @@ public void testRemoveChildLeftTupleThatWasFirstWithMultipleData() { kieSession.setGlobal("list", resultsList); TestUtil.insertFacts(kieSession, 3, 4, 5); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME); kieSession.fireAllRules(); @@ -1571,7 +1571,7 @@ public void testRemoveChildLeftTupleThatWasLastWithMultipleData() { kieSession.setGlobal("list", resultsList); TestUtil.insertFacts(kieSession, 3, 4, 5); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME); kieSession.fireAllRules(); @@ -1676,11 +1676,11 @@ public void testMergeRTN() { TestUtil.insertFacts(kieSession, 1, 2, 3); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -1717,11 +1717,11 @@ public void testSubSubNetwork() { TestUtil.insertFacts(kieSession, 1); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -1758,7 +1758,7 @@ public void testSubSubNetwork2() { TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); TestUtil.addRules(kieSession, rule1); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); } finally { kieSession.dispose(); } @@ -1794,11 +1794,11 @@ public void testSubSubNetwork3() { kieSession.setGlobal("list", resultsList); TestUtil.insertFacts(kieSession, 1); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -1835,7 +1835,7 @@ public void testSubSubNetwork4() { TestUtil.insertFacts(kieSession, 1); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); } finally { kieSession.dispose(); } @@ -1871,7 +1871,7 @@ public void testSubNetworkWithNot() { TestUtil.insertFacts(kieSession, 1); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); } finally { kieSession.dispose(); } @@ -1908,7 +1908,7 @@ public void testSubNetworkWithNot2() { TestUtil.insertFacts(kieSession, 1); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); } finally { kieSession.dispose(); } @@ -1943,7 +1943,7 @@ public void testSubNetworkWithNot3() { kieSession.setGlobal("list", resultsList); TestUtil.insertFacts(kieSession, 1); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); } finally { kieSession.dispose(); } @@ -1982,7 +1982,7 @@ public void testSubNetworkWithNot4() { TestUtil.insertFacts(kieSession, 1); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); } finally { kieSession.dispose(); } @@ -2019,7 +2019,7 @@ public void testInsertFireRemoveWith2Nots() { TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -2055,7 +2055,7 @@ public void testSubSubNetwork5() { TestUtil.insertFacts(kieSession, 1); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); } finally { kieSession.dispose(); } @@ -2091,7 +2091,7 @@ public void testInsertRemoveFireWith2Nots() { TestUtil.insertFacts(kieSession, 1); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -2127,7 +2127,7 @@ public void testSharedRian() { TestUtil.insertFacts(kieSession, 1); TestUtil.addRules(kieSession, rule2); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); } finally { kieSession.dispose(); } @@ -2164,7 +2164,7 @@ public void testSharedRianWithFire() { kieSession.fireAllRules(); TestUtil.addRules(kieSession, rule2); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); } finally { kieSession.dispose(); } @@ -2200,11 +2200,11 @@ public void testSharedRian2() { kieSession.setGlobal("list", resultsList); TestUtil.insertFacts(kieSession, 1); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); resultsList.clear(); TestUtil.addRules(kieSession, rule2); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); } finally { kieSession.dispose(); } @@ -2275,10 +2275,10 @@ public void testAddRemoveFacts() { final List sessionFacts = TestUtil.insertFacts(kieSession, 1); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME, TestUtil.RULE1_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.removeFacts(kieSession, sessionFacts); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -2311,14 +2311,14 @@ public void testReaddRulesSharedRianDoubleNots() { kieSession.setGlobal("list", resultsList); TestUtil.insertFacts(kieSession, 1); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME, TestUtil.RULE1_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.addRules(kieSession, rule1, rule2); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); } finally { kieSession.dispose(); } @@ -2352,14 +2352,14 @@ public void testOr() { kieSession.setGlobal("list", resultsList); TestUtil.insertFacts(kieSession, 1); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE2_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.addRules(kieSession, rule1, rule2); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); } finally { kieSession.dispose(); } @@ -2393,21 +2393,21 @@ public void testOr2() { kieSession.setGlobal("list", resultsList); TestUtil.insertFacts(kieSession, 1); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME, TestUtil.RULE2_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.addRules(kieSession, rule1); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -2443,11 +2443,11 @@ public void testEvals() { TestUtil.insertFacts(kieSession, 1); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE2_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); + assertThat(resultsList).containsOnly(TestUtil.RULE1_NAME); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, TestUtil.RULE1_NAME); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -2492,13 +2492,13 @@ public void testPathMemoryInitialization() { kieSession.getKieBase().removeRule("com.rules", "R2"); kieSession.fireAllRules(); - Assertions.assertThat(globalList).contains("R1"); + assertThat(globalList).contains("R1"); globalList.clear(); kieSession.getKieBase().removeRule("com.rules", "R1"); kieSession.fireAllRules(); - Assertions.assertThat(globalList).isEmpty(); + assertThat(globalList).isEmpty(); } @Test @@ -2537,7 +2537,7 @@ public void testBuildKieBaseIncrementally() { mapFact.put(new Object(), "1"); kieSession.insert(mapFact); kieSession.fireAllRules(); - Assertions.assertThat(globalList).contains("R1", "R2"); + assertThat(globalList).contains("R1", "R2"); } @Test @@ -2569,7 +2569,7 @@ public void testBuildKieBaseIncrementally2() { kieSession.setGlobal("list", globalList); kieSession.fireAllRules(); - Assertions.assertThat(globalList).isEmpty(); + assertThat(globalList).isEmpty(); kieSession.insert(1); kieSession.insert(2); @@ -2581,7 +2581,7 @@ public void testBuildKieBaseIncrementally2() { kieSession.insert(mapFact); kieSession.fireAllRules(); - Assertions.assertThat(globalList).contains("R1", "R2"); + assertThat(globalList).contains("R1", "R2"); } @Test @@ -2610,7 +2610,7 @@ public void testBuildKieBaseIncrementally3() { final KieSession kieSession = TestUtil.buildSessionInSteps(base, rule2, rule1); kieSession.setGlobal("list", globalList); - Assertions.assertThat(globalList).isEmpty(); + assertThat(globalList).isEmpty(); kieSession.insert(1); kieSession.insert("1"); @@ -2618,12 +2618,12 @@ public void testBuildKieBaseIncrementally3() { kieSession.getKieBase().removeRule("com.rules", "R1"); kieSession.fireAllRules(); - Assertions.assertThat(globalList).contains("R2"); + assertThat(globalList).contains("R2"); globalList.clear(); kieSession.getKieBase().removeRule("com.rules", "R2"); kieSession.fireAllRules(); - Assertions.assertThat(globalList).isEmpty(); + assertThat(globalList).isEmpty(); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveTestCases.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveTestCases.java index a106026873a..8ffc2d9c9c8 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveTestCases.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveTestCases.java @@ -16,11 +16,12 @@ package org.drools.compiler.integrationtests.incrementalcompilation; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.assertj.core.api.Assertions; import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.kie.api.runtime.KieSession; @@ -86,12 +87,12 @@ public static void insertFactsFireRulesRemoveRules1(final InternalKnowledgeBase TestUtil.insertFacts(kieSession, facts); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule1Name, rule2Name); + assertThat(resultsList).containsOnly(rule1Name, rule2Name); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule1Name, rule2Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -123,16 +124,16 @@ public static void insertFactsFireRulesRemoveRules2(final InternalKnowledgeBase TestUtil.insertFacts(kieSession, facts); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule1Name, rule2Name); + assertThat(resultsList).containsOnly(rule1Name, rule2Name); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule1Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule2Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -164,16 +165,16 @@ public static void insertFactsFireRulesRemoveRules3(final InternalKnowledgeBase TestUtil.insertFacts(kieSession, facts); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule1Name, rule2Name); + assertThat(resultsList).containsOnly(rule1Name, rule2Name); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule2Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule1Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -205,7 +206,7 @@ public static void insertFactsRemoveRulesFireRulesRemoveRules1(final InternalKno TestUtil.insertFacts(kieSession, facts); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule1Name, rule2Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -237,11 +238,11 @@ public static void insertFactsRemoveRulesFireRulesRemoveRules2(final InternalKno TestUtil.insertFacts(kieSession, facts); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule2Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule1Name); + assertThat(resultsList).containsOnly(rule1Name); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule1Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -273,11 +274,11 @@ public static void insertFactsRemoveRulesFireRulesRemoveRules3(final InternalKno TestUtil.insertFacts(kieSession, facts); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule1Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule2Name); + assertThat(resultsList).containsOnly(rule2Name); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule2Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -307,14 +308,14 @@ public static void fireRulesInsertFactsFireRulesRemoveRules1(final InternalKnowl additionalGlobals.forEach(kieSession::setGlobal); } kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.insertFacts(kieSession, facts); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule1Name, rule2Name); + assertThat(resultsList).containsOnly(rule1Name, rule2Name); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule1Name, rule2Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -344,17 +345,17 @@ public static void fireRulesInsertFactsFireRulesRemoveRules2(final InternalKnowl additionalGlobals.forEach(kieSession::setGlobal); } kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.insertFacts(kieSession, facts); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule1Name, rule2Name); + assertThat(resultsList).containsOnly(rule1Name, rule2Name); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule1Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule2Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -384,17 +385,17 @@ public static void fireRulesInsertFactsFireRulesRemoveRules3(final InternalKnowl additionalGlobals.forEach(kieSession::setGlobal); } kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.insertFacts(kieSession, facts); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule1Name, rule2Name); + assertThat(resultsList).containsOnly(rule1Name, rule2Name); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule2Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule1Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -425,15 +426,15 @@ public static void insertFactsFireRulesRemoveRulesReinsertRules1(final InternalK } TestUtil.insertFacts(kieSession, facts); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule1Name, rule2Name); + assertThat(resultsList).containsOnly(rule1Name, rule2Name); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule1Name, rule2Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.addRules(kieSession, rule1, rule2); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule1Name, rule2Name); + assertThat(resultsList).containsOnly(rule1Name, rule2Name); } finally { kieSession.dispose(); } @@ -464,30 +465,30 @@ public static void insertFactsFireRulesRemoveRulesReinsertRules2(final InternalK } TestUtil.insertFacts(kieSession, facts); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule1Name, rule2Name); + assertThat(resultsList).containsOnly(rule1Name, rule2Name); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule1Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule2Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.addRules(kieSession, rule1); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule1Name); + assertThat(resultsList).containsOnly(rule1Name); resultsList.clear(); TestUtil.addRules(kieSession, rule2); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule2Name); + assertThat(resultsList).containsOnly(rule2Name); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule1Name, rule2Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } @@ -518,25 +519,25 @@ public static void insertFactsFireRulesRemoveRulesReinsertRules3(final InternalK } TestUtil.insertFacts(kieSession, facts); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule1Name, rule2Name); + assertThat(resultsList).containsOnly(rule1Name, rule2Name); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule1Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, rule2Name); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); TestUtil.addRules(kieSession, true, rule1); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule1Name); + assertThat(resultsList).containsOnly(rule1Name); resultsList.clear(); TestUtil.addRules(kieSession, true, rule2); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly(rule1Name, rule2Name); + assertThat(resultsList).containsOnly(rule1Name, rule2Name); } finally { kieSession.dispose(); } @@ -564,11 +565,11 @@ public static void insertFactsRemoveFire(final InternalKnowledgeBase originalKno TestUtil.insertFacts(kieSession, facts); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, "R2"); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).containsOnly("R1"); + assertThat(resultsList).containsOnly("R1"); resultsList.clear(); TestUtil.removeRules(kieSession, TestUtil.RULES_PACKAGE_NAME, "R1"); kieSession.fireAllRules(); - Assertions.assertThat(resultsList).isEmpty(); + assertThat(resultsList).isEmpty(); } finally { kieSession.dispose(); } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/FromTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/FromTest.java index 17a32882c23..b747ce6afc0 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/FromTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/FromTest.java @@ -16,6 +16,11 @@ package org.drools.compiler.integrationtests.operators; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -25,10 +30,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; -import org.assertj.core.api.Assertions; import org.drools.core.base.ClassObjectType; import org.drools.core.event.DebugAgendaEventListener; -import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.core.reteoo.EntryPointNode; import org.drools.core.reteoo.FromNode; import org.drools.core.reteoo.LeftInputAdapterNode; @@ -36,6 +39,7 @@ import org.drools.core.reteoo.ObjectTypeNode; import org.drools.core.reteoo.Sink; import org.drools.core.rule.EntryPointId; +import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.testcoverage.common.model.Address; import org.drools.testcoverage.common.model.Cheese; import org.drools.testcoverage.common.model.Cheesery; @@ -67,10 +71,6 @@ import org.kie.internal.builder.conf.LanguageLevelOption; import org.kie.internal.builder.conf.PropertySpecificOption; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - @RunWith(Parameterized.class) public class FromTest { @@ -347,7 +347,7 @@ public void testFromWithSingleValueAndIncompatibleType() { final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } public static class Container2 { @@ -476,7 +476,7 @@ public void testFromWithInterfaceAndFinalClass() { final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } @Test @@ -890,7 +890,7 @@ public void testFromWithStrictModeOn() { final KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl); - Assertions.assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); + assertThat(kieBuilder.getResults().getMessages()).isNotEmpty(); } @Test diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/commons/jci/compilers/NativeJavaCompilerSettingsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/commons/jci/compilers/NativeJavaCompilerSettingsTest.java index b3faab9e0ff..aaf6115b5af 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/commons/jci/compilers/NativeJavaCompilerSettingsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/commons/jci/compilers/NativeJavaCompilerSettingsTest.java @@ -15,12 +15,13 @@ package org.drools.mvel.compiler.commons.jci.compilers; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.List; -import org.assertj.core.api.Assertions; import org.assertj.core.data.Index; -import org.kie.memorycompiler.jdknative.NativeJavaCompilerSettings; import org.junit.Test; +import org.kie.memorycompiler.jdknative.NativeJavaCompilerSettings; public class NativeJavaCompilerSettingsTest { @@ -28,12 +29,12 @@ public class NativeJavaCompilerSettingsTest { public void defaultSettings() { NativeJavaCompilerSettings settings = new NativeJavaCompilerSettings(); List options = settings.toOptionsList(); - Assertions.assertThat(options).hasSize(6); - Assertions.assertThat(options).contains("-source", "-target", "-encoding"); + assertThat(options).hasSize(6); + assertThat(options).contains("-source", "-target", "-encoding"); // check the order is correct, value of the option needs to be right after the option name - Assertions.assertThat(options).contains("1.8", Index.atIndex(options.indexOf("-source") + 1)); - Assertions.assertThat(options).contains("1.8", Index.atIndex(options.indexOf("-target") + 1)); - Assertions.assertThat(options).contains("UTF-8", Index.atIndex(options.indexOf("-encoding") + 1)); + assertThat(options).contains("1.8", Index.atIndex(options.indexOf("-source") + 1)); + assertThat(options).contains("1.8", Index.atIndex(options.indexOf("-target") + 1)); + assertThat(options).contains("UTF-8", Index.atIndex(options.indexOf("-encoding") + 1)); } @Test @@ -47,14 +48,14 @@ public void allSettings() { settings.setTargetVersion("1.9"); List options = settings.toOptionsList(); - Assertions.assertThat(options).hasSize(9); - Assertions.assertThat(options).contains("-g"); - Assertions.assertThat(options).contains("-Xlint:all"); - Assertions.assertThat(options).contains("-deprecation"); + assertThat(options).hasSize(9); + assertThat(options).contains("-g"); + assertThat(options).contains("-Xlint:all"); + assertThat(options).contains("-deprecation"); // check the order is correct, value of the option needs to be right after the option name - Assertions.assertThat(options).contains("1.9", Index.atIndex(options.indexOf("-source") + 1)); - Assertions.assertThat(options).contains("1.9", Index.atIndex(options.indexOf("-target") + 1)); - Assertions.assertThat(options).contains("My-Custom-Encoding", Index.atIndex(options.indexOf("-encoding") + 1)); + assertThat(options).contains("1.9", Index.atIndex(options.indexOf("-source") + 1)); + assertThat(options).contains("1.9", Index.atIndex(options.indexOf("-target") + 1)); + assertThat(options).contains("My-Custom-Encoding", Index.atIndex(options.indexOf("-encoding") + 1)); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/DrlParserTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/DrlParserTest.java index 94d612d78c3..5952e2f8943 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/DrlParserTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/DrlParserTest.java @@ -15,15 +15,18 @@ package org.drools.mvel.compiler.compiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + import java.io.StringReader; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; -import org.drools.drl.parser.DrlParser; -import org.drools.drl.parser.lang.Expander; import org.drools.drl.ast.descr.PackageDescr; import org.drools.drl.ast.descr.TypeDeclarationDescr; +import org.drools.drl.parser.DrlParser; +import org.drools.drl.parser.lang.Expander; import org.drools.drl.parser.lang.dsl.DSLMappingFile; import org.drools.drl.parser.lang.dsl.DSLTokenizedMappingFile; import org.drools.drl.parser.lang.dsl.DefaultExpander; @@ -38,9 +41,6 @@ import org.kie.api.builder.Message; import org.kie.internal.builder.conf.LanguageLevelOption; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - @RunWith(Parameterized.class) public class DrlParserTest { @@ -64,7 +64,7 @@ public void testExpandDRL() throws Exception { DrlParser parser = new DrlParser(LanguageLevelOption.DRL5); String result = parser.getExpandedDRL( drl, new StringReader(dsl)); - Assertions.assertThat("rule 'foo' " + NL + " when " + NL + " Something() " + NL + " then " + NL + " another(); " + NL + "end") + assertThat("rule 'foo' " + NL + " when " + NL + " Something() " + NL + " then " + NL + " another(); " + NL + "end") .isEqualToIgnoringWhitespace(result); } @@ -88,7 +88,7 @@ public void testExpandDRLUsingInjectedExpander() throws Exception { DrlParser parser = new DrlParser(LanguageLevelOption.DRL5); String result = parser.getExpandedDRL( drl, resolver); - Assertions.assertThat("rule 'foo' " + NL + " when " + NL + " Something() " + NL + " then " + NL + " another(); " + NL + "end") + assertThat("rule 'foo' " + NL + " when " + NL + " Something() " + NL + " then " + NL + " another(); " + NL + "end") .isEqualToIgnoringWhitespace(result); } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTest.java index 109b3f27cb7..27a7d6fba7a 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTest.java @@ -15,18 +15,18 @@ package org.drools.mvel.compiler.compiler.xml.rules; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.drools.drl.ast.descr.PackageDescr; +import org.drools.drl.ast.dsl.DescrFactory; import org.drools.drl.parser.DrlParser; import org.drools.drl.parser.DroolsParserException; -import org.drools.drl.ast.dsl.DescrFactory; -import org.drools.drl.ast.descr.PackageDescr; import org.drools.mvel.DrlDumper; import org.junit.Test; import org.kie.internal.builder.conf.LanguageLevelOption; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - /** * Test the dump/convert format utilities. */ @@ -154,7 +154,7 @@ private void checkRoundtrip( String drl ) throws DroolsParserException { final PackageDescr pkgOriginal = parser.parse( false, drl ); final DrlDumper dumper = new DrlDumper(); String out = dumper.dump( pkgOriginal ); - Assertions.assertThat( drl ).isEqualToIgnoringWhitespace( out ); + assertThat( drl ).isEqualToIgnoringWhitespace( out ); } @Test @@ -262,6 +262,6 @@ public void testAccumulateWithoutConstraint() throws Exception { String drl = new DrlDumper().dump(packageDescr); - Assertions.assertThat( drl ).isEqualToIgnoringWhitespace( expectedDrl ); + assertThat( drl ).isEqualToIgnoringWhitespace( expectedDrl ); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTestHelper.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTestHelper.java index e564032d9e3..d3b396e34ce 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTestHelper.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTestHelper.java @@ -15,21 +15,21 @@ package org.drools.mvel.compiler.compiler.xml.rules; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + import java.io.IOException; import java.io.InputStreamReader; import java.io.StringReader; -import org.assertj.core.api.Assertions; import org.drools.compiler.builder.impl.KnowledgeBuilderConfigurationImpl; -import org.drools.drl.parser.DrlParser; import org.drools.compiler.compiler.xml.XmlDumper; import org.drools.compiler.compiler.xml.XmlPackageReader; -import org.drools.mvel.DrlDumper; import org.drools.drl.ast.descr.PackageDescr; +import org.drools.drl.parser.DrlParser; +import org.drools.mvel.DrlDumper; import org.kie.internal.builder.conf.LanguageLevelOption; -import static org.junit.Assert.*; - /** * Helper Class for both xml and drl Dump Tests */ @@ -51,7 +51,7 @@ public static void XmlFile(String filename) throws Exception { System.out.println(buffer); System.out.println(result); - Assertions.assertThat(buffer).isEqualToIgnoringWhitespace(result); + assertThat(buffer).isEqualToIgnoringWhitespace(result); assertNotNull( result ); } @@ -65,7 +65,7 @@ public static void DrlFile(String filename) throws Exception { String result2 = dumper.dump( pkgDerivated ); System.out.println( result1 ); - Assertions.assertThat(result1).isEqualToIgnoringWhitespace(result2); + assertThat(result1).isEqualToIgnoringWhitespace(result2); } public static String dump(String filename) throws Exception { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/XmlPackageReaderTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/XmlPackageReaderTest.java index 8d47eefb0ce..8ec7c308b8a 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/XmlPackageReaderTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/XmlPackageReaderTest.java @@ -15,13 +15,18 @@ package org.drools.mvel.compiler.compiler.xml.rules; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import java.io.InputStreamReader; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.compiler.builder.impl.KnowledgeBuilderConfigurationImpl; import org.drools.compiler.compiler.xml.XmlPackageReader; -import org.drools.mvel.DrlDumper; +import org.drools.core.util.StringUtils; import org.drools.drl.ast.descr.AccumulateDescr; import org.drools.drl.ast.descr.AndDescr; import org.drools.drl.ast.descr.ExistsDescr; @@ -38,15 +43,10 @@ import org.drools.drl.ast.descr.PatternDescr; import org.drools.drl.ast.descr.QueryDescr; import org.drools.drl.ast.descr.RuleDescr; -import org.drools.core.util.StringUtils; import org.drools.mvel.CommonTestMethodBase; +import org.drools.mvel.DrlDumper; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - public class XmlPackageReaderTest extends CommonTestMethodBase { @Test @@ -214,7 +214,7 @@ public void testParseCollect() throws Exception { String expectedWithoutHeader = removeLicenseHeader( expected ); String actual = new DrlDumper().dump( packageDescr ); - Assertions.assertThat(expectedWithoutHeader).isEqualToIgnoringWhitespace(actual); + assertThat(expectedWithoutHeader).isEqualToIgnoringWhitespace(actual); } @Test @@ -342,7 +342,7 @@ public void testParseRule() throws Exception { System.out.println(expectedWithoutHeader); String actual = new DrlDumper().dump( packageDescr ); - Assertions.assertThat(expectedWithoutHeader).isEqualToIgnoringWhitespace(actual); + assertThat(expectedWithoutHeader).isEqualToIgnoringWhitespace(actual); } @Test @@ -438,7 +438,7 @@ public void testParseLhs() throws Exception { String expectedWithoutHeader = removeLicenseHeader( expected ); String actual = new DrlDumper().dump( packageDescr ); - Assertions.assertThat(expectedWithoutHeader).isEqualToIgnoringWhitespace(actual); + assertThat(expectedWithoutHeader).isEqualToIgnoringWhitespace(actual); } @Test diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/ClasspathKieProjectTransformUrlToFileSystemPathTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/ClasspathKieProjectTransformUrlToFileSystemPathTest.java index 793da2d04ba..b93ae0e4e12 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/ClasspathKieProjectTransformUrlToFileSystemPathTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/ClasspathKieProjectTransformUrlToFileSystemPathTest.java @@ -15,11 +15,12 @@ package org.drools.mvel.compiler.kie.builder.impl; +import static org.assertj.core.api.Assertions.assertThat; + import java.net.URL; import java.util.Arrays; import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.compiler.kie.builder.impl.ClasspathKieProject; import org.junit.Test; import org.junit.runner.RunWith; @@ -46,6 +47,6 @@ public static Collection data() throws Exception { @Test public void testTransformUrl() { String actualPath = ClasspathKieProject.fixURLFromKProjectPath(url); - Assertions.assertThat(actualPath).isEqualTo(expectedPath); + assertThat(actualPath).isEqualTo(expectedPath); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/MemoryKieModuleResourceProviderTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/MemoryKieModuleResourceProviderTest.java index adbce59f38a..d8b5cbee42c 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/MemoryKieModuleResourceProviderTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/MemoryKieModuleResourceProviderTest.java @@ -15,12 +15,13 @@ package org.drools.mvel.compiler.kie.builder.impl; +import static org.assertj.core.api.Assertions.assertThat; + import org.apache.commons.io.IOUtils; -import org.assertj.core.api.Assertions; import org.drools.compiler.compiler.io.memory.MemoryFile; -import org.drools.compiler.kie.builder.impl.MemoryKieModule; import org.drools.compiler.compiler.io.memory.MemoryFileSystem; import org.drools.compiler.compiler.io.memory.MemoryFolder; +import org.drools.compiler.kie.builder.impl.MemoryKieModule; import org.drools.wiring.api.ResourceProvider; import org.junit.Test; import org.kie.api.builder.ReleaseId; @@ -44,7 +45,7 @@ public void testGetResourceForEmptyFolder() throws Exception { ResourceProvider resourceProvider = mkm.createResourceProvider(); String folderContents = IOUtils.toString(resourceProvider.getResource("src/main/java").openStream()); - Assertions.assertThat(folderContents).isEmpty(); + assertThat(folderContents).isEmpty(); } @Test @@ -58,7 +59,7 @@ public void testGetResourceForFolderWithOnlySubFolders() throws Exception { ResourceProvider resourceProvider = mkm.createResourceProvider(); String folderContents = IOUtils.toString(resourceProvider.getResource("src/main/java").openStream()); - Assertions.assertThat(folderContents).hasLineCount(2).contains("com", "org"); + assertThat(folderContents).hasLineCount(2).contains("com", "org"); } @Test @@ -74,7 +75,7 @@ public void testGetResourceForFolderWithFilesAndSubFolders() throws Exception { ResourceProvider resourceProvider = mkm.createResourceProvider(); String folderContents = IOUtils.toString(resourceProvider.getResource("src/main/java").openStream()); - Assertions.assertThat(folderContents).hasLineCount(4).contains("com", "org", "my-file1", "my-file2"); + assertThat(folderContents).hasLineCount(4).contains("com", "org", "my-file1", "my-file2"); } @Test @@ -86,7 +87,7 @@ public void testGetResourceAsStreamForFile() throws Exception { ResourceProvider resourceProvider = mkm.createResourceProvider(); String folderContents = IOUtils.toString(resourceProvider.getResourceAsStream("src/main/resources/my-file1")); - Assertions.assertThat(folderContents).hasLineCount(1).contains("AB"); // "AB" == new byte[] {65, 66} + assertThat(folderContents).hasLineCount(1).contains("AB"); // "AB" == new byte[] {65, 66} } @Test @@ -100,7 +101,7 @@ public void testGetResourceAsStreamFolderWithOnlySubFolders() throws Exception { ResourceProvider resourceProvider = mkm.createResourceProvider(); String folderContents = IOUtils.toString(resourceProvider.getResourceAsStream("src/main/java")); - Assertions.assertThat(folderContents).hasLineCount(2).contains("com", "org"); + assertThat(folderContents).hasLineCount(2).contains("com", "org"); } @Test @@ -112,10 +113,10 @@ public void testGetResourceTrailingSlashIgnored() throws Exception { ResourceProvider resourceProvider = mkm.createResourceProvider(); String noTrailingSlashContents = IOUtils.toString(resourceProvider.getResourceAsStream("src/main/resources/my-file1")); - Assertions.assertThat(noTrailingSlashContents).hasLineCount(1).contains("AB"); // "AB" == new byte[] {65, 66} + assertThat(noTrailingSlashContents).hasLineCount(1).contains("AB"); // "AB" == new byte[] {65, 66} String withTrailingSlashContents = IOUtils.toString(resourceProvider.getResourceAsStream("src/main/resources/my-file1/")); - Assertions.assertThat(withTrailingSlashContents).hasLineCount(1).contains("AB"); // "AB" == new byte[] {65, 66} + assertThat(withTrailingSlashContents).hasLineCount(1).contains("AB"); // "AB" == new byte[] {65, 66} } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kproject/ReleaseIdTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kproject/ReleaseIdTest.java index 51a8025e968..bb2b5fd761b 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kproject/ReleaseIdTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kproject/ReleaseIdTest.java @@ -15,20 +15,20 @@ */ package org.drools.mvel.compiler.kproject; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertSame; +import static org.kie.api.builder.ReleaseIdComparator.SortDirection.ASCENDING; +import static org.kie.api.builder.ReleaseIdComparator.SortDirection.DESCENDING; + import java.util.ArrayList; import java.util.List; -import org.assertj.core.api.Assertions; import org.junit.Test; import org.kie.api.KieServices; import org.kie.api.builder.ReleaseId; import org.kie.api.builder.ReleaseIdComparator; import org.kie.util.maven.support.ReleaseIdImpl; -import static org.junit.Assert.assertSame; -import static org.kie.api.builder.ReleaseIdComparator.SortDirection.ASCENDING; -import static org.kie.api.builder.ReleaseIdComparator.SortDirection.DESCENDING; - public class ReleaseIdTest { private static final ReleaseId gav0 = newReleaseId("abc.def:ghi:9.0.1.GA"); @@ -115,12 +115,12 @@ public void testGetLatest() { @Test public void testResolveVersionPomModelNull() { final ReleaseIdImpl releaseId = new ReleaseIdImpl("groupId", "artifactId", "${project.version}"); - Assertions.assertThat(releaseId.getVersion()).isEqualTo("${project.version}"); + assertThat(releaseId.getVersion()).isEqualTo("${project.version}"); } @Test public void testResolveVersionNoProperty() { final ReleaseIdImpl releaseId = new ReleaseIdImpl("groupId", "artifactId", "1.0.0"); - Assertions.assertThat(releaseId.getVersion()).isEqualTo("1.0.0"); + assertThat(releaseId.getVersion()).isEqualTo("1.0.0"); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/RuleParserTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/RuleParserTest.java index d8b6f0f1a32..d235cb9fe35 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/RuleParserTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/RuleParserTest.java @@ -16,6 +16,9 @@ package org.drools.mvel.compiler.lang; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.drl.parser.DRLFactory.buildParser; + import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; @@ -25,14 +28,9 @@ import java.util.Map; import java.util.regex.Pattern; -import junit.framework.TestCase; import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.CharStream; -import org.assertj.core.api.Assertions; -import org.drools.drl.parser.DrlParser; -import org.drools.drl.parser.lang.DRL6Lexer; -import org.drools.drl.parser.lang.DRL6Parser; -import org.drools.drl.parser.lang.DRLParser; +import org.drools.compiler.builder.impl.EvaluatorRegistry; import org.drools.drl.ast.descr.AccumulateDescr; import org.drools.drl.ast.descr.AccumulateImportDescr; import org.drools.drl.ast.descr.AndDescr; @@ -62,13 +60,16 @@ import org.drools.drl.ast.descr.TypeDeclarationDescr; import org.drools.drl.ast.descr.TypeFieldDescr; import org.drools.drl.ast.descr.WindowDeclarationDescr; -import org.drools.compiler.builder.impl.EvaluatorRegistry; +import org.drools.drl.parser.DrlParser; +import org.drools.drl.parser.lang.DRL6Lexer; +import org.drools.drl.parser.lang.DRL6Parser; +import org.drools.drl.parser.lang.DRLParser; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.kie.internal.builder.conf.LanguageLevelOption; -import static org.drools.drl.parser.DRLFactory.buildParser; +import junit.framework.TestCase; public class RuleParserTest extends TestCase { @@ -4302,7 +4303,7 @@ private void createParser( CharStream charStream ) { private void assertEqualsIgnoreWhitespace( final String expected, final String actual ) { - Assertions.assertThat(expected).isEqualToIgnoringWhitespace(actual); + assertThat(expected).isEqualToIgnoringWhitespace(actual); } private Reader getReader( final String name ) throws Exception { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/api/DescrBuilderTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/api/DescrBuilderTest.java index aace33ab8a4..0c67718c1b2 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/api/DescrBuilderTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/api/DescrBuilderTest.java @@ -16,6 +16,17 @@ package org.drools.mvel.compiler.lang.api; +import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -24,18 +35,17 @@ import java.util.LinkedList; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.compiler.builder.impl.KnowledgeBuilderImpl; -import org.drools.drl.ast.dsl.DescrFactory; -import org.drools.drl.ast.dsl.PackageDescrBuilder; -import org.drools.drl.ast.descr.AttributeDescr; -import org.drools.drl.ast.descr.PackageDescr; import org.drools.core.definitions.rule.impl.RuleImpl; -import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.core.io.impl.ByteArrayResource; import org.drools.core.rule.GroupElement; import org.drools.core.rule.Pattern; import org.drools.core.rule.RuleConditionElement; +import org.drools.drl.ast.descr.AttributeDescr; +import org.drools.drl.ast.descr.PackageDescr; +import org.drools.drl.ast.dsl.DescrFactory; +import org.drools.drl.ast.dsl.PackageDescrBuilder; +import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.kiesession.rulebase.KnowledgeBaseFactory; import org.drools.mvel.DrlDumper; import org.drools.mvel.compiler.Cheese; @@ -53,16 +63,6 @@ import org.kie.internal.io.ResourceFactory; import org.mockito.ArgumentCaptor; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - /** * DescrBuilderTest */ @@ -274,7 +274,7 @@ public void testConditionalBranch() { pkg.getRules().size() ); String drl = new DrlDumper().dump( pkg ); - Assertions.assertThat(expected).isEqualToIgnoringWhitespace(drl); + assertThat(expected).isEqualToIgnoringWhitespace(drl); KiePackage kpkg = compilePkgDescr( pkg ); assertEquals( "org.drools.mvel.compiler", diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/descr/ConnectiveDescrTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/descr/ConnectiveDescrTest.java index c6ce258c922..a78062aa7b2 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/descr/ConnectiveDescrTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/descr/ConnectiveDescrTest.java @@ -15,7 +15,8 @@ package org.drools.mvel.compiler.lang.descr; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + import org.drools.drl.ast.descr.ConnectiveDescr; import org.drools.drl.ast.descr.ConnectiveDescr.RestrictionConnectiveType; import org.junit.Test; @@ -31,14 +32,14 @@ public void testBuildExpression() { StringBuilder sb = new StringBuilder(); descr1.buildExpression( sb ); - Assertions.assertThat("name == 'darth' || == 'bobba'").isEqualToIgnoringWhitespace(sb.toString()); + assertThat("name == 'darth' || == 'bobba'").isEqualToIgnoringWhitespace(sb.toString()); ConnectiveDescr descr2 = new ConnectiveDescr( RestrictionConnectiveType.AND); descr2.setPrefix( "name" ); descr2.add( "!= 'luke'" ); sb = new StringBuilder(); descr2.buildExpression( sb ); - Assertions.assertThat("name != 'luke'").isEqualToIgnoringWhitespace(sb.toString()); + assertThat("name != 'luke'").isEqualToIgnoringWhitespace(sb.toString()); descr2.add( "!= 'yoda'" ); ConnectiveDescr descr3 = new ConnectiveDescr(RestrictionConnectiveType.AND); @@ -47,7 +48,7 @@ public void testBuildExpression() { sb = new StringBuilder(); descr3.buildExpression( sb ); - Assertions.assertThat("(name == 'darth' || == 'bobba') && (name != 'luke' && != 'yoda')").isEqualToIgnoringWhitespace(sb.toString()); + assertThat("(name == 'darth' || == 'bobba') && (name != 'luke' && != 'yoda')").isEqualToIgnoringWhitespace(sb.toString()); ConnectiveDescr descr4 = new ConnectiveDescr(RestrictionConnectiveType.AND); descr4.setPrefix( "age" ); @@ -60,7 +61,7 @@ public void testBuildExpression() { sb = new StringBuilder(); descr5.buildExpression( sb ); - Assertions.assertThat("((name == 'darth' || == 'bobba') && (name != 'luke' && != 'yoda')) || (age != 33 && != 34)").isEqualToIgnoringWhitespace(sb.toString()); + assertThat("((name == 'darth' || == 'bobba') && (name != 'luke' && != 'yoda')) || (age != 33 && != 34)").isEqualToIgnoringWhitespace(sb.toString()); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathAccumulateTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathAccumulateTest.java index 076f7b7c3a6..ef5a0aeecad 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathAccumulateTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathAccumulateTest.java @@ -16,9 +16,10 @@ package org.drools.mvel.compiler.oopath; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.mvel.compiler.oopath.model.Child; import org.drools.mvel.compiler.oopath.model.Man; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; @@ -103,9 +104,9 @@ private void testAccumulate(final String accumulateFunction, final Number expect final Number result = (Number) ksession.getGlobal("globalVar"); if (result instanceof Double) { - Assertions.assertThat(expectedResult.doubleValue()).isEqualTo(result.doubleValue()); + assertThat(expectedResult.doubleValue()).isEqualTo(result.doubleValue()); } else { - Assertions.assertThat(expectedResult.longValue()).isEqualTo(result.longValue()); + assertThat(expectedResult.longValue()).isEqualTo(result.longValue()); } } @@ -131,6 +132,6 @@ private void testAccumulateCollection(final String accumulateFunction, final Int ksession.fireAllRules(); final Collection result = (Collection) ksession.getGlobal("globalVar"); - Assertions.assertThat(result).containsExactlyInAnyOrder(expectedResults); + assertThat(result).containsExactlyInAnyOrder(expectedResults); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBenchmarkTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBenchmarkTest.java index 654753dc61e..1b3d03faa7c 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBenchmarkTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBenchmarkTest.java @@ -15,14 +15,16 @@ package org.drools.mvel.compiler.oopath; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.List; -import org.assertj.core.api.Assertions; + +import org.drools.core.common.InternalFactHandle; import org.drools.mvel.compiler.oopath.model.Child; import org.drools.mvel.compiler.oopath.model.Man; import org.drools.mvel.compiler.oopath.model.Toy; import org.drools.mvel.compiler.oopath.model.Woman; -import org.drools.core.common.InternalFactHandle; import org.kie.api.KieBase; import org.kie.api.io.ResourceType; import org.kie.api.runtime.KieSession; @@ -168,7 +170,7 @@ public static long[] testRelational(KieBase kbase, int n) { ksession.fireAllRules(); result[1] = System.nanoTime() - start; - Assertions.assertThat(n).isEqualTo(list.size()); + assertThat(n).isEqualTo(list.size()); ksession.dispose(); return result; @@ -201,7 +203,7 @@ public static long[] testFrom(KieBase kbase, int n) { ksession.fireAllRules(); result[1] = System.nanoTime() - start; - Assertions.assertThat(n * 3).isEqualTo(list.size()); + assertThat(n * 3).isEqualTo(list.size()); ksession.dispose(); return result; @@ -231,7 +233,7 @@ public static long[] testOOPath(KieBase kbase, int n) { ksession.fireAllRules(); result[1] = System.nanoTime() - start; - Assertions.assertThat(n).isEqualTo(list.size()); + assertThat(n).isEqualTo(list.size()); ksession.dispose(); return result; diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBindTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBindTest.java index b7b5f6e8830..fbe6b8d7e2f 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBindTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBindTest.java @@ -16,6 +16,8 @@ package org.drools.mvel.compiler.oopath; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -24,8 +26,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.assertj.core.api.Assertions; -import org.drools.core.reteoo.ReteDumper; import org.drools.mvel.compiler.oopath.model.Child; import org.drools.mvel.compiler.oopath.model.Man; import org.drools.mvel.compiler.oopath.model.Toy; @@ -94,9 +94,9 @@ public void testBindInteger(final boolean fireUntilHalt) throws InterruptedExcep waitForResultAndStopFireUntilHalt(list, ksession, fireUntilHaltFuture); } else { ksession.fireAllRules(); - Assertions.assertThat(list).hasSize(1); + assertThat(list).hasSize(1); } - Assertions.assertThat(list).contains(40); + assertThat(list).contains(40); } finally { executorService.shutdownNow(); ksession.dispose(); @@ -190,7 +190,7 @@ private void testScenarioBindString(final String drl, final String... expectedRe ksession.insert(alice); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder(expectedResults); + assertThat(list).containsExactlyInAnyOrder(expectedResults); } @Test @@ -218,7 +218,7 @@ public void testBindObjectFromList() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("Charles", "Debbie"); + assertThat(list).containsExactlyInAnyOrder("Charles", "Debbie"); } @Test @@ -255,7 +255,7 @@ public void testBindList() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder(1, 2); + assertThat(list).containsExactlyInAnyOrder(1, 2); } @Test @@ -292,6 +292,6 @@ public void testBindListWithConstraint() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder(2); + assertThat(list).containsExactlyInAnyOrder(2); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathCastTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathCastTest.java index 7a3b2235f7d..e2aafa5c211 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathCastTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathCastTest.java @@ -16,11 +16,13 @@ package org.drools.mvel.compiler.oopath; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertFalse; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.mvel.compiler.oopath.model.BabyBoy; import org.drools.mvel.compiler.oopath.model.BabyGirl; import org.drools.mvel.compiler.oopath.model.Man; @@ -38,8 +40,6 @@ import org.kie.api.builder.Message; import org.kie.api.runtime.KieSession; -import static org.junit.Assert.assertFalse; - @RunWith(Parameterized.class) public class OOPathCastTest { @@ -88,7 +88,7 @@ public void testInlineCast() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("doll"); + assertThat(list).containsExactlyInAnyOrder("doll"); } @Test @@ -142,6 +142,6 @@ public void testInlineCastWithConstraint() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("Debbie", "Farrah"); + assertThat(list).containsExactlyInAnyOrder("Debbie", "Farrah"); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathMultilevelTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathMultilevelTest.java index 6b4a498b64b..f064eca8448 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathMultilevelTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathMultilevelTest.java @@ -16,11 +16,12 @@ package org.drools.mvel.compiler.oopath; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.mvel.compiler.oopath.model.Child; import org.drools.mvel.compiler.oopath.model.Man; import org.drools.mvel.compiler.oopath.model.Toy; @@ -82,7 +83,7 @@ public void testClassTwoLevelPath() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("car", "ball", "doll"); + assertThat(list).containsExactlyInAnyOrder("car", "ball", "doll"); } @Test @@ -116,7 +117,7 @@ public void testClassThreeLevelPath() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("car", "ball"); + assertThat(list).containsExactlyInAnyOrder("car", "ball"); } @Test @@ -176,6 +177,6 @@ private void testScenarioTwoLevelPathWithConstraint(final String drl) { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("car", "ball"); + assertThat(list).containsExactlyInAnyOrder("car", "ball"); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathQueriesTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathQueriesTest.java index c18f00bcc0c..75ef9fb3389 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathQueriesTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathQueriesTest.java @@ -15,6 +15,8 @@ package org.drools.mvel.compiler.oopath; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -22,7 +24,6 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import org.assertj.core.api.Assertions; import org.drools.mvel.compiler.oopath.model.Room; import org.drools.mvel.compiler.oopath.model.SensorEvent; import org.drools.mvel.compiler.oopath.model.Thing; @@ -37,8 +38,6 @@ import org.kie.api.runtime.rule.QueryResults; import org.kie.api.runtime.rule.Variable; -import static org.assertj.core.api.Assertions.assertThat; - @RunWith(Parameterized.class) public class OOPathQueriesTest { @@ -242,6 +241,6 @@ public void testRecursiveOOPathQuery() { ksession.insert(key); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("desk", "chair", "key", "draw", "computer"); + assertThat(list).containsExactlyInAnyOrder("desk", "chair", "key", "draw", "computer"); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathReactiveTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathReactiveTest.java index fad6c4c1e82..49170fcae00 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathReactiveTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathReactiveTest.java @@ -16,14 +16,19 @@ package org.drools.mvel.compiler.oopath; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.mvel.compiler.oopath.model.BodyMeasurement.CHEST; +import static org.drools.mvel.compiler.oopath.model.BodyMeasurement.RIGHT_FOREARM; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.core.base.ClassObjectType; import org.drools.core.common.InternalWorkingMemory; -import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.core.reteoo.BetaMemory; import org.drools.core.reteoo.EntryPointNode; import org.drools.core.reteoo.LeftInputAdapterNode; @@ -32,6 +37,7 @@ import org.drools.core.reteoo.ReactiveFromNode; import org.drools.core.reteoo.TupleMemory; import org.drools.core.util.Iterator; +import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.mvel.compiler.oopath.model.Adult; import org.drools.mvel.compiler.oopath.model.Child; import org.drools.mvel.compiler.oopath.model.Disease; @@ -53,12 +59,6 @@ import org.kie.api.builder.Message; import org.kie.api.runtime.KieSession; -import static org.drools.mvel.compiler.oopath.model.BodyMeasurement.CHEST; -import static org.drools.mvel.compiler.oopath.model.BodyMeasurement.RIGHT_FOREARM; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - @RunWith(Parameterized.class) public class OOPathReactiveTest { @@ -107,13 +107,13 @@ public void testReactiveOnLia() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("car", "ball"); + assertThat(list).containsExactlyInAnyOrder("car", "ball"); list.clear(); debbie.setAge( 11 ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("doll"); + assertThat(list).containsExactlyInAnyOrder("doll"); } @Test @@ -159,26 +159,26 @@ public void testReactiveDeleteOnLia() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("car", "ball", "doll"); + assertThat(list).containsExactlyInAnyOrder("car", "ball", "doll"); final TupleMemory tupleMemory = betaMemory.getLeftTupleMemory(); - Assertions.assertThat(betaMemory.getLeftTupleMemory().size()).isEqualTo(2); + assertThat(betaMemory.getLeftTupleMemory().size()).isEqualTo(2); Iterator it = tupleMemory.iterator(); for ( LeftTuple next = it.next(); next != null; next = it.next() ) { final Object obj = next.getFactHandle().getObject(); - Assertions.assertThat(obj == charlie || obj == debbie).isTrue(); + assertThat(obj == charlie || obj == debbie).isTrue(); } list.clear(); debbie.setAge( 10 ); ksession.fireAllRules(); - Assertions.assertThat(list).hasSize(0);; - Assertions.assertThat(betaMemory.getLeftTupleMemory().size()).isEqualTo(1); + assertThat(list).hasSize(0);; + assertThat(betaMemory.getLeftTupleMemory().size()).isEqualTo(1); it = tupleMemory.iterator(); for ( LeftTuple next = it.next(); next != null; next = it.next() ) { final Object obj = next.getFactHandle().getObject(); - Assertions.assertThat(obj == charlie).isTrue(); + assertThat(obj == charlie).isTrue(); } } @@ -437,13 +437,13 @@ public void testReactiveOnBeta() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("car", "ball"); + assertThat(list).containsExactlyInAnyOrder("car", "ball"); list.clear(); debbie.setAge( 11 ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("doll"); + assertThat(list).containsExactlyInAnyOrder("doll"); } @Test @@ -495,15 +495,15 @@ public void testReactive2Rules() { ksession.insert( school ); ksession.fireAllRules(); - Assertions.assertThat(toyList).containsExactlyInAnyOrder("car", "ball"); - Assertions.assertThat(teenagers).containsExactlyInAnyOrder("Charles"); + assertThat(toyList).containsExactlyInAnyOrder("car", "ball"); + assertThat(teenagers).containsExactlyInAnyOrder("Charles"); toyList.clear(); debbie.setAge( 13 ); ksession.fireAllRules(); - Assertions.assertThat(toyList).containsExactlyInAnyOrder("doll"); - Assertions.assertThat(teenagers).containsExactlyInAnyOrder("Charles", "Debbie"); + assertThat(toyList).containsExactlyInAnyOrder("doll"); + assertThat(teenagers).containsExactlyInAnyOrder("Charles", "Debbie"); } @Test @@ -540,13 +540,13 @@ public void testReactiveList() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("car", "ball"); + assertThat(list).containsExactlyInAnyOrder("car", "ball"); list.clear(); charlie.addToy( new Toy( "gun" ) ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("gun"); + assertThat(list).containsExactlyInAnyOrder("gun"); } @Test @@ -582,12 +582,12 @@ public void testReactiveSet() { ksession.insert(bob); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("flu", "asthma"); + assertThat(list).containsExactlyInAnyOrder("flu", "asthma"); list.clear(); charlie.addDisease(new Disease("epilepsy")); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("epilepsy"); + assertThat(list).containsExactlyInAnyOrder("epilepsy"); } @Test @@ -615,12 +615,12 @@ public void testReactiveMap() { ksession.insert(bob); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder(80); + assertThat(list).containsExactlyInAnyOrder(80); list.clear(); alice.putBodyMeasurement(RIGHT_FOREARM, 38); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder(38, 80); + assertThat(list).containsExactlyInAnyOrder(38, 80); } @Test @@ -657,13 +657,13 @@ public void testNonReactivePart() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("car", "ball"); + assertThat(list).containsExactlyInAnyOrder("car", "ball"); list.clear(); charlie.addToy( new Toy( "robot" ) ); ksession.fireAllRules(); - Assertions.assertThat(list).isEmpty(); + assertThat(list).isEmpty(); } @Test @@ -700,13 +700,13 @@ public void testAllNonReactiveAfterNonReactivePart() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("car", "ball"); + assertThat(list).containsExactlyInAnyOrder("car", "ball"); list.clear(); charlie.addToy( new Toy( "robot" ) ); ksession.fireAllRules(); - Assertions.assertThat(list).isEmpty(); + assertThat(list).isEmpty(); } @Test @@ -760,13 +760,13 @@ public void testSingleFireOnReactiveChange() { ksession.fireAllRules(); - Assertions.assertThat(list).hasSize(1); + assertThat(list).hasSize(1); list.clear(); toy.setName( "eleonor toy 2" ); ksession.fireAllRules(); - Assertions.assertThat(list).hasSize(1); + assertThat(list).hasSize(1); } @Test @@ -798,7 +798,7 @@ public void testReactivitySettingAttributeInDrl() { ksession.insert(bob); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(4); + assertThat(ksession.fireAllRules()).isEqualTo(4); } private List factsCollection(KieSession ksession) { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathTest.java index 678a6c96cd9..422d64aa598 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathTest.java @@ -15,6 +15,12 @@ package org.drools.mvel.compiler.oopath; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.mvel.compiler.TestUtil.assertDrlHasCompilationError; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -23,7 +29,6 @@ import java.util.ListIterator; import java.util.Set; -import org.assertj.core.api.Assertions; import org.drools.core.phreak.AbstractReactiveObject; import org.drools.core.phreak.ReactiveSet; import org.drools.mvel.compiler.oopath.model.Adult; @@ -54,11 +59,6 @@ import org.kie.api.event.rule.ObjectUpdatedEvent; import org.kie.api.runtime.KieSession; -import static org.drools.mvel.compiler.TestUtil.assertDrlHasCompilationError; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - @RunWith(Parameterized.class) public class OOPathTest { @@ -142,7 +142,7 @@ public void testIndexedAccess() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("ball"); + assertThat(list).containsExactlyInAnyOrder("ball"); } @Test @@ -180,7 +180,7 @@ public void testBackReferenceConstraint() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).containsExactlyInAnyOrder("ball", "guitar"); + assertThat(list).containsExactlyInAnyOrder("ball", "guitar"); } @Test @@ -216,7 +216,7 @@ public void testPrimitives() { ksession.insert( bob ); ksession.fireAllRules(); - Assertions.assertThat(list).hasSize(4); + assertThat(list).hasSize(4); Assert.assertEquals( Arrays.asList(new String[] {"t2:12:t2", "t1:12:t1", "t4:8:t4", "t3:8:t3"}),list); } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/ExpirationTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/ExpirationTest.java index c513b0d7306..374bab33b06 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/ExpirationTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/ExpirationTest.java @@ -16,6 +16,10 @@ package org.drools.mvel.integrationtests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.kie.api.definition.type.Expires.Policy.TIME_SOFT; + import java.time.Duration; import java.util.Collection; import java.util.Date; @@ -23,7 +27,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.assertj.core.api.Assertions; import org.drools.core.ClassObjectFilter; import org.drools.core.ClockType; import org.drools.core.SessionConfigurationImpl; @@ -43,9 +46,6 @@ import org.kie.api.runtime.KieSessionConfiguration; import org.kie.api.runtime.conf.ClockTypeOption; -import static org.junit.Assert.assertEquals; -import static org.kie.api.definition.type.Expires.Policy.TIME_SOFT; - @RunWith(Parameterized.class) public class ExpirationTest { @@ -496,9 +496,9 @@ private void testEventsExpiredInThePast(final String drl) { clock.advanceTime(100, TimeUnit.MILLISECONDS); - Assertions.assertThat(kieSession.fireAllRules()).isEqualTo(1); + assertThat(kieSession.fireAllRules()).isEqualTo(1); clock.advanceTime(10, TimeUnit.MILLISECONDS); - Assertions.assertThat(kieSession.getObjects()).isEmpty(); + assertThat(kieSession.getObjects()).isEmpty(); } @Test @@ -560,7 +560,7 @@ private void testEventExpiredContraint(boolean expired, boolean constraint) thro kieSession.insert(new DummyEvent(1, currentTime)); kieSession.insert(new DummyEvent(2, (expired ? currentTime - Duration.ofHours(8).toMillis() : currentTime + Duration.ofHours(8).toMillis()))); - Assertions.assertThat(kieSession.fireAllRules()).isEqualTo(1); + assertThat(kieSession.fireAllRules()).isEqualTo(1); } public interface ApplicationEvent { } @@ -736,7 +736,7 @@ public void testEventSameContraint() throws InterruptedException { kieSession.insert(new DummyEvent(1, currentTime)); kieSession.insert(new DummyEvent(2, currentTime - Duration.ofHours(8).toMillis())); - Assertions.assertThat(kieSession.fireAllRules()).isEqualTo(2); + assertThat(kieSession.fireAllRules()).isEqualTo(2); } @Test @@ -795,7 +795,7 @@ private void testCollectExpiredEvent(boolean expired) { kieSession.insert(event1); kieSession.insert(event2); - Assertions.assertThat(kieSession.fireAllRules()).isEqualTo(1); + assertThat(kieSession.fireAllRules()).isEqualTo(1); } @Test @@ -1016,8 +1016,8 @@ public void testPolymorphicAlphaExpired() throws InterruptedException { kieSession.insert(new DummyEvent(10, currentTime)); - Assertions.assertThat(kieSession.fireAllRules()).isEqualTo(2); - Assertions.assertThat(kieSession.fireAllRules()).isEqualTo(0); + assertThat(kieSession.fireAllRules()).isEqualTo(2); + assertThat(kieSession.fireAllRules()).isEqualTo(0); } @Test @@ -1065,7 +1065,7 @@ public void testAvoidAlreadyExpiredFactsToForeverRemainInWM() { kieSession.insert(dummyEvent); - Assertions.assertThat(kieSession.fireAllRules()).isEqualTo(1); - Assertions.assertThat(kieSession.getFactCount()).isEqualTo(0); + assertThat(kieSession.fireAllRules()).isEqualTo(1); + assertThat(kieSession.getFactCount()).isEqualTo(0); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/FunctionsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/FunctionsTest.java index af47b0f1579..676eb5cfdf1 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/FunctionsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/FunctionsTest.java @@ -15,13 +15,16 @@ package org.drools.mvel.integrationtests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.assertj.core.api.Assertions; import org.drools.mvel.compiler.Cheese; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; @@ -34,9 +37,6 @@ import org.kie.api.io.Resource; import org.kie.api.runtime.KieSession; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - @RunWith(Parameterized.class) public class FunctionsTest { @@ -84,7 +84,7 @@ public void testFunctionException() throws Exception { ksession.fireAllRules(); fail( "Should throw an Exception from the Function" ); } catch ( final Exception e ) { - Assertions.assertThat(e.getCause().getMessage()).contains("this should throw an exception"); + assertThat(e.getCause().getMessage()).contains("this should throw an exception"); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/JittingTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/JittingTest.java index 4512921a156..1e26de85bcf 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/JittingTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/JittingTest.java @@ -16,12 +16,14 @@ package org.drools.mvel.integrationtests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + import java.math.BigDecimal; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.assertj.core.api.Assertions; import org.drools.mvel.compiler.Person; import org.drools.mvel.integrationtests.facts.AnEnum; import org.drools.mvel.integrationtests.facts.FactWithEnum; @@ -37,8 +39,6 @@ import org.kie.api.runtime.KieSession; import org.kie.internal.conf.ConstraintJittingThresholdOption; -import static org.junit.Assert.assertEquals; - @RunWith(Parameterized.class) public class JittingTest { @@ -122,7 +122,7 @@ public void testJittingEnum() { final KieSession kieSession = kieBase.newKieSession(); kieSession.insert(AnEnum.FIRST); - Assertions.assertThat(kieSession.fireAllRules()).isEqualTo(1); + assertThat(kieSession.fireAllRules()).isEqualTo(1); } @Test @@ -140,7 +140,7 @@ public void testJittingEnumAttribute() { final KieSession kieSession = kieBase.newKieSession(); kieSession.insert(new FactWithEnum(AnEnum.FIRST)); - Assertions.assertThat(kieSession.fireAllRules()).isEqualTo(1); + assertThat(kieSession.fireAllRules()).isEqualTo(1); } @Test @@ -270,7 +270,7 @@ public void testJittingBigDecimalAdd() { kieSession.insert(new BigDecimalFact(new BigDecimal(10))); kieSession.insert(new BigDecimalFact(new BigDecimal(11))); - Assertions.assertThat(kieSession.fireAllRules()).isEqualTo(1); + assertThat(kieSession.fireAllRules()).isEqualTo(1); } @Test @@ -290,7 +290,7 @@ public void testJittingBigDecimalRemainder() { kieSession.insert(new BigDecimalFact(new BigDecimal(10))); kieSession.insert(new BigDecimalFact(new BigDecimal(11))); - Assertions.assertThat(kieSession.fireAllRules()).isEqualTo(1); + assertThat(kieSession.fireAllRules()).isEqualTo(1); } public class BigDecimalFact { @@ -350,6 +350,6 @@ public void testJittingVarargsCall() { kieSession.insert("CV"); kieSession.insert("CX"); - Assertions.assertThat(kieSession.fireAllRules()).isEqualTo(1); + assertThat(kieSession.fireAllRules()).isEqualTo(1); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java index 3f4fe93b84a..f6daf13a328 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java @@ -15,11 +15,16 @@ package org.drools.mvel.integrationtests; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.util.Collection; import java.util.List; import java.util.function.Predicate; -import org.assertj.core.api.Assertions; import org.drools.compiler.kie.builder.impl.InternalKieModule; import org.drools.compiler.kproject.models.KieModuleModelImpl; import org.drools.mvel.compiler.Message; @@ -49,11 +54,6 @@ import org.kie.internal.builder.KnowledgeBuilderFactory; import org.kie.internal.io.ResourceFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - @RunWith(Parameterized.class) public class KieBuilderTest { @@ -173,7 +173,7 @@ public void testInvalidXsdTargetNamespace() { final ReleaseId releaseId1 = ks.newReleaseId( "org.kie", "test-kie-builder", "1.0.0" ); final Resource r1 = ResourceFactory.newByteArrayResource( drl1.getBytes() ).setResourceType( ResourceType.DRL ).setSourcePath( "kbase1/drl1.drl" ); - Assertions.assertThatThrownBy(() -> KieUtil.buildAndInstallKieModuleIntoRepo(kieBaseTestConfiguration, releaseId1, KieModuleModelImpl.fromXML(kmodule), r1)) + assertThatThrownBy(() -> KieUtil.buildAndInstallKieModuleIntoRepo(kieBaseTestConfiguration, releaseId1, KieModuleModelImpl.fromXML(kmodule), r1)) .isInstanceOf(RuntimeException.class) .hasMessageContaining("XSD validation failed"); } @@ -491,10 +491,10 @@ private void checkKModule( final String kmodule, final int expectedErrors ) { public void testAddMissingResourceToPackageBuilder() throws Exception { final KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder(); - Assertions.assertThatThrownBy(() -> kbuilder.add(ResourceFactory.newClassPathResource("some.rf"), ResourceType.DRL)) + assertThatThrownBy(() -> kbuilder.add(ResourceFactory.newClassPathResource("some.rf"), ResourceType.DRL)) .isInstanceOf(RuntimeException.class); - Assertions.assertThatThrownBy(() -> kbuilder.add(ResourceFactory.newClassPathResource("some.bpmn"), ResourceType.BPMN2)) + assertThatThrownBy(() -> kbuilder.add(ResourceFactory.newClassPathResource("some.bpmn"), ResourceType.BPMN2)) .isInstanceOf(RuntimeException.class); } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieContainerTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieContainerTest.java index 1c0c6f26e34..5cf6fdf8170 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieContainerTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieContainerTest.java @@ -15,6 +15,12 @@ package org.drools.mvel.integrationtests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.core.util.DroolsAssert.assertEnumerationSize; +import static org.drools.core.util.DroolsAssert.assertUrlEnumerationContainsMatch; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + import java.io.IOException; import java.io.StringReader; import java.lang.reflect.Constructor; @@ -24,7 +30,6 @@ import java.util.List; import org.apache.commons.io.IOUtils; -import org.assertj.core.api.Assertions; import org.drools.compiler.compiler.io.Folder; import org.drools.compiler.compiler.io.memory.MemoryFileSystem; import org.drools.compiler.kie.builder.impl.MemoryKieModule; @@ -48,11 +53,6 @@ import org.kie.api.runtime.KieContainer; import org.kie.api.runtime.KieSession; -import static org.drools.core.util.DroolsAssert.assertEnumerationSize; -import static org.drools.core.util.DroolsAssert.assertUrlEnumerationContainsMatch; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - @RunWith(Parameterized.class) public class KieContainerTest { @@ -284,7 +284,7 @@ public void testIncrementalCompilationSynchronization() { // There can be multiple items in the list if an updateToVersion is triggered during a fireAllRules // (updateToVersion can be called multiple times during fireAllRules, especially on slower machines) // in that case it may fire with the old rule and multiple new ones - Assertions.assertThat(list).isNotEmpty(); + assertThat(list).isNotEmpty(); if (list.get(0).equals("rule9")) { break; } @@ -369,7 +369,7 @@ public void testClassLoaderGetResources() throws IOException { // make sure the package resource correctly lists all its child resources (files in this case) URL url = classLoader.getResources("org/drools/testdrl").nextElement(); List lines = IOUtils.readLines(url.openStream()); - Assertions.assertThat(lines).contains("rules1.drl", "rules1.drl.properties", "rules2.drl", "rules2.drl.properties"); + assertThat(lines).contains("rules1.drl", "rules1.drl.properties", "rules2.drl", "rules2.drl.properties"); assertUrlEnumerationContainsMatch("^mfs\\:/$", classLoader.getResources("")); } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/Misc2Test.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/Misc2Test.java index a15e49acbae..9ca9984693b 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/Misc2Test.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/Misc2Test.java @@ -16,6 +16,16 @@ package org.drools.mvel.integrationtests; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.mvel.compiler.TestUtil.assertDrlHasCompilationError; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.junit.Assume.assumeTrue; + import java.io.Serializable; import java.io.StringReader; import java.math.BigDecimal; @@ -41,16 +51,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.assertj.core.api.Assertions; import org.drools.compiler.builder.impl.KnowledgeBuilderConfigurationImpl; import org.drools.compiler.builder.impl.KnowledgeBuilderImpl; -import org.drools.drl.parser.DrlParser; -import org.drools.drl.parser.DroolsParserException; -import org.drools.core.definitions.InternalKnowledgePackage; -import org.drools.core.reteoo.CoreComponentFactory; -import org.drools.drl.ast.descr.PackageDescr; -import org.drools.drl.ast.descr.PatternDescr; -import org.drools.drl.ast.descr.RuleDescr; import org.drools.core.ClassObjectFilter; import org.drools.core.InitialFact; import org.drools.core.base.ClassObjectType; @@ -61,13 +63,14 @@ import org.drools.core.common.Memory; import org.drools.core.common.NodeMemories; import org.drools.core.common.ReteEvaluator; +import org.drools.core.definitions.InternalKnowledgePackage; import org.drools.core.definitions.rule.impl.RuleImpl; import org.drools.core.facttemplates.FactTemplate; import org.drools.core.facttemplates.FactTemplateImpl; import org.drools.core.facttemplates.FieldTemplate; import org.drools.core.facttemplates.FieldTemplateImpl; -import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.core.impl.RuleBase; +import org.drools.core.reteoo.CoreComponentFactory; import org.drools.core.reteoo.LeftInputAdapterNode; import org.drools.core.reteoo.LeftTuple; import org.drools.core.reteoo.ObjectTypeNode; @@ -75,6 +78,12 @@ import org.drools.core.reteoo.SegmentMemory; import org.drools.core.spi.Activation; import org.drools.core.spi.Salience; +import org.drools.drl.ast.descr.PackageDescr; +import org.drools.drl.ast.descr.PatternDescr; +import org.drools.drl.ast.descr.RuleDescr; +import org.drools.drl.parser.DrlParser; +import org.drools.drl.parser.DroolsParserException; +import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.kiesession.rulebase.KnowledgeBaseFactory; import org.drools.mvel.builder.MVELDialectConfiguration; import org.drools.mvel.compiler.Address; @@ -135,15 +144,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static java.util.Arrays.asList; -import static org.drools.mvel.compiler.TestUtil.assertDrlHasCompilationError; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.junit.Assume.assumeTrue; - /** * Run all the tests with the ReteOO engine implementation */ @@ -395,7 +395,7 @@ public void testCorrectDeclarationsInConsequence() { final FactHandle mary = ksession.insert(mary33Years); final FactHandle elizabeth = ksession.insert(elizabeth35Years); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(3); + assertThat(ksession.fireAllRules()).isEqualTo(3); } private Address producePeopleInCity(final KieSession ksession, final String city, final int countOfPeople) { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/NamedConsequencesTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/NamedConsequencesTest.java index 7c3cfa1cdf3..9248e66ea93 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/NamedConsequencesTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/NamedConsequencesTest.java @@ -15,6 +15,11 @@ package org.drools.mvel.integrationtests; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -22,7 +27,6 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.assertj.core.api.Assertions; import org.drools.mvel.compiler.Cheese; import org.drools.mvel.compiler.Person; import org.drools.mvel.compiler.StockTick; @@ -40,10 +44,6 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; -import static java.util.Arrays.asList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - @RunWith(Parameterized.class) public class NamedConsequencesTest { @@ -512,7 +512,7 @@ public void testEndlessIfWithModify() { " if (results.size() > 10) throw new RuntimeException();\n" + "end\n"; - Assertions.assertThatThrownBy(() -> executeTestWithDRL(str)) + assertThatThrownBy(() -> executeTestWithDRL(str)) .isInstanceOf(RuntimeException.class) .hasMessageContaining("Exception executing consequence for rule \"R1\""); } @@ -607,7 +607,7 @@ public void testEndlessIfElseWithModify() { " if (results.size() > 10) throw new RuntimeException();\n" + "end\n"; - Assertions.assertThatThrownBy(() -> executeTestWithDRL(str)) + assertThatThrownBy(() -> executeTestWithDRL(str)) .isInstanceOf(RuntimeException.class) .hasMessageContaining("Exception executing consequence for rule \"R1\""); } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/PropertySpecificTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/PropertySpecificTest.java index e9ed30b20da..93d34841b93 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/PropertySpecificTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/PropertySpecificTest.java @@ -15,6 +15,15 @@ package org.drools.mvel.integrationtests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.drools.core.reteoo.PropertySpecificUtil.calculateNegativeMask; +import static org.drools.core.reteoo.PropertySpecificUtil.calculatePositiveMask; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; @@ -24,10 +33,8 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.assertj.core.api.Assertions; import org.drools.core.base.ClassObjectType; import org.drools.core.common.InternalWorkingMemory; -import org.drools.core.facttemplates.FactTemplateObjectType; import org.drools.core.impl.RuleBase; import org.drools.core.reteoo.AlphaNode; import org.drools.core.reteoo.BetaNode; @@ -55,15 +62,6 @@ import org.kie.api.definition.type.PropertyReactive; import org.kie.api.runtime.KieSession; -import static org.drools.core.reteoo.PropertySpecificUtil.calculateNegativeMask; -import static org.drools.core.reteoo.PropertySpecificUtil.calculatePositiveMask; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - @RunWith(Parameterized.class) public class PropertySpecificTest { @@ -1397,7 +1395,7 @@ public void testInfiniteLoop() throws Exception { c.setS("test"); ksession.insert( c ); - Assertions.assertThatThrownBy(() -> ksession.fireAllRules()) + assertThatThrownBy(() -> ksession.fireAllRules()) .isInstanceOf(RuntimeException.class) .hasMessageContaining("Exception executing consequence for rule \"R1\""); } @@ -1435,7 +1433,7 @@ public void testClassReactive() throws Exception { factTypeB.set( factB, "on", false ); ksession.insert( factB ); - Assertions.assertThatThrownBy(() -> ksession.fireAllRules()) + assertThatThrownBy(() -> ksession.fireAllRules()) .isInstanceOf(RuntimeException.class) .hasMessageContaining("Exception executing consequence for rule \"R1\""); } @@ -2248,7 +2246,7 @@ public void testBetaWith2RTNSinksExecNoLoop() throws Exception { @Test public void testBetaWith2RTNSinksExecInfiniteLoop() throws Exception { - Assertions.assertThatThrownBy(() -> testBetaWith2RTNSinksExec(true)) + assertThatThrownBy(() -> testBetaWith2RTNSinksExec(true)) .isInstanceOf(RuntimeException.class) .hasMessageContaining("Exception executing consequence for rule \"R1\""); } @@ -2326,7 +2324,7 @@ public void testBetaWith2BetaSinksExecNoLoop() throws Exception { @Test public void testBetaWith2BetaSinksExecInfiniteLoop() throws Exception { - Assertions.assertThatThrownBy(() -> testBetaWith2BetaSinksExec(true)) + assertThatThrownBy(() -> testBetaWith2BetaSinksExec(true)) .isInstanceOf(RuntimeException.class) .hasMessageContaining("Exception executing consequence for rule \"R1\""); } @@ -2671,7 +2669,7 @@ public void testAccLong() { } int cnt = kSession.fireAllRules(); - assertThat(cnt, is(NUM-1)); + assertThat(cnt).isEqualTo(NUM-1); } @Test @@ -2711,6 +2709,6 @@ public void testAccBigDecimal() { } int cnt = kSession.fireAllRules(); - assertThat(cnt, is(NUM-1)); + assertThat(cnt).isEqualTo(NUM-1); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/XSDResourceTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/XSDResourceTest.java index 0e030f981c7..c43891915b1 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/XSDResourceTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/XSDResourceTest.java @@ -15,7 +15,8 @@ */ package org.drools.mvel.integrationtests; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.Test; import org.kie.api.KieBase; import org.kie.api.KieServices; @@ -32,7 +33,7 @@ public void testXSDResourceNotBreakingCompilation() { final KieContainer kcontainer = KieServices.Factory.get().getKieClasspathContainer(); final KieBase kieBase = kcontainer.getKieBase("xsdKieBase"); - Assertions.assertThat(kieBase).as("Created KieBase with XSD should not be null").isNotNull(); + assertThat(kieBase).as("Created KieBase with XSD should not be null").isNotNull(); } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentInsertionsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentInsertionsTest.java index d11080e7b60..eebf69264b9 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentInsertionsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentInsertionsTest.java @@ -16,6 +16,8 @@ package org.drools.mvel.integrationtests.concurrency; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.concurrent.Callable; import java.util.concurrent.CompletionService; import java.util.concurrent.ExecutorCompletionService; @@ -23,7 +25,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; import org.kie.api.KieBase; @@ -72,7 +73,7 @@ protected void testConcurrentInsertions(final String drl, final int objectCount, } } - Assertions.assertThat(successCounter).isEqualTo(threadCount); + assertThat(successCounter).isEqualTo(threadCount); if (ksession != null) { ksession.dispose(); } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentTest.java index 8f8e3cfbe56..bd733748b97 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentTest.java @@ -16,6 +16,8 @@ package org.drools.mvel.integrationtests.concurrency; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -30,7 +32,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; import org.drools.testcoverage.common.util.KieUtil; @@ -127,7 +128,7 @@ private void executeAndAssertTasks(final ExecutorService executor, final List list = new ArrayList<>(); session.setGlobal("list", list); final int rulesFired = session.fireAllRules(); - Assertions.assertThat(list).hasSize(1); - Assertions.assertThat(list.get(0)).isEqualTo(className); - Assertions.assertThat(rulesFired).isEqualTo(1); + assertThat(list).hasSize(1); + assertThat(list.get(0)).isEqualTo(className); + assertThat(rulesFired).isEqualTo(1); return true; } finally { session.dispose(); @@ -218,7 +219,7 @@ public void testNonMatchingFact() throws InterruptedException { } else { session.insert(new BeanA()); } - Assertions.assertThat(session.fireAllRules()).isEqualTo(0); + assertThat(session.fireAllRules()).isEqualTo(0); return true; } finally { session.dispose(); @@ -252,7 +253,7 @@ public void testMatchingFact() throws InterruptedException { } else { session.insert(new BeanB()); } - Assertions.assertThat(session.fireAllRules()).isEqualTo(1); + assertThat(session.fireAllRules()).isEqualTo(1); return true; } finally { session.dispose(); @@ -287,7 +288,7 @@ public void testNot() throws InterruptedException { } else { session.insert(new BeanB()); } - Assertions.assertThat(session.fireAllRules()).isEqualTo(0); + assertThat(session.fireAllRules()).isEqualTo(0); return true; } finally { session.dispose(); @@ -322,7 +323,7 @@ public void testExists() throws InterruptedException { } else { session.insert(new BeanB()); } - Assertions.assertThat(session.fireAllRules()).isEqualTo(1); + assertThat(session.fireAllRules()).isEqualTo(1); return true; } finally { session.dispose(); @@ -365,10 +366,10 @@ public void testSubnetwork() throws InterruptedException { session.insert("test"); if (counter % 2 == 0) { session.insert(new BeanA()); - Assertions.assertThat(session.fireAllRules()).isEqualTo(2); + assertThat(session.fireAllRules()).isEqualTo(2); } else { session.insert(new BeanB()); - Assertions.assertThat(session.fireAllRules()).isEqualTo(1); + assertThat(session.fireAllRules()).isEqualTo(1); } return true; } finally { @@ -405,9 +406,9 @@ public void testAccumulatesMatchOnlyBeanA() throws InterruptedException { try { if (counter % 2 == 0) { session.insert(new BeanA(counter)); - Assertions.assertThat(session.fireAllRules()).isEqualTo(1); + assertThat(session.fireAllRules()).isEqualTo(1); } else { - Assertions.assertThat(session.fireAllRules()).isEqualTo(0); + assertThat(session.fireAllRules()).isEqualTo(0); } return true; } finally { @@ -441,7 +442,7 @@ public void testAccumulatesMatchBoth() throws InterruptedException { try { session.insert(new BeanA()); session.insert(new BeanB()); - Assertions.assertThat(session.fireAllRules()).isEqualTo(2); + assertThat(session.fireAllRules()).isEqualTo(2); return true; } finally { session.dispose(); @@ -477,7 +478,7 @@ public void testAccumulatesMatchOnlyOne() throws InterruptedException { } else { session.insert(new BeanB(counter)); } - Assertions.assertThat(session.fireAllRules()).isEqualTo(1); + assertThat(session.fireAllRules()).isEqualTo(1); return true; } finally { session.dispose(); @@ -514,7 +515,7 @@ public void testNotsMatchOnlyOne() throws InterruptedException { } else { session.insert(new BeanB(counter)); } - Assertions.assertThat(session.fireAllRules()).isEqualTo(1); + assertThat(session.fireAllRules()).isEqualTo(1); return true; } finally { session.dispose(); @@ -549,9 +550,9 @@ public void testNotsMatchBoth() throws InterruptedException { if (counter % 2 == 0) { session.insert(new BeanA(counter)); session.insert(new BeanB(counter)); - Assertions.assertThat(session.fireAllRules()).isEqualTo(0); + assertThat(session.fireAllRules()).isEqualTo(0); } else { - Assertions.assertThat(session.fireAllRules()).isEqualTo(2); + assertThat(session.fireAllRules()).isEqualTo(2); } return true; } finally { @@ -587,9 +588,9 @@ public void testFunctions() throws InterruptedException { final List list = new ArrayList<>(); session.setGlobal("list", list); final int rulesFired = session.fireAllRules(); - Assertions.assertThat(list).hasSize(1); - Assertions.assertThat(list.get(0)).isEqualTo(""+counter); - Assertions.assertThat(rulesFired).isEqualTo(1); + assertThat(list).hasSize(1); + assertThat(list.get(0)).isEqualTo(""+counter); + assertThat(rulesFired).isEqualTo(1); return true; } finally { session.dispose(); @@ -635,10 +636,10 @@ public void testFunctions2() throws InterruptedException { rulesFired += session.fireAllRules(); } - Assertions.assertThat(list).hasSize(objectCount); - Assertions.assertThat(list).contains(identifier); - Assertions.assertThat(list).doesNotContain(otherIdentifier); - Assertions.assertThat(rulesFired).isEqualTo(objectCount); + assertThat(list).hasSize(objectCount); + assertThat(list).contains(identifier); + assertThat(list).doesNotContain(otherIdentifier); + assertThat(rulesFired).isEqualTo(objectCount); return true; } finally { session.dispose(); @@ -670,9 +671,9 @@ public void testQueries() throws InterruptedException { } } final QueryResults results = session.getQueryResults("Query"); - Assertions.assertThat(results).hasSize(1); + assertThat(results).hasSize(1); for (final QueryResultsRow row : results) { - Assertions.assertThat(row.get("bean")).isEqualTo(bean); + assertThat(row.get("bean")).isEqualTo(bean); } return true; } finally { @@ -704,10 +705,10 @@ public void testQueries2() throws InterruptedException { session.insert(new BeanA(seed)); } final QueryResults results = session.getQueryResults("Query"); - Assertions.assertThat(results).hasSize(numberOfObjects); + assertThat(results).hasSize(numberOfObjects); for (final QueryResultsRow row : results) { final BeanA bean = (BeanA) row.get("bean"); - Assertions.assertThat(bean.getSeed()).isEqualTo(seed); + assertThat(bean.getSeed()).isEqualTo(seed); } return true; } finally { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/DataTypeEvaluationConcurrentSessionsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/DataTypeEvaluationConcurrentSessionsTest.java index 7a81bf3c318..4bb64e0e771 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/DataTypeEvaluationConcurrentSessionsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/DataTypeEvaluationConcurrentSessionsTest.java @@ -16,6 +16,8 @@ package org.drools.mvel.integrationtests.concurrency; +import static org.assertj.core.api.Assertions.assertThat; + import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -23,7 +25,6 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.assertj.core.api.Assertions; import org.drools.mvel.integrationtests.facts.AnEnum; import org.drools.mvel.integrationtests.facts.FactWithBigDecimal; import org.drools.mvel.integrationtests.facts.FactWithBoolean; @@ -199,9 +200,9 @@ private void testFactAttributeType(final String ruleConstraint, final Object fac // This is 1 because engine doesn't insert an already existing object twice, so when sharing a session // the object should be present just once in the session. When not sharing a session, there is N separate // sessions, so each one should fire. - Assertions.assertThat(numberOfFirings.get()).isEqualTo(1); + assertThat(numberOfFirings.get()).isEqualTo(1); } else { - Assertions.assertThat(numberOfFirings.get()).isEqualTo(10); + assertThat(numberOfFirings.get()).isEqualTo(10); } } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/MultithreadTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/MultithreadTest.java index 04fe60d3415..c268b9c458e 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/MultithreadTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/MultithreadTest.java @@ -16,6 +16,9 @@ package org.drools.mvel.integrationtests.concurrency; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -30,7 +33,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.assertj.core.api.Assertions; import org.drools.core.impl.RuleBaseFactory; import org.drools.mvel.compiler.StockTick; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; @@ -168,8 +170,8 @@ public void testSlidingTimeWindows() { e.printStackTrace(); } - Assertions.assertThat(errors).isEmpty(); - Assertions.assertThat(success).isTrue(); + assertThat(errors).isEmpty(); + assertThat(success).isTrue(); ksession.dispose(); } @@ -304,7 +306,7 @@ public void testRaceOnAccumulateNodeSimple() throws InterruptedException { } if (t.getError() != null) { - Assertions.fail(t.getError().getMessage()); + fail(t.getError().getMessage()); } } @@ -390,7 +392,7 @@ public void testConcurrencyWithChronThreads() throws InterruptedException { t.join(); if (t.getError() != null) { - Assertions.fail(t.getError().getMessage()); + fail(t.getError().getMessage()); } System.out.println("Final size " + ksession.getObjects().size()); @@ -471,7 +473,7 @@ public void testConcurrentQueries() { } } - Assertions.assertThat(success).isTrue(); + assertThat(success).isTrue(); ksession.dispose(); } finally { executor.shutdownNow(); @@ -598,7 +600,7 @@ public void run() { LOG.info("after: while."); } catch (final java.util.concurrent.RejectedExecutionException e) { e.printStackTrace(); - Assertions.fail("java.util.concurrent.RejectedExecutionException should not happen"); + fail("java.util.concurrent.RejectedExecutionException should not happen"); } LOG.info("last line of test."); } @@ -675,7 +677,7 @@ public void testJittingShortComparison() { } } - Assertions.assertThat(list).hasSize(0); + assertThat(list).hasSize(0); } public static class SessionRunner implements Runnable { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/SharedSessionParallelTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/SharedSessionParallelTest.java index 2d8534dbae4..353f434e498 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/SharedSessionParallelTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/SharedSessionParallelTest.java @@ -16,6 +16,8 @@ package org.drools.mvel.integrationtests.concurrency; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -24,7 +26,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; -import org.assertj.core.api.Assertions; import org.drools.mvel.integrationtests.facts.BeanA; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.TestParametersUtil; @@ -130,9 +131,9 @@ public void testCheckOneThreadOnly() throws InterruptedException { parallelTest(threadCount, exec); kieSession.dispose(); - Assertions.assertThat(list).hasSize(threadCount); + assertThat(list).hasSize(threadCount); for (int i = 0; i < threadCount; i++) { - Assertions.assertThat(list).contains("" + i); + assertThat(list).contains("" + i); } } @@ -190,10 +191,10 @@ public void testCorrectFirings2() throws InterruptedException { parallelTest(threadCount, exec); kieSession.dispose(); - Assertions.assertThat(list).contains("" + 0); - Assertions.assertThat(list).doesNotContain("" + 1); + assertThat(list).contains("" + 0); + assertThat(list).doesNotContain("" + 1); final int expectedListSize = ((threadCount - 1) / 2) + 1; - Assertions.assertThat(list).hasSize(expectedListSize); + assertThat(list).hasSize(expectedListSize); } @Test(timeout = 40000) @@ -364,11 +365,11 @@ public void testLongRunningRule3() throws InterruptedException { final int list2ExpectedSize = threadCount / 2 * objectCount; for (int i = 0; i < threadCount; i++) { if (i % 2 == 1) { - Assertions.assertThat(list2).contains("" + i); + assertThat(list2).contains("" + i); } } - Assertions.assertThat(list).hasSize(listExpectedSize); - Assertions.assertThat(list2).hasSize(list2ExpectedSize); + assertThat(list).hasSize(listExpectedSize); + assertThat(list2).hasSize(list2ExpectedSize); } @Test(timeout = 40000) @@ -408,7 +409,7 @@ public void testCountdownBean() throws InterruptedException { parallelTest(threadCount, exec); kieSession.dispose(); checkList(seed, list); - Assertions.assertThat(bean).hasFieldOrPropertyWithValue("seed", 0); + assertThat(bean).hasFieldOrPropertyWithValue("seed", 0); } @Test(timeout = 40000) @@ -448,7 +449,7 @@ public void testCountdownBean2() throws InterruptedException { checkList(0, seed, list, seed * threadCount); for (final BeanA bean : beans) { - Assertions.assertThat(bean).hasFieldOrPropertyWithValue("seed", 0); + assertThat(bean).hasFieldOrPropertyWithValue("seed", 0); } } @@ -493,9 +494,9 @@ private void checkList(final int start, final int end, final List list) { } private void checkList(final int start, final int end, final List list, final int expectedSize) { - Assertions.assertThat(list).hasSize(expectedSize); + assertThat(list).hasSize(expectedSize); for (int i = start; i < end; i++) { - Assertions.assertThat(list).contains("" + i); + assertThat(list).contains("" + i); } } } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/PhreakLiaNodeTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/PhreakLiaNodeTest.java index b1964da874d..2b9d9ca39c5 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/PhreakLiaNodeTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/PhreakLiaNodeTest.java @@ -15,11 +15,12 @@ package org.drools.mvel.integrationtests.phreak; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.core.common.InternalFactHandle; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; @@ -133,7 +134,7 @@ public void test() { } private void assertFiredRules(List result, String... ruleNames) { - Assertions.assertThat(result).containsExactlyInAnyOrder(ruleNames); + assertThat(result).containsExactlyInAnyOrder(ruleNames); result.clear(); } diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/DeleteTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/DeleteTest.java index 818a5d71feb..7bc0d9321e5 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/DeleteTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/DeleteTest.java @@ -16,11 +16,16 @@ package org.drools.mvel.integrationtests.session; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.core.test.model.Cheese; import org.drools.core.test.model.Person; import org.drools.mvel.compiler.PersonInterface; @@ -43,11 +48,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - @RunWith(Parameterized.class) public class DeleteTest { @@ -86,30 +86,30 @@ public void deleteFactTest() { FactHandle george = ksession.insert(new Person("George", 19)); QueryResults results = ksession.getQueryResults("informationAboutPersons"); - Assertions.assertThat(results).isNotEmpty(); - Assertions.assertThat(results.iterator().next().get("$countOfPerson")).isEqualTo(2L); + assertThat(results).isNotEmpty(); + assertThat(results.iterator().next().get("$countOfPerson")).isEqualTo(2L); ksession.delete(george); results = ksession.getQueryResults("informationAboutPersons"); - Assertions.assertThat(results).isNotEmpty(); - Assertions.assertThat(results.iterator().next().get("$countOfPerson")).isEqualTo(1L); + assertThat(results).isNotEmpty(); + assertThat(results.iterator().next().get("$countOfPerson")).isEqualTo(1L); } @Test public void deleteFactTwiceTest() { FactHandle george = ksession.insert(new Person("George", 19)); QueryResults results = ksession.getQueryResults("countPerson"); - Assertions.assertThat(results).isNotEmpty(); - Assertions.assertThat(results.iterator().next().get("$personCount")).isEqualTo(1L); + assertThat(results).isNotEmpty(); + assertThat(results.iterator().next().get("$personCount")).isEqualTo(1L); ksession.delete(george); results = ksession.getQueryResults("countPerson"); - Assertions.assertThat(results).isNotEmpty(); - Assertions.assertThat(results.iterator().next().get("$personCount")).isEqualTo(0L); + assertThat(results).isNotEmpty(); + assertThat(results.iterator().next().get("$personCount")).isEqualTo(0L); ksession.delete(george); - Assertions.assertThat(results).isNotEmpty(); - Assertions.assertThat(results.iterator().next().get("$personCount")).isEqualTo(0L); + assertThat(results).isNotEmpty(); + assertThat(results.iterator().next().get("$personCount")).isEqualTo(0L); } @Test(expected = IllegalArgumentException.class) @@ -124,30 +124,30 @@ public void deleteUpdatedFactTest() { ksession.update(person, new Person("John", 21)); QueryResults results = ksession.getQueryResults("countPerson"); - Assertions.assertThat(results).isNotEmpty(); - Assertions.assertThat(results.iterator().next().get("$personCount")).isEqualTo(1L); + assertThat(results).isNotEmpty(); + assertThat(results.iterator().next().get("$personCount")).isEqualTo(1L); ksession.delete(person); results = ksession.getQueryResults("countPerson"); - Assertions.assertThat(results).isNotEmpty(); - Assertions.assertThat(results.iterator().next().get("$personCount")).isEqualTo(0L); + assertThat(results).isNotEmpty(); + assertThat(results.iterator().next().get("$personCount")).isEqualTo(0L); } @Test public void deleteUpdatedFactDifferentClassTest() { FactHandle fact = ksession.insert(new Person("George", 18)); - Assertions.assertThat(ksession.getObjects()).hasSize(1); - Assertions.assertThat(ksession.getObjects().iterator().next()).isInstanceOf(Person.class); + assertThat(ksession.getObjects()).hasSize(1); + assertThat(ksession.getObjects().iterator().next()).isInstanceOf(Person.class); ksession.update(fact, new Cheese("Cheddar", 50)); - Assertions.assertThat(ksession.getObjects()).hasSize(1); - Assertions.assertThat(ksession.getObjects().iterator().next()).isInstanceOf(Cheese.class); + assertThat(ksession.getObjects()).hasSize(1); + assertThat(ksession.getObjects().iterator().next()).isInstanceOf(Cheese.class); ksession.delete(fact); - Assertions.assertThat(ksession.getObjects()).isEmpty(); + assertThat(ksession.getObjects()).isEmpty(); } @Test diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/SessionsPoolTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/SessionsPoolTest.java index 752d92abdd9..255422fafa2 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/SessionsPoolTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/SessionsPoolTest.java @@ -16,6 +16,13 @@ package org.drools.mvel.integrationtests.session; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -26,7 +33,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicInteger; -import org.assertj.core.api.Assertions; import org.drools.core.common.EventSupport; import org.drools.core.event.DefaultAgendaEventListener; import org.drools.core.event.DefaultRuleRuntimeEventListener; @@ -56,12 +62,6 @@ import org.kie.internal.event.rule.RuleEventListener; import org.kie.internal.event.rule.RuleEventManager; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - @RunWith(Parameterized.class) public class SessionsPoolTest { @@ -448,9 +448,9 @@ public void testListenersReset() { } ksession = pool.newKieSession(); try { - Assertions.assertThat(ksession.getAgendaEventListeners()).hasSize(0); - Assertions.assertThat(ksession.getRuleRuntimeEventListeners()).hasSize(0); - Assertions.assertThat(((EventSupport) ksession).getRuleEventSupport().getEventListeners()).hasSize(0); + assertThat(ksession.getAgendaEventListeners()).hasSize(0); + assertThat(ksession.getRuleRuntimeEventListeners()).hasSize(0); + assertThat(((EventSupport) ksession).getRuleEventSupport().getEventListeners()).hasSize(0); } finally { ksession.dispose(); } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/KieUtil.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/KieUtil.java index 96ee6400cde..67b45a6752e 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/KieUtil.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/KieUtil.java @@ -16,6 +16,8 @@ package org.drools.testcoverage.common.util; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.StringReader; import java.util.ArrayList; import java.util.HashMap; @@ -23,7 +25,6 @@ import java.util.Map; import java.util.UUID; -import org.assertj.core.api.Assertions; import org.drools.compiler.kie.builder.impl.DrlProject; import org.drools.core.base.ClassObjectType; import org.drools.core.impl.RuleBase; @@ -158,7 +159,7 @@ public static KieBuilder getKieBuilderFromKieFileSystem(final KieBaseTestConfigu } if (failIfBuildError) { - Assertions.assertThat(msgs).as(msgs.toString()).isEmpty(); + assertThat(msgs).as(msgs.toString()).isEmpty(); } return kbuilder; diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/Session.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/Session.java index 9366b5c01eb..f1583ff1b15 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/Session.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/Session.java @@ -16,7 +16,7 @@ package org.drools.testcoverage.common.util; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; import org.kie.api.command.Command; import org.kie.api.event.KieRuntimeEventManager; import org.kie.api.event.process.ProcessEventListener; @@ -92,7 +92,7 @@ public void dispose() { try { s.dispose(); } catch (IllegalStateException ex) { - Assertions.assertThat(ex.getMessage()).isEqualTo("Illegal method call. This session was previously disposed."); + assertThat(ex.getMessage()).isEqualTo("Illegal method call. This session was previously disposed."); } finally { session = null; } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ActivationGroupTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ActivationGroupTest.java index a45a4a68fac..4fdf09680bd 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ActivationGroupTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ActivationGroupTest.java @@ -16,11 +16,12 @@ package org.drools.testcoverage.functional; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.listener.TrackingAgendaEventListener; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; @@ -55,32 +56,32 @@ public static Collection getParameters() { public void basicTestActivationGroup() { TrackingAgendaEventListener listener = prepareKSession("basicActivationGroup"); - Assertions.assertThat(listener.isRuleFired("basic1")).isFalse(); - Assertions.assertThat(listener.isRuleFired("basic2")).isTrue(); - Assertions.assertThat(listener.isRuleFired("basic3")).isFalse(); + assertThat(listener.isRuleFired("basic1")).isFalse(); + assertThat(listener.isRuleFired("basic2")).isTrue(); + assertThat(listener.isRuleFired("basic3")).isFalse(); } @Test public void recursiveTestActivationGroup() { TrackingAgendaEventListener listener = prepareKSession("recursiveActivationGroup"); - Assertions.assertThat(listener.isRuleFired("simplyRecursive1")).isFalse(); - Assertions.assertThat(listener.isRuleFired("simplyRecursive2")).isTrue(); - Assertions.assertThat(listener.isRuleFired("simplyRecursive3")).isTrue(); + assertThat(listener.isRuleFired("simplyRecursive1")).isFalse(); + assertThat(listener.isRuleFired("simplyRecursive2")).isTrue(); + assertThat(listener.isRuleFired("simplyRecursive3")).isTrue(); } @Test public void testActivationGroupWithDefaultSalience() { TrackingAgendaEventListener listener = prepareKSession("defaultSalienceActivationGroup"); - Assertions.assertThat(listener.rulesCount()).isEqualTo(1); + assertThat(listener.rulesCount()).isEqualTo(1); } @Test public void testActivationGroupRecursivelyWithDefaultSalience() { TrackingAgendaEventListener listener = prepareKSession("defaultSalienceWithRecursion"); - Assertions.assertThat(listener.rulesCount()).isEqualTo(2); + assertThat(listener.rulesCount()).isEqualTo(2); } private TrackingAgendaEventListener prepareKSession(String startingRule) { diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DecisionTableTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DecisionTableTest.java index e61fd6174ea..670ddd9143f 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DecisionTableTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DecisionTableTest.java @@ -16,12 +16,14 @@ package org.drools.testcoverage.functional; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.template.parser.DecisionTableParseException; import org.drools.testcoverage.common.listener.OrderListener; import org.drools.testcoverage.common.listener.TrackingAgendaEventListener; @@ -46,8 +48,6 @@ import org.kie.api.runtime.rule.FactHandle; import org.kie.internal.builder.DecisionTableInputType; -import static org.junit.Assert.assertEquals; - /** * Tests all features which can be used in decision tables. */ @@ -164,14 +164,14 @@ private void testSimpleDecisionTable(final Resource decisionTable) { final Person person = new Person("Paul"); person.setId(1); - Assertions.assertThat(person.getName()).isEqualTo("Paul"); - Assertions.assertThat(person.getId()).isEqualTo(1); + assertThat(person.getName()).isEqualTo("Paul"); + assertThat(person.getId()).isEqualTo(1); session.insert(person); session.fireAllRules(); - Assertions.assertThat(person.getName()).isEqualTo("Paul"); - Assertions.assertThat(person.getId()).isEqualTo(2); + assertThat(person.getName()).isEqualTo("Paul"); + assertThat(person.getId()).isEqualTo(2); session.dispose(); } @@ -180,31 +180,31 @@ private void testSimpleDecisionTable(final Resource decisionTable) { public void testMultipleTableXLS() { final KieBase kbase = KieBaseUtil.getKieBaseFromResources(kieBaseTestConfiguration, multipleTablesDecisionTable); - Assertions.assertThat(2).isEqualTo(kbase.getKiePackages().size()); + assertThat(2).isEqualTo(kbase.getKiePackages().size()); final KieSession session = kbase.newKieSession(); // testing person object from the first table final Person person = new Person("Paul"); person.setId(1); - Assertions.assertThat(person.getName()).isEqualTo("Paul"); - Assertions.assertThat(person.getId()).isEqualTo(1); + assertThat(person.getName()).isEqualTo("Paul"); + assertThat(person.getId()).isEqualTo(1); // testing second person, he should be renamed by rules in the second // table final Person person2 = new Person("Helmut von Seireit"); person2.setId(1000); - Assertions.assertThat(person2.getName()).isEqualTo("Helmut von Seireit"); - Assertions.assertThat(person2.getId()).isEqualTo(1000); + assertThat(person2.getName()).isEqualTo("Helmut von Seireit"); + assertThat(person2.getId()).isEqualTo(1000); session.insert(person); session.insert(person2); session.fireAllRules(); - Assertions.assertThat(person.getName()).isEqualTo("Paul"); - Assertions.assertThat(person.getId()).isEqualTo(2); - Assertions.assertThat(person2.getName()).isEqualTo("Wilhelm von Seireit"); - Assertions.assertThat(person2.getId()).isEqualTo(1000); + assertThat(person.getName()).isEqualTo("Paul"); + assertThat(person.getId()).isEqualTo(2); + assertThat(person2.getName()).isEqualTo("Wilhelm von Seireit"); + assertThat(person2.getId()).isEqualTo(1000); session.dispose(); } @@ -217,7 +217,7 @@ public void testMultipleTableXLS() { public void testEvalTable() { final KieBase kbase = KieBaseUtil.getKieBaseFromResources(kieBaseTestConfiguration, evalDecisionTable); - Assertions.assertThat(2).isEqualTo(kbase.getKiePackages().size()); + assertThat(2).isEqualTo(kbase.getKiePackages().size()); KieSession session = kbase.newKieSession(); @@ -230,11 +230,11 @@ public void testEvalTable() { mary.setDummy(1); session.insert(mary); session.fireAllRules(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest1")).isTrue(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest2")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest3")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest4")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("simpleBindingTest")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest1")).isTrue(); + assertThat(rulesFired.isRuleFired("evalTest2")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest3")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest4")).isFalse(); + assertThat(rulesFired.isRuleFired("simpleBindingTest")).isFalse(); session.dispose(); // eval test 2 @@ -250,11 +250,11 @@ public void testEvalTable() { session.insert(inge); session.insert(jochen); session.fireAllRules(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest1")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest2")).isTrue(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest3")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest4")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("simpleBindingTest")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest1")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest2")).isTrue(); + assertThat(rulesFired.isRuleFired("evalTest3")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest4")).isFalse(); + assertThat(rulesFired.isRuleFired("simpleBindingTest")).isFalse(); session.dispose(); // eval test 3, will run four times, there are four combinations @@ -268,11 +268,11 @@ public void testEvalTable() { session.insert(karl); session.insert(egon); session.fireAllRules(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest1")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest2")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest3")).isTrue(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest4")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("simpleBindingTest")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest1")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest2")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest3")).isTrue(); + assertThat(rulesFired.isRuleFired("evalTest4")).isFalse(); + assertThat(rulesFired.isRuleFired("simpleBindingTest")).isFalse(); session.dispose(); // eval test 4 @@ -285,11 +285,11 @@ public void testEvalTable() { gerda.setDummy(-10); session.insert(gerda); session.fireAllRules(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest1")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest2")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest3")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest4")).isTrue(); - Assertions.assertThat(rulesFired.isRuleFired("simpleBindingTest")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest1")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest2")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest3")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest4")).isTrue(); + assertThat(rulesFired.isRuleFired("simpleBindingTest")).isFalse(); session.dispose(); // eval test 5 - simple binding @@ -301,11 +301,11 @@ public void testEvalTable() { final Sample sample = new Sample(); session.insert(sample); session.fireAllRules(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest1")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest2")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest3")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("evalTest4")).isFalse(); - Assertions.assertThat(rulesFired.isRuleFired("simpleBindingTest")).isTrue(); + assertThat(rulesFired.isRuleFired("evalTest1")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest2")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest3")).isFalse(); + assertThat(rulesFired.isRuleFired("evalTest4")).isFalse(); + assertThat(rulesFired.isRuleFired("simpleBindingTest")).isTrue(); session.dispose(); } @@ -331,12 +331,12 @@ public void testAdvancedTable() { session.fireAllRules(); // just 4 rules should fire - Assertions.assertThat(listener.size()).isEqualTo(4); + assertThat(listener.size()).isEqualTo(4); // rules have to be fired in expected order final String[] expected = new String[]{"HelloWorld_11", "namedRule", "b1", "another rule"}; for (int i = 0; i < 4; i++) { - Assertions.assertThat(listener.get(i)).isEqualTo(expected[i]); + assertThat(listener.get(i)).isEqualTo(expected[i]); } session.dispose(); @@ -366,8 +366,8 @@ public void testPushQueryWithFactDeclaration() throws IllegalAccessException, In ksession.insert("push"); ksession.fireAllRules(); - Assertions.assertThat(listener.isRuleFired("testPushQueryRule")).isTrue(); - Assertions.assertThat(listener.isRuleFired("testPullQueryRule")).isFalse(); + assertThat(listener.isRuleFired("testPushQueryRule")).isTrue(); + assertThat(listener.isRuleFired("testPullQueryRule")).isFalse(); listener.clear(); // when location is changed of what Peter likes, push query should fire @@ -384,8 +384,8 @@ public void testPushQueryWithFactDeclaration() throws IllegalAccessException, In ksession.delete(tableHandle); ksession.fireAllRules(); - Assertions.assertThat(listener.isRuleFired("testPushQueryRule")).isTrue(); - Assertions.assertThat(listener.isRuleFired("testPullQueryRule")).isFalse(); + assertThat(listener.isRuleFired("testPushQueryRule")).isTrue(); + assertThat(listener.isRuleFired("testPullQueryRule")).isFalse(); listener.clear(); final Person paul = new Person("Paul"); @@ -393,8 +393,8 @@ public void testPushQueryWithFactDeclaration() throws IllegalAccessException, In ksession.insert(paul); ksession.fireAllRules(); - Assertions.assertThat(listener.isRuleFired("testPushQueryRule")).isTrue(); - Assertions.assertThat(listener.isRuleFired("testPullQueryRule")).isFalse(); + assertThat(listener.isRuleFired("testPushQueryRule")).isTrue(); + assertThat(listener.isRuleFired("testPullQueryRule")).isFalse(); listener.clear(); ksession.dispose(); @@ -424,8 +424,8 @@ public void testPullQueryWithFactDeclaration() throws IllegalAccessException, In ksession.insert("pull"); ksession.fireAllRules(); - Assertions.assertThat(listener.isRuleFired("testPullQueryRule")).isTrue(); - Assertions.assertThat(listener.isRuleFired("testPushQueryRule")).isFalse(); + assertThat(listener.isRuleFired("testPullQueryRule")).isTrue(); + assertThat(listener.isRuleFired("testPushQueryRule")).isFalse(); listener.clear(); // when location is changed of what Peter likes, pull query should @@ -442,8 +442,8 @@ public void testPullQueryWithFactDeclaration() throws IllegalAccessException, In ksession.delete(tableHandle); ksession.fireAllRules(); - Assertions.assertThat(listener.isRuleFired("testPullQueryRule")).isFalse(); - Assertions.assertThat(listener.isRuleFired("testPushQueryRule")).isFalse(); + assertThat(listener.isRuleFired("testPullQueryRule")).isFalse(); + assertThat(listener.isRuleFired("testPushQueryRule")).isFalse(); listener.clear(); final Person paul = new Person("Paul"); @@ -451,8 +451,8 @@ public void testPullQueryWithFactDeclaration() throws IllegalAccessException, In ksession.insert(paul); ksession.fireAllRules(); - Assertions.assertThat(listener.isRuleFired("testPullQueryRule")).isTrue(); - Assertions.assertThat(listener.isRuleFired("testPushQueryRule")).isFalse(); + assertThat(listener.isRuleFired("testPullQueryRule")).isTrue(); + assertThat(listener.isRuleFired("testPushQueryRule")).isFalse(); listener.clear(); ksession.dispose(); @@ -470,10 +470,10 @@ public void testSequential() { ksession.addEventListener(listener); ksession.insert("something"); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).as("Wrong number of rules fired").isEqualTo(3); + assertThat(listener.size()).as("Wrong number of rules fired").isEqualTo(3); final String[] expected = {"Rule1", "Rule2", "Rule3"}; for (int i = 0; i < 3; i++) { - Assertions.assertThat(listener.get(i)).isEqualTo(expected[i]); + assertThat(listener.get(i)).isEqualTo(expected[i]); } ksession.dispose(); } @@ -486,10 +486,10 @@ public void testLockOnActive() { ksession.addEventListener(listener); ksession.insert("lockOnActive"); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(3); + assertThat(listener.size()).isEqualTo(3); final String[] expected = {"a", "a2", "a3"}; for (int i = 0; i < listener.size(); i++) { - Assertions.assertThat(listener.get(i)).isEqualTo(expected[i]); + assertThat(listener.get(i)).isEqualTo(expected[i]); } ksession.dispose(); } @@ -509,7 +509,7 @@ public void testAutoFocus() { // disable, we won't succeed final FactHandle withoutAutoFocus = ksession.insert("withoutAutoFocus"); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(0); + assertThat(listener.size()).isEqualTo(0); // second test - we try to fire rule in agenda group with auto focus // enabled @@ -518,10 +518,10 @@ public void testAutoFocus() { ksession.insert("autoFocus"); ksession.delete(withoutAutoFocus); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(2); + assertThat(listener.size()).isEqualTo(2); final String[] expected = {"b2", "b1"}; for (int i = 0; i < listener.size(); i++) { - Assertions.assertThat(listener.get(i)).isEqualTo(expected[i]); + assertThat(listener.get(i)).isEqualTo(expected[i]); } ksession.dispose(); } @@ -536,9 +536,9 @@ public void testActivationGroup() { // only one rule from activation group may fire ksession.insert("activationGroup"); ksession.fireAllRules(); - Assertions.assertThat(listener.isRuleFired("c1")).isFalse(); - Assertions.assertThat(listener.isRuleFired("c2")).isTrue(); - Assertions.assertThat(listener.isRuleFired("c3")).isFalse(); + assertThat(listener.isRuleFired("c1")).isFalse(); + assertThat(listener.isRuleFired("c2")).isTrue(); + assertThat(listener.isRuleFired("c3")).isFalse(); ksession.dispose(); } @@ -571,12 +571,12 @@ private void testDecisionTableWithDateAttributes(final Resource decisionTable) { names.add(kp.getName()); } - Assertions.assertThat(names.contains(TestConstants.PACKAGE_FUNCTIONAL)).isTrue(); - Assertions.assertThat(names.contains(TestConstants.PACKAGE_TESTCOVERAGE_MODEL)).isTrue(); + assertThat(names.contains(TestConstants.PACKAGE_FUNCTIONAL)).isTrue(); + assertThat(names.contains(TestConstants.PACKAGE_TESTCOVERAGE_MODEL)).isTrue(); final KiePackage kiePackage = (KiePackage) pkgs.toArray()[names.indexOf(TestConstants.PACKAGE_FUNCTIONAL)]; - Assertions.assertThat(kiePackage.getRules().size()).isEqualTo(3); + assertThat(kiePackage.getRules().size()).isEqualTo(3); } public static class InputObject { diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DeclarativeAgendaTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DeclarativeAgendaTest.java index e9f6e789c70..c998816824e 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DeclarativeAgendaTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DeclarativeAgendaTest.java @@ -16,10 +16,11 @@ package org.drools.testcoverage.functional; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.listener.OrderListener; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieUtil; @@ -55,10 +56,10 @@ public void testSimpleActivationBlock() { final FactHandle fireRules = ksession.insert("fireRules"); final FactHandle fireBlockerRule = ksession.insert("fireBlockerRule"); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(2); + assertThat(listener.size()).isEqualTo(2); final String[] expected = { "blocker", "sales2" }; for (int i = 0; i < listener.size(); i++) { - Assertions.assertThat(listener.get(i)).isEqualTo(expected[i]); + assertThat(listener.get(i)).isEqualTo(expected[i]); } // second run - add blocker rule @@ -66,7 +67,7 @@ public void testSimpleActivationBlock() { listener = new OrderListener(); ksession.addEventListener(listener); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(0); + assertThat(listener.size()).isEqualTo(0); // third run ksession.removeEventListener(listener); @@ -74,10 +75,10 @@ public void testSimpleActivationBlock() { ksession.addEventListener(listener); ksession.delete(fireBlockerRule); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(1); + assertThat(listener.size()).isEqualTo(1); final String[] expected3 = { "sales1" }; for (int i = 0; i < listener.size(); i++) { - Assertions.assertThat(listener.get(i)).isEqualTo(expected3[i]); + assertThat(listener.get(i)).isEqualTo(expected3[i]); } // fourth run @@ -85,7 +86,7 @@ public void testSimpleActivationBlock() { listener = new OrderListener(); ksession.addEventListener(listener); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(0); + assertThat(listener.size()).isEqualTo(0); // fifth run ksession.removeEventListener(listener); @@ -93,10 +94,10 @@ public void testSimpleActivationBlock() { ksession.addEventListener(listener); ksession.update(fireRules, "fireRules"); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(2); + assertThat(listener.size()).isEqualTo(2); final String[] expected5 = { "sales1", "sales2" }; for (int i = 0; i < listener.size(); i++) { - Assertions.assertThat(listener.get(i)).isEqualTo(expected5[i]); + assertThat(listener.get(i)).isEqualTo(expected5[i]); } ksession.dispose(); @@ -117,10 +118,10 @@ public void testActivationBlock() { ksession.insert("fireRules"); final FactHandle fireBlockerRule = ksession.insert("fireBlockerRule"); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(6); + assertThat(listener.size()).isEqualTo(6); final String[] expected = { "startAgenda", "catering1", "sales1", "salesBlocker", "catering2", "salesBlocker" }; for (int i = 0; i < listener.size(); i++) { - Assertions.assertThat(listener.get(i)).isEqualTo(expected[i]); + assertThat(listener.get(i)).isEqualTo(expected[i]); } // second run @@ -130,11 +131,11 @@ public void testActivationBlock() { ksession.addEventListener(listener); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(1); // BZ 1038076 + assertThat(listener.size()).isEqualTo(1); // BZ 1038076 final String[] expected2 = { "sales2" }; for (int i = 0; i < listener.size(); i++) { - Assertions.assertThat(listener.get(i)).isEqualTo(expected2[i]); + assertThat(listener.get(i)).isEqualTo(expected2[i]); } ksession.dispose(); @@ -152,17 +153,17 @@ public void testActivationCount() { // first run final FactHandle go1 = ksession.insert("go1"); ksession.fireAllRules(); - Assertions.assertThat(list.size()).isEqualTo(3); + assertThat(list.size()).isEqualTo(3); // second run list.clear(); ksession.delete(go1); ksession.fireAllRules(); - Assertions.assertThat(list).isEmpty(); + assertThat(list).isEmpty(); ksession.insert("go1"); ksession.insert("go2"); ksession.fireAllRules(); - Assertions.assertThat(list.size()).isEqualTo(2); + assertThat(list.size()).isEqualTo(2); ksession.dispose(); } @@ -180,20 +181,20 @@ public void testUnblockAll() { ksession.insert("fireRules"); ksession.insert("fireBlockerRule"); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(2); + assertThat(listener.size()).isEqualTo(2); final String[] expected = { "salesBlocker", "salesBlocker" }; for (int i = 0; i < listener.size(); i++) { - Assertions.assertThat(listener.get(i)).isEqualTo(expected[i]); + assertThat(listener.get(i)).isEqualTo(expected[i]); } // second run ksession.insert("fireUnblockerRule"); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(8); + assertThat(listener.size()).isEqualTo(8); final String[] expected2 = { "salesBlocker", "salesBlocker", "salesUnblocker", "sales1", "salesBlocker", "salesUnblocker", "sales2", "salesBlocker" }; for (int i = 0; i < listener.size(); i++) { - Assertions.assertThat(listener.get(i)).isEqualTo(expected2[i]); + assertThat(listener.get(i)).isEqualTo(expected2[i]); } ksession.dispose(); @@ -212,10 +213,10 @@ public void testSimpleCancel() { ksession.insert("fireRules"); ksession.insert("fireCancelRule"); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(2); + assertThat(listener.size()).isEqualTo(2); final String[] expected = { "salesCancel", "sales2" }; for (int i = 0; i < listener.size(); i++) { - Assertions.assertThat(listener.get(i)).isEqualTo(expected[i]); + assertThat(listener.get(i)).isEqualTo(expected[i]); } ksession.dispose(); @@ -240,10 +241,10 @@ public void testCancelWithUpdatingFacts() { final FactHandle fireCancelRule = ksession.insert("fireCancelRule"); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(2); + assertThat(listener.size()).isEqualTo(2); final String[] expected = { "salesCancel", "sales2" }; for (int i = 0; i < listener.size(); i++) { - Assertions.assertThat(listener.get(i)).isEqualTo(expected[i]); + assertThat(listener.get(i)).isEqualTo(expected[i]); } // second run @@ -255,10 +256,10 @@ public void testCancelWithUpdatingFacts() { ksession.update(fireRules, "fireRules"); ksession.fireAllRules(); - Assertions.assertThat(listener.size()).isEqualTo(2); + assertThat(listener.size()).isEqualTo(2); final String[] expected2 = { "salesCancel", "sales2" }; for (int i = 0; i < listener.size(); i++) { - Assertions.assertThat(listener.get(i)).isEqualTo(expected2[i]); + assertThat(listener.get(i)).isEqualTo(expected2[i]); } ksession.dispose(); diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DuplicityTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DuplicityTest.java index 2d0c47a3d6f..af22d9402fb 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DuplicityTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DuplicityTest.java @@ -16,10 +16,11 @@ package org.drools.testcoverage.functional; +import static org.assertj.core.api.Assertions.fail; + import java.util.Collection; -import org.assertj.core.api.Assertions; + import org.drools.testcoverage.common.util.KieBaseTestConfiguration; -import org.drools.testcoverage.common.util.KieBaseUtil; import org.drools.testcoverage.common.util.KieUtil; import org.drools.testcoverage.common.util.TestParametersUtil; import org.junit.Test; @@ -53,7 +54,7 @@ public void testTwoRulesWithSameNameInOneFile() { final Resource resource = KieServices.Factory.get().getResources().newClassPathResource("rule-name.drl", getClass()); KieUtil.getKieBuilderFromResources(kieBaseTestConfiguration, true, resource); - Assertions.fail("Builder should have had errors, two rules of the same name are not allowed in one file together!"); + fail("Builder should have had errors, two rules of the same name are not allowed in one file together!"); } catch (AssertionError e) { // expected LoggerFactory.getLogger(getClass()).info("", e); diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/FactHandleTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/FactHandleTest.java index ddc05fc196e..de1737d136c 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/FactHandleTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/FactHandleTest.java @@ -15,11 +15,12 @@ package org.drools.testcoverage.functional; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.core.common.InternalFactHandle; import org.drools.core.event.DefaultRuleRuntimeEventListener; import org.drools.testcoverage.common.model.Cheese; @@ -81,7 +82,7 @@ public void testFactHandleSequence() throws Exception { kieSession.fireAllRules(); - Assertions.assertThat(factHandleIDs).containsExactly(1L, 2L, 1L); + assertThat(factHandleIDs).containsExactly(1L, 2L, 1L); } private DefaultRuleRuntimeEventListener createCollectEventListener(List factHandleIDs) { diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerDefaultsTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerDefaultsTest.java index 2127788ec67..e247b964b97 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerDefaultsTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerDefaultsTest.java @@ -16,9 +16,11 @@ package org.drools.testcoverage.functional; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import java.io.IOException; -import org.assertj.core.api.Assertions; import org.drools.core.impl.InternalKieContainer; import org.drools.testcoverage.common.util.TestConstants; import org.junit.Before; @@ -70,8 +72,8 @@ public void testTwoKieBasesOneDefault() { final KieBase firstKBase = kieContainer.getKieBase("firstKBase"); final KieBase secondKBase = kieContainer.getKieBase("secondKBase"); - Assertions.assertThat(kieContainer.getKieBase()).isEqualTo(firstKBase); - Assertions.assertThat(kieContainer.getKieBase()).isNotEqualTo(secondKBase); + assertThat(kieContainer.getKieBase()).isEqualTo(firstKBase); + assertThat(kieContainer.getKieBase()).isNotEqualTo(secondKBase); } /** @@ -87,7 +89,7 @@ public void testTwoKieBasesNoneDefault() { final KieContainer kieContainer = kieServices.newKieContainer(RELEASE_ID); - Assertions.assertThatThrownBy(() -> kieContainer.getKieBase()) + assertThatThrownBy(() -> kieContainer.getKieBase()) .isInstanceOf(RuntimeException.class) .hasMessageContaining("Cannot find a default KieBase"); } @@ -109,8 +111,8 @@ public void testTwoKieSessionsOneDefault() { final KieSession secondKSession = kieContainer.newKieSession("secondKSession"); try { - Assertions.assertThat(firstKSession).isEqualTo(((InternalKieContainer) kieContainer).getKieSession()); - Assertions.assertThat(secondKSession).isNotEqualTo(((InternalKieContainer) kieContainer).getKieSession()); + assertThat(firstKSession).isEqualTo(((InternalKieContainer) kieContainer).getKieSession()); + assertThat(secondKSession).isNotEqualTo(((InternalKieContainer) kieContainer).getKieSession()); } finally { firstKSession.dispose(); secondKSession.dispose(); @@ -130,7 +132,7 @@ public void testTwoKieSessionsBothDefault() { final KieContainer kieContainer = kieServices.newKieContainer(RELEASE_ID); - Assertions.assertThatThrownBy(() -> kieContainer.newKieSession()) + assertThatThrownBy(() -> kieContainer.newKieSession()) .isInstanceOf(RuntimeException.class) .hasMessageContaining("Cannot find a default KieSession"); } @@ -148,7 +150,7 @@ public void testTwoKieSessionsNoneDefault() { final KieContainer kieContainer = kieServices.newKieContainer(RELEASE_ID); - Assertions.assertThatThrownBy(() -> kieContainer.newKieSession()) + assertThatThrownBy(() -> kieContainer.newKieSession()) .isInstanceOf(RuntimeException.class) .hasMessageContaining("Cannot find a default KieSession"); } @@ -166,7 +168,7 @@ public void testTwoKieSessionsDefaultNotSet() { final KieContainer kieContainer = kieServices.newKieContainer(RELEASE_ID); - Assertions.assertThatThrownBy(() -> kieContainer.newKieSession()) + assertThatThrownBy(() -> kieContainer.newKieSession()) .isInstanceOf(RuntimeException.class) .hasMessageContaining("Cannot find a default KieSession"); } @@ -188,8 +190,8 @@ public void testTwoKieSessionsOneStatelessDefault() { final KieSession secondKSession = kieContainer.newKieSession("secondKSession"); try { - Assertions.assertThat(firstKSession).isEqualTo(((InternalKieContainer) kieContainer).getStatelessKieSession()); - Assertions.assertThat(secondKSession).isNotEqualTo(((InternalKieContainer) kieContainer).getStatelessKieSession()); + assertThat(firstKSession).isEqualTo(((InternalKieContainer) kieContainer).getStatelessKieSession()); + assertThat(secondKSession).isNotEqualTo(((InternalKieContainer) kieContainer).getStatelessKieSession()); } finally { secondKSession.dispose(); } @@ -211,8 +213,8 @@ public void testTwoStatelessKieSessionsOneDefault() { final StatelessKieSession firstKSession = kieContainer.newStatelessKieSession("firstKSession"); final StatelessKieSession secondKSession = kieContainer.newStatelessKieSession("secondKSession"); - Assertions.assertThat(firstKSession).isEqualTo(((InternalKieContainer) kieContainer).getStatelessKieSession()); - Assertions.assertThat(secondKSession).isNotEqualTo(((InternalKieContainer) kieContainer).getStatelessKieSession()); + assertThat(firstKSession).isEqualTo(((InternalKieContainer) kieContainer).getStatelessKieSession()); + assertThat(secondKSession).isNotEqualTo(((InternalKieContainer) kieContainer).getStatelessKieSession()); } /** @@ -228,7 +230,7 @@ public void testTwoStatelessKieSessionsBothDefault() { final KieContainer kieContainer = kieServices.newKieContainer(RELEASE_ID); - Assertions.assertThatThrownBy(() -> kieContainer.newStatelessKieSession()) + assertThatThrownBy(() -> kieContainer.newStatelessKieSession()) .isInstanceOf(RuntimeException.class) .hasMessageContaining("Cannot find a default StatelessKieSession"); } @@ -246,7 +248,7 @@ public void testTwoStatelessKieSessionsNoneDefault() { final KieContainer kieContainer = kieServices.newKieContainer(RELEASE_ID); - Assertions.assertThatThrownBy(() -> kieContainer.newStatelessKieSession()) + assertThatThrownBy(() -> kieContainer.newStatelessKieSession()) .isInstanceOf(RuntimeException.class) .hasMessageContaining("Cannot find a default StatelessKieSession"); } @@ -264,7 +266,7 @@ public void testTwoStatelessKieSessionsDefaultNotSet() { final KieContainer kieContainer = kieServices.newKieContainer(RELEASE_ID); - Assertions.assertThatThrownBy(() -> kieContainer.newStatelessKieSession()) + assertThatThrownBy(() -> kieContainer.newStatelessKieSession()) .isInstanceOf(RuntimeException.class) .hasMessageContaining("Cannot find a default StatelessKieSession"); } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerTest.java index 56b3c8e7074..281213c1f49 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerTest.java @@ -17,10 +17,12 @@ package org.drools.testcoverage.functional; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + import java.io.File; import java.io.IOException; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.util.TestConstants; import org.junit.Before; import org.junit.Test; @@ -74,7 +76,7 @@ public void testNotDisposingAnotherKieSession() { // session should not already be disposed firstKSession.fireAllRules(); } catch (IllegalStateException e) { - Assertions.fail("KieSession should not have been already disposed.", e); + fail("KieSession should not have been already disposed.", e); } finally { firstKSession.dispose(); secondKSession.dispose(); @@ -102,7 +104,7 @@ public void testFileSystemResourceBuilding() { KieContainer kieContainer = kieServices.newKieContainer(kieBuilder.getKieModule().getReleaseId()); KieBaseConfiguration kieBaseConfiguration = kieServices.newKieBaseConfiguration(); KieBase kieBase = kieContainer.newKieBase(kieBaseConfiguration); - Assertions.assertThat(kieBase.getKiePackages()).isNotEmpty(); + assertThat(kieBase.getKiePackages()).isNotEmpty(); } /** diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieRepositoryTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieRepositoryTest.java index f3c4b5aea0e..258c9a9af07 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieRepositoryTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieRepositoryTest.java @@ -16,7 +16,10 @@ package org.drools.testcoverage.functional; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + +import java.io.IOException; + import org.drools.testcoverage.common.util.TestConstants; import org.junit.Before; import org.junit.Test; @@ -27,8 +30,6 @@ import org.kie.api.builder.ReleaseId; import org.kie.api.builder.model.KieModuleModel; -import java.io.IOException; - /** * Tests correct behavior of KieRepository, such as adding/removing KieModules. */ @@ -71,7 +72,7 @@ private void testKieModuleAddition(final ReleaseId releaseId) { final KieRepository kieRepository = kieServices.getRepository(); this.createKieModule(releaseId); - Assertions.assertThat(kieRepository.getKieModule(releaseId)).as("KieModule should be in KieRepository").isNotNull(); + assertThat(kieRepository.getKieModule(releaseId)).as("KieModule should be in KieRepository").isNotNull(); } /** @@ -98,11 +99,11 @@ private void testKieModuleRemoval(final ReleaseId releaseId) { final KieRepository kieRepository = kieServices.getRepository(); this.createKieModule(releaseId); - Assertions.assertThat(kieRepository.getKieModule(releaseId)).as("KieModule should be in KieRepository").isNotNull(); + assertThat(kieRepository.getKieModule(releaseId)).as("KieModule should be in KieRepository").isNotNull(); kieRepository.removeKieModule(releaseId); - Assertions.assertThat(kieRepository.getKieModule(releaseId)).as("KieModule should NOT be in KieRepository").isNull(); + assertThat(kieRepository.getKieModule(releaseId)).as("KieModule should NOT be in KieRepository").isNull(); } /** diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LiveQueriesBadResultTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LiveQueriesBadResultTest.java index 217cb657538..49785e036c8 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LiveQueriesBadResultTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LiveQueriesBadResultTest.java @@ -16,10 +16,11 @@ package org.drools.testcoverage.functional; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import java.util.ArrayList; import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.model.Person; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; @@ -117,7 +118,7 @@ public void rowDeleted(Row row) { ksession.insert(new Person("Petr", 25)); - Assertions.assertThatThrownBy(() -> ksession.openLiveQuery("simple query with no parameters", new Object[]{}, listener)) + assertThatThrownBy(() -> ksession.openLiveQuery("simple query with no parameters", new Object[]{}, listener)) .isInstanceOf(RuntimeException.class) .hasMessage("The identifier 'bad' does not exist as a bound variable for this query"); } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LogicalInsertFromCollectionTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LogicalInsertFromCollectionTest.java index 8952f095111..221228f145d 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LogicalInsertFromCollectionTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LogicalInsertFromCollectionTest.java @@ -16,12 +16,16 @@ package org.drools.testcoverage.functional; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.model.SimplePerson; -import org.drools.testcoverage.common.util.*; +import org.drools.testcoverage.common.util.KieBaseTestConfiguration; +import org.drools.testcoverage.common.util.KieBaseUtil; +import org.drools.testcoverage.common.util.TestConstants; +import org.drools.testcoverage.common.util.TestParametersUtil; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -66,13 +70,13 @@ public void testRemoveElement() { for (int i = 5; i > 1; i--) { // before remove 5,4,3,2,1 facts - Assertions.assertThat(ksession.getFactCount()).isEqualTo((long) i); + assertThat(ksession.getFactCount()).isEqualTo((long) i); collection.remove(collection.iterator().next()); ksession.update(handle, collection); ksession.fireAllRules(); // after removing 4,3,2,1,0 facts - Assertions.assertThat(ksession.getFactCount()).isEqualTo((long) (i - 1)); + assertThat(ksession.getFactCount()).isEqualTo((long) (i - 1)); } } @@ -91,14 +95,14 @@ public void testAddElement() { ksession.fireAllRules(); // before adding 5 facts - Assertions.assertThat(ksession.getFactCount()).isEqualTo((long) 5); + assertThat(ksession.getFactCount()).isEqualTo((long) 5); collection.add(42); ksession.update(handle, collection); ksession.fireAllRules(); // after adding should be 6 facts - Assertions.assertThat(ksession.getFactCount()).isEqualTo((long) 6); + assertThat(ksession.getFactCount()).isEqualTo((long) 6); } @Test @@ -115,20 +119,20 @@ public void testChangeElement() { ksession.fireAllRules(); // before change - expecting 5 facts - Assertions.assertThat(ksession.getFactCount()).isEqualTo((long) 5); + assertThat(ksession.getFactCount()).isEqualTo((long) 5); collection.iterator().next().setAge(80); ksession.update(handle, collection); ksession.fireAllRules(); // after change - expecting 4 facts - Assertions.assertThat(ksession.getFactCount()).isEqualTo((long) 4); + assertThat(ksession.getFactCount()).isEqualTo((long) 4); collection.iterator().next().setAge(30); ksession.update(handle, collection); ksession.fireAllRules(); - Assertions.assertThat(ksession.getFactCount()).isEqualTo((long) 5); + assertThat(ksession.getFactCount()).isEqualTo((long) 5); } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/QueryBadResultTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/QueryBadResultTest.java index 92cf47e7e11..6023517d6c1 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/QueryBadResultTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/QueryBadResultTest.java @@ -16,9 +16,12 @@ package org.drools.testcoverage.functional; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.model.Person; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; @@ -33,9 +36,6 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.QueryResults; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - /** * Tests bad using and accessing to queries. */ @@ -57,7 +57,7 @@ public static Collection getParameters() { public void testQueriesWithSameNameInOneFile() { final KieBuilder kieBuilder = KieUtil.getKieBuilderFromClasspathResources(kieBaseTestConfiguration, getClass(), false, "query-two-same-names.drl"); - Assertions.assertThat(kieBuilder.getResults().getMessages(Level.ERROR).isEmpty()).isFalse(); + assertThat(kieBuilder.getResults().getMessages(Level.ERROR).isEmpty()).isFalse(); } @Test @@ -70,14 +70,14 @@ public void testQueriesWithSameNameInTwoFiles() { "query-same-name-1.drl", "query-same-name-2.drl"); - Assertions.assertThat(kieBuilder.getResults().getMessages(Level.ERROR).isEmpty()).isFalse(); + assertThat(kieBuilder.getResults().getMessages(Level.ERROR).isEmpty()).isFalse(); } @Test public void testQueryWithoutName() { final KieBuilder kieBuilder = KieUtil.getKieBuilderFromClasspathResources(kieBaseTestConfiguration, getClass(), false, "query-without-name.drl"); - Assertions.assertThat(kieBuilder.getResults().getMessages(Level.ERROR).isEmpty()).isFalse(); + assertThat(kieBuilder.getResults().getMessages(Level.ERROR).isEmpty()).isFalse(); } @Test diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ResourcesTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ResourcesTest.java index 083e4048b98..8dad7ae1926 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ResourcesTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ResourcesTest.java @@ -16,8 +16,11 @@ package org.drools.testcoverage.functional; +import static org.assertj.core.api.Assertions.assertThat; + +import java.io.StringReader; import java.util.Collection; -import org.assertj.core.api.Assertions; + import org.drools.decisiontable.ExternalSpreadsheetCompiler; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; @@ -34,8 +37,6 @@ import org.kie.api.io.ResourceType; import org.kie.internal.builder.DecisionTableInputType; -import java.io.StringReader; - /** * Tests loading of different types of resources (DRL, DSL, DRF, BPMN2, DTABLE). * Packages are loaded and built using KnowledgeBuilder. @@ -61,7 +62,7 @@ public void testDRL() { // since 6.2.x java.lang is also returned as a package if(!kieBaseTestConfiguration.getExecutableModelProjectClass().isPresent()) { - Assertions.assertThat((long) kbase.getKiePackages().size()).as("Unexpected number of KiePackages").isEqualTo((long) 3); + assertThat((long) kbase.getKiePackages().size()).as("Unexpected number of KiePackages").isEqualTo((long) 3); } verifyPackageWithRules(kbase, TestConstants.PACKAGE_FUNCTIONAL, 4); verifyPackageWithImports(kbase, TestConstants.PACKAGE_TESTCOVERAGE_MODEL); @@ -73,7 +74,7 @@ public void testDSL() { final KieBase kbase = KieBaseUtil.getKieBaseFromClasspathResources(getClass(), kieBaseTestConfiguration, "sample.dsl", "sample.dslr"); - Assertions.assertThat((long) kbase.getKiePackages().size()).as("Unexpected number of KiePackages").isEqualTo((long) 1); + assertThat((long) kbase.getKiePackages().size()).as("Unexpected number of KiePackages").isEqualTo((long) 1); verifyPackageWithRules(kbase, TestConstants.PACKAGE_FUNCTIONAL, 1); } @@ -82,7 +83,7 @@ public void testXLS() { final KieBase kbase = KieBaseUtil.getKieBaseFromClasspathResources(getClass(), kieBaseTestConfiguration, "sample.drl.xls"); - Assertions.assertThat((long) kbase.getKiePackages().size()).as("Unexpected number of packages in kbase").isEqualTo((long) 2); + assertThat((long) kbase.getKiePackages().size()).as("Unexpected number of packages in kbase").isEqualTo((long) 2); verifyPackageWithRules(kbase, TestConstants.PACKAGE_FUNCTIONAL, 3); verifyPackageWithImports(kbase, TestConstants.PACKAGE_TESTCOVERAGE_MODEL); @@ -94,7 +95,7 @@ public void testCSV() { ResourceUtil.getDecisionTableResourceFromClasspath("sample.drl.csv", getClass(), DecisionTableInputType.CSV); final KieBase kbase = KieBaseUtil.getKieBaseFromResources(kieBaseTestConfiguration, decisionTable); - Assertions.assertThat((long) kbase.getKiePackages().size()).as("Unexpected number of packages in kbase").isEqualTo((long) 2); + assertThat((long) kbase.getKiePackages().size()).as("Unexpected number of packages in kbase").isEqualTo((long) 2); verifyPackageWithRules(kbase, TestConstants.PACKAGE_FUNCTIONAL, 3); verifyPackageWithImports(kbase, TestConstants.PACKAGE_TESTCOVERAGE_MODEL); @@ -115,7 +116,7 @@ public void testRuleTemplate() { final KieBase kbase = KieBaseUtil.getKieBaseFromResources(kieBaseTestConfiguration, res); - Assertions.assertThat((long) kbase.getKiePackages().size()).as("Unexpected number of packages in kbase").isEqualTo((long) 2); + assertThat((long) kbase.getKiePackages().size()).as("Unexpected number of packages in kbase").isEqualTo((long) 2); verifyPackageWithRules(kbase, TestConstants.PACKAGE_FUNCTIONAL, 2); verifyPackageWithImports(kbase, TestConstants.PACKAGE_TESTCOVERAGE_MODEL); @@ -142,17 +143,17 @@ private void verifyPackageWithRules(final KieBase kbase, final String packageNam final KiePackage pack = kbase.getKiePackage(packageName); - Assertions.assertThat(pack).as("KiePackage with given name not found in KieBase").isNotNull(); - Assertions.assertThat(pack.getName()).as("Unexpected package name").isEqualTo(packageName); - Assertions.assertThat((long) pack.getRules().size()).as("Unexpected number of rules").isEqualTo((long) expectedRules); + assertThat(pack).as("KiePackage with given name not found in KieBase").isNotNull(); + assertThat(pack.getName()).as("Unexpected package name").isEqualTo(packageName); + assertThat((long) pack.getRules().size()).as("Unexpected number of rules").isEqualTo((long) expectedRules); } private void verifyPackageWithImports(final KieBase kbase, final String packageName) { final KiePackage pack = kbase.getKiePackage(packageName); - Assertions.assertThat(pack).as("KiePackage with given name not found in KieBase").isNotNull(); - Assertions.assertThat(pack.getName()).as("Unexpected package name").isEqualTo(packageName); - Assertions.assertThat((long) pack.getRules().size()).as("Package with import should contain no rules").isEqualTo((long) 0); + assertThat(pack).as("KiePackage with given name not found in KieBase").isNotNull(); + assertThat(pack.getName()).as("Unexpected package name").isEqualTo(packageName); + assertThat((long) pack.getRules().size()).as("Package with import should contain no rules").isEqualTo((long) 0); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/RuleTemplateTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/RuleTemplateTest.java index 166ffac20cd..aba44c2fec0 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/RuleTemplateTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/RuleTemplateTest.java @@ -16,13 +16,14 @@ package org.drools.testcoverage.functional; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.decisiontable.ExternalSpreadsheetCompiler; import org.drools.testcoverage.common.model.Cheese; import org.drools.testcoverage.common.model.Person; @@ -82,7 +83,7 @@ public void testSampleCheese() { final KieBase kbase = KieBaseUtil.getKieBaseFromResources(kieBaseTestConfiguration, drlResource); final Collection pkgs = kbase.getKiePackages(); - Assertions.assertThat(pkgs.size()).isEqualTo(2); + assertThat(pkgs.size()).isEqualTo(2); final ArrayList names = new ArrayList(); @@ -90,12 +91,12 @@ public void testSampleCheese() { names.add(kp.getName()); } - Assertions.assertThat(names.contains(TestConstants.PACKAGE_FUNCTIONAL)).isTrue(); - Assertions.assertThat(names.contains(TestConstants.PACKAGE_TESTCOVERAGE_MODEL)).isTrue(); + assertThat(names.contains(TestConstants.PACKAGE_FUNCTIONAL)).isTrue(); + assertThat(names.contains(TestConstants.PACKAGE_TESTCOVERAGE_MODEL)).isTrue(); final KiePackage kiePackage = (KiePackage) pkgs.toArray()[names.indexOf(TestConstants.PACKAGE_FUNCTIONAL)]; - Assertions.assertThat(kiePackage.getRules().size()).isEqualTo(2); + assertThat(kiePackage.getRules().size()).isEqualTo(2); final KieSession ksession = kbase.newKieSession(); diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/TemplatesTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/TemplatesTest.java index 370c9932816..eace575e4a6 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/TemplatesTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/TemplatesTest.java @@ -16,6 +16,8 @@ package org.drools.testcoverage.functional; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.IOException; import java.io.InputStream; import java.io.StringReader; @@ -26,7 +28,6 @@ import java.util.List; import java.util.Map; -import org.assertj.core.api.Assertions; import org.drools.decisiontable.ExternalSpreadsheetCompiler; import org.drools.template.DataProviderCompiler; import org.drools.template.ObjectDataCompiler; @@ -265,14 +266,14 @@ private void testCorrectnessCheck(final String drl) { } // check of size of satisfying items - Assertions.assertThat(list.size()).isEqualTo(4); + assertThat(list.size()).isEqualTo(4); final Collection pkgs = kbase.getKiePackages(); - Assertions.assertThat(pkgs.size()).isEqualTo(1); + assertThat(pkgs.size()).isEqualTo(1); final KiePackage pkg = pkgs.iterator().next(); // check of generated rules size from template - Assertions.assertThat(pkg.getRules().size()).isEqualTo(3); + assertThat(pkg.getRules().size()).isEqualTo(3); } private void testManyRows(final String drl, final int expectedResultListSize, final int expectedRulesCount) { @@ -296,14 +297,14 @@ private void testManyRows(final String drl, final int expectedResultListSize, fi } // check of size of satisfying items - Assertions.assertThat(list.size()).isEqualTo(expectedResultListSize); + assertThat(list.size()).isEqualTo(expectedResultListSize); final Collection pkgs = kbase.getKiePackages(); - Assertions.assertThat(pkgs.size()).isEqualTo(1); + assertThat(pkgs.size()).isEqualTo(1); final KiePackage pkg = pkgs.iterator().next(); // check of generated rules size from template - Assertions.assertThat(pkg.getRules().size()).isEqualTo(expectedRulesCount); + assertThat(pkg.getRules().size()).isEqualTo(expectedRulesCount); } private void testManyRules(final String drl, final int expectedRulesCount) { @@ -312,11 +313,11 @@ private void testManyRules(final String drl, final int expectedRulesCount) { final KieBase kbase = KieBaseUtil.getKieBaseFromResources(kieBaseTestConfiguration, drlResource); Collection pkgs = kbase.getKiePackages(); - Assertions.assertThat(pkgs.size()).isEqualTo(1); + assertThat(pkgs.size()).isEqualTo(1); KiePackage pkg = pkgs.iterator().next(); // check of generated rules size from template - Assertions.assertThat(pkg.getRules().size()).isEqualTo(expectedRulesCount); + assertThat(pkg.getRules().size()).isEqualTo(expectedRulesCount); } private Collection> getMapsParam() { @@ -464,6 +465,6 @@ public enum Taste { } private static void assertEqualsIgnoreWhitespace(final String expected, final String actual) { - Assertions.assertThat(expected).isEqualToIgnoringWhitespace(actual); + assertThat(expected).isEqualToIgnoringWhitespace(actual); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/UnicodeTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/UnicodeTest.java index 437e0b0c806..4c7f25a435a 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/UnicodeTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/UnicodeTest.java @@ -16,8 +16,14 @@ package org.drools.testcoverage.functional; +import static org.assertj.core.api.Assertions.assertThat; + +import java.io.FileNotFoundException; +import java.util.ArrayList; import java.util.Collection; -import org.assertj.core.api.Assertions; +import java.util.List; +import java.util.Map; + import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; import org.drools.testcoverage.common.util.ResourceUtil; @@ -40,11 +46,6 @@ import org.kie.internal.builder.DecisionTableInputType; import org.kie.internal.utils.KieHelper; -import java.io.FileNotFoundException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - /** * Tests Drools engine capabilities regarding Unicode characters * @@ -86,9 +87,9 @@ public void testJapanese() { commands.add(kieServices.getCommands().newFireAllRules("firedRulesCount")); final ExecutionResults results = ksession.execute(kieServices.getCommands().newBatchExecution(commands, null)); - Assertions.assertThat(results.getValue("firedRulesCount")).isEqualTo(2); - Assertions.assertThat(一覧.size()).isEqualTo(1); - Assertions.assertThat(一覧.iterator().next().getの名前()).isEqualTo("横綱"); + assertThat(results.getValue("firedRulesCount")).isEqualTo(2); + assertThat(一覧.size()).isEqualTo(1); + assertThat(一覧.iterator().next().getの名前()).isEqualTo("横綱"); } @Test @@ -108,15 +109,15 @@ public void testCzech() { commands.add(kieServices.getCommands().newFireAllRules()); ksession.execute(kieServices.getCommands().newBatchExecution(commands, null)); - Assertions.assertThat(kbase.getRule(TestConstants.PACKAGE_FUNCTIONAL, "příliš žluťoučký kůň úpěl ďábelské ódy")).isNotNull(); + assertThat(kbase.getRule(TestConstants.PACKAGE_FUNCTIONAL, "příliš žluťoučký kůň úpěl ďábelské ódy")).isNotNull(); final Map metaData = kbase.getRule(TestConstants.PACKAGE_FUNCTIONAL, "příliš žluťoučký kůň úpěl ďábelské ódy").getMetaData(); - Assertions.assertThat(metaData.get("PrávníPožadavek")).isEqualTo("Osoba starší osmnácti let"); + assertThat(metaData.get("PrávníPožadavek")).isEqualTo("Osoba starší osmnácti let"); - Assertions.assertThat(lidé.size()).isEqualTo(2); - Assertions.assertThat(lidé.get(0).getJméno()).isEqualTo("Řehoř"); - Assertions.assertThat(lidé.get(1).getJméno()).isEqualTo("Oldřiška"); + assertThat(lidé.size()).isEqualTo(2); + assertThat(lidé.get(0).getJméno()).isEqualTo("Řehoř"); + assertThat(lidé.get(1).getJméno()).isEqualTo("Oldřiška"); } @Test @@ -137,10 +138,10 @@ public void testCzechDomainSpecificLanguage() { commands.add(kieServices.getCommands().newFireAllRules()); ksession.execute(kieServices.getCommands().newBatchExecution(commands, null)); - Assertions.assertThat(kbase.getRule(TestConstants.PACKAGE_FUNCTIONAL, "pokusné doménově specifické pravidlo")).isNotNull(); + assertThat(kbase.getRule(TestConstants.PACKAGE_FUNCTIONAL, "pokusné doménově specifické pravidlo")).isNotNull(); - Assertions.assertThat(dospělí.size()).isEqualTo(1); - Assertions.assertThat(dospělí.iterator().next().getJméno()).isEqualTo("Řehoř"); + assertThat(dospělí.size()).isEqualTo(1); + assertThat(dospělí.iterator().next().getJméno()).isEqualTo("Řehoř"); } @Test @@ -160,10 +161,10 @@ public void testCzechXLSDecisionTable() throws FileNotFoundException { commands.add(kieServices.getCommands().newFireAllRules()); ksession.execute(kieServices.getCommands().newBatchExecution(commands, null)); - Assertions.assertThat(kbase.getRule(TestConstants.PACKAGE_FUNCTIONAL, "přidej k dospělým")).isNotNull(); + assertThat(kbase.getRule(TestConstants.PACKAGE_FUNCTIONAL, "přidej k dospělým")).isNotNull(); - Assertions.assertThat(dospělí.size()).isEqualTo(1); - Assertions.assertThat(dospělí.iterator().next().getJméno()).isEqualTo("Řehoř"); + assertThat(dospělí.size()).isEqualTo(1); + assertThat(dospělí.iterator().next().getJméno()).isEqualTo("Řehoř"); } @Test @@ -186,10 +187,10 @@ public void testCzechCSVDecisionTable() throws FileNotFoundException { commands.add(kieServices.getCommands().newFireAllRules()); ksession.execute(kieServices.getCommands().newBatchExecution(commands, null)); - Assertions.assertThat(kbase.getRule(TestConstants.PACKAGE_FUNCTIONAL, "pokusné pravidlo rozhodovací tabulky")).isNotNull(); + assertThat(kbase.getRule(TestConstants.PACKAGE_FUNCTIONAL, "pokusné pravidlo rozhodovací tabulky")).isNotNull(); - Assertions.assertThat(dospělí.size()).isEqualTo(1); - Assertions.assertThat(dospělí.iterator().next().getJméno()).isEqualTo("Řehoř"); + assertThat(dospělí.size()).isEqualTo(1); + assertThat(dospělí.iterator().next().getJméno()).isEqualTo("Řehoř"); } // test queries in Czech language @@ -250,11 +251,11 @@ public void testQueryCallFromJava() throws InstantiationException, IllegalAccess } // items in the office should be the following - Assertions.assertThat(l.size()).isEqualTo(4); - Assertions.assertThat(l.contains("stůl")).isTrue(); - Assertions.assertThat(l.contains("svítilna")).isTrue(); - Assertions.assertThat(l.contains("obálka")).isTrue(); - Assertions.assertThat(l.contains("klíč")).isTrue(); + assertThat(l.size()).isEqualTo(4); + assertThat(l.contains("stůl")).isTrue(); + assertThat(l.contains("svítilna")).isTrue(); + assertThat(l.contains("obálka")).isTrue(); + assertThat(l.contains("klíč")).isTrue(); } // japanese person @@ -330,6 +331,6 @@ public void testMutibyteJavaDialect() { kieSession.insert( "Hello" ); final int fired = kieSession.fireAllRules(); - Assertions.assertThat( fired ).isEqualTo( 1 ); + assertThat( fired ).isEqualTo( 1 ); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/decisiontable/DecisionTableKieContainerTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/decisiontable/DecisionTableKieContainerTest.java index 02a5e85f326..941b6ccb50d 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/decisiontable/DecisionTableKieContainerTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/decisiontable/DecisionTableKieContainerTest.java @@ -1,6 +1,7 @@ package org.drools.testcoverage.functional.decisiontable; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + import org.drools.testcoverage.common.model.Record; import org.junit.Test; import org.kie.api.KieBase; @@ -14,17 +15,17 @@ public class DecisionTableKieContainerTest { public void testCSVWithRuleTemplate() { final KieContainer kieContainer = KieServices.Factory.get().getKieClasspathContainer(); final KieBase kieBase = kieContainer.getKieBase("csvwithtemplate"); - Assertions.assertThat(kieBase).isNotNull(); + assertThat(kieBase).isNotNull(); final StatelessKieSession kieSession = kieContainer.newStatelessKieSession("csvwithtemplatesession"); Record record1 = new Record(); record1.setCategory("Test"); kieSession.execute(record1); - Assertions.assertThat(record1.getPhoneNumber()).isNotNull(); + assertThat(record1.getPhoneNumber()).isNotNull(); Record record2 = new Record(); record2.setCategory("Test2"); kieSession.execute(record2); - Assertions.assertThat(record2.getPhoneNumber()).isNotNull(); + assertThat(record2.getPhoneNumber()).isNotNull(); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathCepTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathCepTest.java index 3fc0fa00bb8..4807d171f07 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathCepTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathCepTest.java @@ -16,12 +16,14 @@ package org.drools.testcoverage.functional.oopath; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.mvel.compiler.TestUtil.assertDrlHasCompilationError; + import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.concurrent.TimeUnit; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.model.Message; import org.drools.testcoverage.common.model.MessageEvent; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; @@ -39,8 +41,6 @@ import org.kie.api.runtime.rule.EntryPoint; import org.kie.api.time.SessionPseudoClock; -import static org.drools.mvel.compiler.TestUtil.assertDrlHasCompilationError; - /** * Tests usage of OOPath expressions with CEP (events, event windows, event streams). */ @@ -131,7 +131,7 @@ private void populateAndVerifyEventCase(final EntryPoint entryPoint) { entryPoint.insert(anotherEvent); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).containsExactlyInAnyOrder(helloMessage); + assertThat(this.messages).containsExactlyInAnyOrder(helloMessage); } @Test @@ -159,12 +159,12 @@ public void testTemporalOperatorAfterWithOOPath() { this.insertEventAndAdvanceClock(new MessageEvent(MessageEvent.Type.sent, new Message("Ping")), clock, 1); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); + assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); final Message pongMessage = this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Pong"))); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); + assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); } @Test @@ -192,12 +192,12 @@ public void testTemporalOperatorBeforeWithOOPath() { final Message pongMessage = this.insertEventAndAdvanceClock(new MessageEvent(MessageEvent.Type.sent, new Message("Pong")), clock, 1); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); + assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Ping"))); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); + assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); } @Test @@ -225,12 +225,12 @@ public void testTemporalOperatorCoincidesWithOOPath() { this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Ping"))); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); + assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); final Message pongMessage = this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Pong"))); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); + assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); } @Test @@ -259,12 +259,12 @@ public void testTemporalOperatorDuringWithOOPath() { this.insertEventAndAdvanceClock(new MessageEvent(MessageEvent.Type.sent, new Message("Pong"), DEFAULT_DURATION_IN_SECS), clock, 1); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); + assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); final Message pongMessage = this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Pong"), DEFAULT_DURATION_IN_SECS - 1500)); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); + assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); } @Test @@ -293,12 +293,12 @@ public void testTemporalOperatorFinishesWithOOPath() { this.insertEventAndAdvanceClock(new MessageEvent(MessageEvent.Type.sent, new Message("Ping"), DEFAULT_DURATION_IN_SECS), clock, 1); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); + assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); final Message pongMessage = this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Pong"), DEFAULT_DURATION_IN_SECS - 1000)); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); + assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); } @Test @@ -327,12 +327,12 @@ public void testTemporalOperatorFinishedByWithOOPath() { final Message pongMessage = this.insertEventAndAdvanceClock(new MessageEvent(MessageEvent.Type.sent, new Message("Pong"), DEFAULT_DURATION_IN_SECS), clock, 1); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); + assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Ping"), DEFAULT_DURATION_IN_SECS - 1000)); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); + assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); } @Test @@ -361,12 +361,12 @@ public void testTemporalOperatorIncludesWithOOPath() { this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Pong"), DEFAULT_DURATION_IN_SECS - 1500)); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); + assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Ping"), DEFAULT_DURATION_IN_SECS - 1500)); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); + assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); } @Test @@ -394,12 +394,12 @@ public void testTemporalOperatorMeetsWithOOPath() { this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Ping"))); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); + assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); final Message pongMessage = this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Pong"))); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); + assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); } @Test @@ -427,12 +427,12 @@ public void testTemporalOperatorMetByWithOOPath() { this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Ping"))); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); + assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); final Message pongMessage = this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Pong"))); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); + assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); } @Test @@ -461,13 +461,13 @@ public void testTemporalOperatorOverlapsWithOOPath() { this.insertEventAndAdvanceClock(new MessageEvent(MessageEvent.Type.sent, new Message("Ping"), 1), clock, 1); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); + assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); final Message pongMessage = this.insertEventAndAdvanceClock(new MessageEvent(MessageEvent.Type.sent, new Message("Pong"), DEFAULT_DURATION_IN_SECS), clock, 1); this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Ping"), DEFAULT_DURATION_IN_SECS)); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); + assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); } @Test @@ -496,12 +496,12 @@ public void testTemporalOperatorOverlappedByWithOOPath() { this.insertEventAndAdvanceClock(new MessageEvent(MessageEvent.Type.sent, new Message("Ping"), DEFAULT_DURATION_IN_SECS), clock, 1); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); + assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); final Message pongMessage = this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Pong"), DEFAULT_DURATION_IN_SECS)); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); + assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); } @Test @@ -530,12 +530,12 @@ public void testTemporalOperatorStartsWithOOPath() { this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Ping"), DEFAULT_DURATION_IN_SECS)); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); + assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); final Message pongMessage = this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Pong"), DEFAULT_DURATION_IN_SECS - 1000)); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); + assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); } @Test @@ -564,12 +564,12 @@ public void testTemporalOperatorStartedByWithOOPath() { this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Ping"), DEFAULT_DURATION_IN_SECS)); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); + assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); final Message pongMessage = this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Pong"), DEFAULT_DURATION_IN_SECS + 1000)); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); + assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); } @Test @@ -655,7 +655,7 @@ private void populateAndVerifyLengthWindowCase(final KieBase kieBase) { this.kieSession.insert(ping3Event); this.kieSession.fireAllRules(); - Assertions.assertThat(this.events).as("The rule should have fired for 2 events").contains(ping2Event, ping3Event); + assertThat(this.events).as("The rule should have fired for 2 events").contains(ping2Event, ping3Event); this.events.clear(); final MessageEvent pongEvent = new MessageEvent(MessageEvent.Type.sent, new Message("Pong")); @@ -665,7 +665,7 @@ private void populateAndVerifyLengthWindowCase(final KieBase kieBase) { this.kieSession.insert(ping4Event); this.kieSession.fireAllRules(); - Assertions.assertThat(this.events).as("The rule should have fired for ping event only").contains(ping4Event); + assertThat(this.events).as("The rule should have fired for ping event only").contains(ping4Event); } @Test @@ -732,7 +732,7 @@ private void populateAndVerifyTimeWindowCase(final KieBase kieBase) { clock.advanceTime(1, TimeUnit.SECONDS); this.kieSession.fireAllRules(); - Assertions.assertThat(this.events).as("The rule should have fired for 2 events").containsExactlyInAnyOrder(ping2Event, ping3Event); + assertThat(this.events).as("The rule should have fired for 2 events").containsExactlyInAnyOrder(ping2Event, ping3Event); this.events.clear(); final MessageEvent pongEvent = new MessageEvent(MessageEvent.Type.sent, new Message("Pong")); @@ -744,7 +744,7 @@ private void populateAndVerifyTimeWindowCase(final KieBase kieBase) { clock.advanceTime(1, TimeUnit.SECONDS); this.kieSession.fireAllRules(); - Assertions.assertThat(this.events).as("The rule should have fired for ping event only").contains(ping4Event); + assertThat(this.events).as("The rule should have fired for ping event only").contains(ping4Event); } @Test @@ -773,12 +773,12 @@ public void testEventExplicitExpirationWithOOPath() { final Message pongMessage = this.insertEventAndAdvanceClock(new MessageEvent(MessageEvent.Type.sent, new Message("Pong")), clock, 1); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); + assertThat(this.messages).as("The first sequence of events should NOT make the rule fire").isEmpty(); this.insertEvent(new MessageEvent(MessageEvent.Type.sent, new Message("Ping"))); this.kieSession.fireAllRules(); - Assertions.assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); + assertThat(this.messages).as("The last event should make the rule fire").containsExactlyInAnyOrder(pongMessage); } private SessionPseudoClock initKieSessionWithPseudoClock(final KieBase kieBase) { diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathLogicalBranchesTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathLogicalBranchesTest.java index c45098c4507..c83f4d82ae6 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathLogicalBranchesTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathLogicalBranchesTest.java @@ -16,11 +16,12 @@ package org.drools.testcoverage.functional.oopath; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.model.Address; import org.drools.testcoverage.common.model.Employee; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; @@ -84,7 +85,7 @@ public void testBasicOrCondition() { this.initKieSession(kieBase); this.kieSession.fireAllRules(); - Assertions.assertThat(this.results).containsExactlyInAnyOrder("Big City", "Small City"); + assertThat(this.results).containsExactlyInAnyOrder("Big City", "Small City"); } @Test @@ -106,7 +107,7 @@ public void testOrConstraint() { this.initKieSession(kieBase); this.kieSession.fireAllRules(); - Assertions.assertThat(this.results).containsExactlyInAnyOrder("Big City", "Small City"); + assertThat(this.results).containsExactlyInAnyOrder("Big City", "Small City"); } @Test @@ -128,7 +129,7 @@ public void testOrConstraintWithJoin() { this.initKieSession(kieBase); this.kieSession.fireAllRules(); - Assertions.assertThat(this.results).containsExactlyInAnyOrder("Big City", "Small City"); + assertThat(this.results).containsExactlyInAnyOrder("Big City", "Small City"); } @Test @@ -150,7 +151,7 @@ public void testOrConstraintNoBinding() { this.initKieSession(kieBase); this.kieSession.fireAllRules(); - Assertions.assertThat(this.results).containsExactlyInAnyOrder("Bruno", "Alice"); + assertThat(this.results).containsExactlyInAnyOrder("Bruno", "Alice"); } @Test @@ -173,7 +174,7 @@ public void testOrConditionalElement() { this.initKieSession(kieBase); this.kieSession.fireAllRules(); - Assertions.assertThat(this.results).containsExactlyInAnyOrder("Big City", "Small City"); + assertThat(this.results).containsExactlyInAnyOrder("Big City", "Small City"); } @Test @@ -198,7 +199,7 @@ public void testOrConditionalElementNoBinding() { this.initKieSession(kieBase); this.kieSession.fireAllRules(); - Assertions.assertThat(this.results).containsExactlyInAnyOrder("Bruno", "Alice"); + assertThat(this.results).containsExactlyInAnyOrder("Bruno", "Alice"); } @Test @@ -219,7 +220,7 @@ public void testBasicAndCondition() { this.initKieSession(kieBase); this.kieSession.fireAllRules(); - Assertions.assertThat(this.results).containsExactly("Big City"); + assertThat(this.results).containsExactly("Big City"); } @Test @@ -241,7 +242,7 @@ public void testAndConstraint() { this.initKieSession(kieBase); this.kieSession.fireAllRules(); - Assertions.assertThat(this.results).containsExactlyInAnyOrder("Big City"); + assertThat(this.results).containsExactlyInAnyOrder("Big City"); } @Test @@ -263,7 +264,7 @@ public void testAndConstraintNoBinding() { this.initKieSession(kieBase); this.kieSession.fireAllRules(); - Assertions.assertThat(this.results).containsExactlyInAnyOrder("Alice"); + assertThat(this.results).containsExactlyInAnyOrder("Alice"); } @Test @@ -286,7 +287,7 @@ public void testAndConditionalElement() { this.initKieSession(kieBase); this.kieSession.fireAllRules(); - Assertions.assertThat(this.results).containsExactlyInAnyOrder("Big City"); + assertThat(this.results).containsExactlyInAnyOrder("Big City"); } @Test @@ -315,11 +316,11 @@ public void testAndConditionalElementWithNot() { this.kieSession.insert(alice); this.kieSession.fireAllRules(); - Assertions.assertThat(this.results).isEmpty(); + assertThat(this.results).isEmpty(); this.kieSession.delete(brunoFactHandle); this.kieSession.fireAllRules(); - Assertions.assertThat(this.results).containsExactlyInAnyOrder("Alice"); + assertThat(this.results).containsExactlyInAnyOrder("Alice"); } private void initKieSession(final KieBase kieBase) { diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathSmokeTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathSmokeTest.java index f12cf99ba2c..9447a11b63c 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathSmokeTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathSmokeTest.java @@ -16,8 +16,10 @@ package org.drools.testcoverage.functional.oopath; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; -import org.assertj.core.api.Assertions; + import org.drools.testcoverage.common.model.Address; import org.drools.testcoverage.common.model.Person; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; @@ -68,7 +70,7 @@ public void disposeKieSession() { public void testBuildKieBase() { final KieBase kieBase = KieBaseUtil.getKieBaseFromClasspathResources(this.getClass(), kieBaseTestConfiguration, "oopath.drl"); - Assertions.assertThat(kieBase).isNotNull(); + assertThat(kieBase).isNotNull(); } @Test @@ -80,7 +82,7 @@ public void testBuildTwoKieBases() { for (int i = 0; i < 2; i++) { final KieContainer kieContainer = KIE_SERVICES.newKieContainer(RELEASE_ID); final KieBase kieBase = kieContainer.getKieBase(); - Assertions.assertThat(kieBase).isNotNull(); + assertThat(kieBase).isNotNull(); } } @@ -93,7 +95,7 @@ public void testFireRule() { final Person person = new Person("Bruno", 21); person.setAddress(new Address("Some Street", 10, "Beautiful City")); this.kieSession.insert(person); - Assertions.assertThat(this.kieSession.fireAllRules()).isEqualTo(1); + assertThat(this.kieSession.fireAllRules()).isEqualTo(1); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AbstractCompositeRestrictionTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AbstractCompositeRestrictionTest.java index ece6ec35f94..e5524ad420a 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AbstractCompositeRestrictionTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AbstractCompositeRestrictionTest.java @@ -16,10 +16,11 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieUtil; import org.drools.testcoverage.common.util.TestParametersUtil; @@ -58,6 +59,6 @@ public void test() { final String[] lines = msgs.get(0).getText().split("\n"); final String unable = "Unable to Analyse Expression valueType == Field.INT || valueType == Field.DOUBLE:"; - Assertions.assertThat(lines[0]).isEqualTo(unable); + assertThat(lines[0]).isEqualTo(unable); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AccumulateRecalculationTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AccumulateRecalculationTest.java index f256d030d8d..ade37af9574 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AccumulateRecalculationTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AccumulateRecalculationTest.java @@ -16,7 +16,8 @@ package org.drools.testcoverage.regression; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + import org.drools.testcoverage.common.model.MyFact; import org.junit.Test; import org.kie.api.io.ResourceType; @@ -167,15 +168,15 @@ private void scenario(final String drl) { int fireCount = ksession.fireAllRules(); - Assertions.assertThat(fact0.getCurrentValue().intValue()).isEqualTo(9); - Assertions.assertThat(fireCount).isEqualTo(2); + assertThat(fact0.getCurrentValue().intValue()).isEqualTo(9); + assertThat(fireCount).isEqualTo(2); fact2.setCurrentValue(6); ksession.update(fh2, fact2); fireCount = ksession.fireAllRules(); - Assertions.assertThat(fact0.getCurrentValue().intValue()).isEqualTo(10); - Assertions.assertThat(fireCount).isEqualTo(2); + assertThat(fact0.getCurrentValue().intValue()).isEqualTo(10); + assertThat(fireCount).isEqualTo(2); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DateExtendingFactTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DateExtendingFactTest.java index edd1d174238..16d81a36758 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DateExtendingFactTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DateExtendingFactTest.java @@ -16,10 +16,11 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; import java.util.Date; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieUtil; import org.drools.testcoverage.common.util.TestParametersUtil; @@ -63,7 +64,7 @@ public static Collection getParameters() { @Test public void testDateExtendingFact() { final KieBuilder kbuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, true, DRL); - Assertions.assertThat(kbuilder.getResults().getMessages(Message.Level.ERROR)).isEmpty(); + assertThat(kbuilder.getResults().getMessages(Message.Level.ERROR)).isEmpty(); } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeclarationWithOrTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeclarationWithOrTest.java index fd9125a3070..423f146f042 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeclarationWithOrTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeclarationWithOrTest.java @@ -16,11 +16,12 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; import org.drools.testcoverage.common.util.KieUtil; @@ -78,7 +79,7 @@ public void testBindingWithOrInLHS() { ksession.dispose(); } - Assertions.assertThat(list).as("Unexpected element in result global").containsExactly(FACT); + assertThat(list).as("Unexpected element in result global").containsExactly(FACT); } } \ No newline at end of file diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeserializationWithCompositeTriggerTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeserializationWithCompositeTriggerTest.java index b82b4e28655..ffd0d55fab3 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeserializationWithCompositeTriggerTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeserializationWithCompositeTriggerTest.java @@ -16,9 +16,10 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.mvel.compiler.StockTick; import org.drools.mvel.integrationtests.SerializationHelper; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; @@ -107,6 +108,6 @@ public void testSerializationAndDeserialization() throws Exception { this.ksession.insert(new StockTick(2, "AAA", 1.0, 0)); this.ksession = SerializationHelper.getSerialisedStatefulKnowledgeSession(ksession, true, false); - Assertions.assertThat(this.ksession).isNotNull(); + assertThat(this.ksession).isNotNull(); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DroolsGcCausesNPETest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DroolsGcCausesNPETest.java index 35013d2db6b..484e93454f4 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DroolsGcCausesNPETest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DroolsGcCausesNPETest.java @@ -16,8 +16,13 @@ package org.drools.testcoverage.regression; -import org.assertj.core.api.Assertions; -import org.kie.api.time.SessionPseudoClock; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + +import java.util.List; +import java.util.Random; +import java.util.concurrent.TimeUnit; + import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -35,14 +40,11 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.KieSessionConfiguration; import org.kie.api.runtime.conf.ClockTypeOption; +import org.kie.api.time.SessionPseudoClock; import org.kie.test.testcategory.TurtleTestCategory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; -import java.util.Random; -import java.util.concurrent.TimeUnit; - /** * Reproducer for BZ 1181584, by Mike Wilson. */ @@ -79,7 +81,7 @@ public static void beforeClass() throws Exception { final List errors = builder.buildAll().getResults() .getMessages(Message.Level.ERROR); - Assertions.assertThat(errors).as("Unexpected errors building drl: " + errors).isEmpty(); + assertThat(errors).as("Unexpected errors building drl: " + errors).isEmpty(); SERVICES.getRepository().addKieModule(builder.getKieModule()); } @@ -113,7 +115,7 @@ public void testMoreTimesRepeated() throws Exception { LOGGER.warn("failed at i = " + i); LOGGER.warn("fact count: " + session.getFactCount()); logActiveFacts(); - Assertions.fail("NPE thrown - consider reopening BZ 1181584", e); + fail("NPE thrown - consider reopening BZ 1181584", e); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EqualityKeyOverrideTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EqualityKeyOverrideTest.java index 5048ab23d70..15fe5f80023 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EqualityKeyOverrideTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EqualityKeyOverrideTest.java @@ -16,17 +16,21 @@ package org.drools.testcoverage.regression; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Collection; + import org.drools.testcoverage.common.KieSessionTest; -import org.drools.testcoverage.common.util.*; +import org.drools.testcoverage.common.util.KieBaseTestConfiguration; +import org.drools.testcoverage.common.util.KieSessionTestConfiguration; +import org.drools.testcoverage.common.util.KieUtil; +import org.drools.testcoverage.common.util.TestParametersUtil; import org.junit.Test; import org.junit.runners.Parameterized; import org.kie.api.io.Resource; import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; -import java.util.Collection; - public class EqualityKeyOverrideTest extends KieSessionTest { private static final int ANY_NUMBER = 42; @@ -67,16 +71,16 @@ public void testEqualityOverride() { FactHandle string = ksession.insert("testString"); ksession.fireAllRules(); - Assertions.assertThat(ksession.getObjects().size()).isEqualTo(2); + assertThat(ksession.getObjects().size()).isEqualTo(2); ksession.insert(ANY_NUMBER); ksession.fireAllRules(); - Assertions.assertThat(ksession.getObjects().size()).isEqualTo(4); + assertThat(ksession.getObjects().size()).isEqualTo(4); ksession.delete(string); ksession.fireAllRules(); - Assertions.assertThat(ksession.getObjects().size()).isEqualTo(2); + assertThat(ksession.getObjects().size()).isEqualTo(2); } @Override diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EscapesInMetadataTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EscapesInMetadataTest.java index 64d6846865f..8c09a5b5186 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EscapesInMetadataTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EscapesInMetadataTest.java @@ -16,10 +16,11 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; import java.util.Map; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; import org.drools.testcoverage.common.util.TestConstants; @@ -71,8 +72,8 @@ public void testMetadataEscapes() { final Map metadata = kieBase.getRule(TestConstants.PACKAGE_REGRESSION, RULE_NAME).getMetaData(); LOGGER.debug(rule); - Assertions.assertThat(metadata.containsKey(RULE_KEY)).isTrue(); - Assertions.assertThat(metadata.get(RULE_KEY)).isEqualTo("\"" + RULE_VALUE + "\""); + assertThat(metadata.containsKey(RULE_KEY)).isTrue(); + assertThat(metadata.get(RULE_KEY)).isEqualTo("\"" + RULE_VALUE + "\""); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EventDeserializationInPastTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EventDeserializationInPastTest.java index 58e75867fc9..16dcfa178a6 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EventDeserializationInPastTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EventDeserializationInPastTest.java @@ -16,12 +16,13 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.fail; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.Serializable; import java.util.concurrent.TimeUnit; -import org.assertj.core.api.Assertions; import org.drools.core.ClockType; import org.drools.core.impl.RuleBaseFactory; import org.drools.core.time.impl.PseudoClockScheduler; @@ -92,7 +93,7 @@ private KieSession marshallAndUnmarshall(final KieServices ks, final KieBase kba ksession = marshaller.unmarshall(bais, sessionConfig, null); } } catch (Exception e) { - Assertions.fail("Unexpected exception: ", e); + fail("Unexpected exception: ", e); } return ksession; } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FixedPatternTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FixedPatternTest.java index 45915ef078a..c2937e355e9 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FixedPatternTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FixedPatternTest.java @@ -16,11 +16,12 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; import org.drools.testcoverage.common.util.KieUtil; @@ -78,7 +79,7 @@ public void testFixedPattern() { ksession.insert(2); ksession.fireAllRules(); - Assertions.assertThat(list).hasSize(1); - Assertions.assertThat(list).first().isEqualTo(1L); + assertThat(list).hasSize(1); + assertThat(list).first().isEqualTo(1L); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FromGenericCollectionTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FromGenericCollectionTest.java index 1d07237e01c..05edee0026b 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FromGenericCollectionTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FromGenericCollectionTest.java @@ -16,13 +16,14 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.assertj.core.api.Assertions; import org.drools.core.ClassObjectFilter; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; @@ -77,7 +78,7 @@ public void testGenerics() { ksession.insert(gh); ksession.fireAllRules(); - Assertions.assertThat(ksession.getObjects(new ClassObjectFilter(Boolean.class)).size()).isEqualTo(1); + assertThat(ksession.getObjects(new ClassObjectFilter(Boolean.class)).size()).isEqualTo(1); } finally { ksession.dispose(); } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FusionAfterBeforeTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FusionAfterBeforeTest.java index bf7246a04c3..5704b7bd277 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FusionAfterBeforeTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FusionAfterBeforeTest.java @@ -16,12 +16,13 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; import java.util.SortedSet; import java.util.TreeSet; import java.util.concurrent.TimeUnit; -import org.assertj.core.api.Assertions; -import org.kie.api.time.SessionPseudoClock; + import org.drools.core.impl.RuleBaseFactory; import org.drools.testcoverage.common.listener.TrackingAgendaEventListener; import org.drools.testcoverage.common.model.Event; @@ -45,6 +46,7 @@ import org.kie.api.runtime.KieSessionConfiguration; import org.kie.api.runtime.conf.ClockTypeOption; import org.kie.api.runtime.rule.EntryPoint; +import org.kie.api.time.SessionPseudoClock; import org.kie.internal.utils.KieHelper; /** @@ -94,17 +96,17 @@ public void testAfterBeforeOperators() { ksession.dispose(); } - Assertions.assertThat(listener.isRuleFired("AfterMessageEvent")).as("Rule 'AfterMessageEvent' was no fired!").isTrue(); - Assertions.assertThat(listener.isRuleFired("BeforeMessageEvent")).as("Rule 'BeforeMessageEvent' was no fired!").isTrue(); + assertThat(listener.isRuleFired("AfterMessageEvent")).as("Rule 'AfterMessageEvent' was no fired!").isTrue(); + assertThat(listener.isRuleFired("BeforeMessageEvent")).as("Rule 'BeforeMessageEvent' was no fired!").isTrue(); // each rules should be fired 2 times int firedCount = 2; int actuallyFired = listener.ruleFiredCount("AfterMessageEvent"); - Assertions.assertThat(firedCount).as("Rule 'AfterMessageEvent' should be fired 2 times, but was fired " + assertThat(firedCount).as("Rule 'AfterMessageEvent' should be fired 2 times, but was fired " + firedCount + " time(s)!").isEqualTo(actuallyFired); firedCount = listener.ruleFiredCount("BeforeMessageEvent"); - Assertions.assertThat(firedCount).as("Rule 'BeforeMessageEvent' should be fired 2 times, but was fired " + assertThat(firedCount).as("Rule 'BeforeMessageEvent' should be fired 2 times, but was fired " + firedCount + " time(s)!").isEqualTo(actuallyFired); } @@ -131,7 +133,7 @@ public void testExpireEventsWhenSharingAllRules() throws InstantiationException, final KieSession kieSession = new KieHelper().addContent(drlBuilder.toString(), ResourceType.DRL).build(kieBaseTestConfiguration.getKieBaseConfiguration()).newKieSession(sessionConf, null); - Assertions.assertThat(insertEventsAndFire(kieSession, events)).isEqualTo(2048); + assertThat(insertEventsAndFire(kieSession, events)).isEqualTo(2048); } private SortedSet getEvents(final Class eventClass, final int eventsCount, diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/GlobalOnLHSTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/GlobalOnLHSTest.java index 891cd765e66..a935e8a4718 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/GlobalOnLHSTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/GlobalOnLHSTest.java @@ -16,10 +16,18 @@ package org.drools.testcoverage.regression; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.drools.testcoverage.common.KieSessionTest; import org.drools.testcoverage.common.model.Message; -import org.drools.testcoverage.common.util.*; +import org.drools.testcoverage.common.util.KieBaseTestConfiguration; +import org.drools.testcoverage.common.util.KieSessionTestConfiguration; +import org.drools.testcoverage.common.util.KieUtil; +import org.drools.testcoverage.common.util.TestParametersUtil; import org.junit.Test; import org.junit.runners.Parameterized; import org.kie.api.io.Resource; @@ -28,10 +36,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - public class GlobalOnLHSTest extends KieSessionTest { private static final Logger LOGGER = LoggerFactory.getLogger(GlobalOnLHSTest.class); @@ -61,7 +65,7 @@ public void testNPEOnMutableGlobal() throws Exception { ksession.delete(b); int fired = ksession.fireAllRules(1); - Assertions.assertThat(fired).isEqualTo(0); + assertThat(fired).isEqualTo(0); ksession.dispose(); } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/InaccurateComparisonTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/InaccurateComparisonTest.java index 8cf7b497b5b..91497d2a9e8 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/InaccurateComparisonTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/InaccurateComparisonTest.java @@ -16,9 +16,10 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.model.Message; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; @@ -63,6 +64,6 @@ public void testStringCoercionComparison() { KieSession ksession = kieBase.newKieSession(); ksession.insert(new Message("90201304122000000000000015")); - Assertions.assertThat(ksession.fireAllRules()).isEqualTo(1); + assertThat(ksession.fireAllRules()).isEqualTo(1); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/LogicalInsertionsSerializationTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/LogicalInsertionsSerializationTest.java index a6cb6cba2d5..6ab1ef8c19b 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/LogicalInsertionsSerializationTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/LogicalInsertionsSerializationTest.java @@ -16,10 +16,22 @@ package org.drools.testcoverage.regression; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.testcoverage.common.util.KieUtil.getServices; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Collection; + import org.drools.testcoverage.common.KieSessionTest; import org.drools.testcoverage.common.model.Promotion; -import org.drools.testcoverage.common.util.*; +import org.drools.testcoverage.common.util.KieBaseTestConfiguration; +import org.drools.testcoverage.common.util.KieSessionTestConfiguration; +import org.drools.testcoverage.common.util.KieUtil; +import org.drools.testcoverage.common.util.TestParametersUtil; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; @@ -29,11 +41,6 @@ import org.kie.api.marshalling.Marshaller; import org.kie.api.runtime.KieSession; -import java.io.*; -import java.util.Collection; - -import static org.drools.testcoverage.common.util.KieUtil.getServices; - public class LogicalInsertionsSerializationTest extends KieSessionTest { private static final String DRL_FILE = "logical-insertion.drl"; @@ -71,7 +78,7 @@ public void testSerializeAndDeserializeSession() throws Exception { ksession.insert(new Promotion("Claire", "Scientist")); int firedRules = ksession.fireAllRules(); - Assertions.assertThat(firedRules).isEqualTo(1); + assertThat(firedRules).isEqualTo(1); } private KieBase getKbase() { diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultiRestrictionPatternTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultiRestrictionPatternTest.java index d615bc5eab0..9d790917102 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultiRestrictionPatternTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultiRestrictionPatternTest.java @@ -16,21 +16,24 @@ package org.drools.testcoverage.regression; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.testcoverage.common.util.KieUtil.getCommands; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.drools.testcoverage.common.KieSessionTest; import org.drools.testcoverage.common.model.Person; -import org.drools.testcoverage.common.util.*; +import org.drools.testcoverage.common.util.KieBaseTestConfiguration; +import org.drools.testcoverage.common.util.KieSessionTestConfiguration; +import org.drools.testcoverage.common.util.KieUtil; +import org.drools.testcoverage.common.util.TestParametersUtil; import org.junit.Test; import org.junit.runners.Parameterized; import org.kie.api.command.Command; import org.kie.api.io.Resource; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import static org.drools.testcoverage.common.util.KieUtil.getCommands; - /** * Test to verify BRMS-364 (multi-restriction pattern throws UnsupportedOpEx) is * fixed @@ -57,7 +60,7 @@ public void multiRestriction1() throws Exception { session.execute(getCommands().newBatchExecution(commands, null)); - Assertions.assertThat(firedRules.isRuleFired("or1")).isTrue(); + assertThat(firedRules.isRuleFired("or1")).isTrue(); } @Test @@ -68,7 +71,7 @@ public void multiRestriction2() throws Exception { session.execute(getCommands().newBatchExecution(commands, null)); - Assertions.assertThat(firedRules.isRuleFired("or2")).isTrue(); + assertThat(firedRules.isRuleFired("or2")).isTrue(); } @Test @@ -81,7 +84,7 @@ public void multiRestriction3() throws Exception { session.execute(getCommands().newBatchExecution(commands, null)); - Assertions.assertThat(firedRules.isRuleFired("and")).isTrue(); + assertThat(firedRules.isRuleFired("and")).isTrue(); } @Override diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleKieBaseListenersTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleKieBaseListenersTest.java index 5d1fb02a8fd..ecbd958b0a0 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleKieBaseListenersTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleKieBaseListenersTest.java @@ -16,17 +16,18 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; import org.drools.testcoverage.common.util.TestConstants; import org.drools.testcoverage.common.util.TestParametersUtil; import org.junit.Test; import org.junit.runner.RunWith; -import org.junit.runners.Parameterized.Parameters; import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; import org.kie.api.KieBase; import org.kie.api.event.kiebase.DefaultKieBaseEventListener; import org.kie.api.event.kiebase.KieBaseEventListener; @@ -56,11 +57,11 @@ public void testKnowledgeBaseEventSupportLeak() throws Exception { kieBase.addEventListener(listener); kieBase.addEventListener(listener); - Assertions.assertThat(kieBase.getKieBaseEventListeners().size()).isEqualTo(1); + assertThat(kieBase.getKieBaseEventListeners().size()).isEqualTo(1); kieBase.removeEventListener(listener); - Assertions.assertThat(kieBase.getKieBaseEventListeners()).isEmpty(); + assertThat(kieBase.getKieBaseEventListeners()).isEmpty(); } } \ No newline at end of file diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSalienceUpdateFactTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSalienceUpdateFactTest.java index f5fd32a21e6..6a1deee6622 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSalienceUpdateFactTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSalienceUpdateFactTest.java @@ -16,11 +16,21 @@ package org.drools.testcoverage.regression; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.testcoverage.common.util.KieUtil.getCommands; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + import org.drools.testcoverage.common.KieSessionTest; import org.drools.testcoverage.common.model.ListHolder; import org.drools.testcoverage.common.model.Person; -import org.drools.testcoverage.common.util.*; +import org.drools.testcoverage.common.util.KieBaseTestConfiguration; +import org.drools.testcoverage.common.util.KieSessionTestConfiguration; +import org.drools.testcoverage.common.util.KieUtil; +import org.drools.testcoverage.common.util.TestParametersUtil; import org.junit.Test; import org.junit.runners.Parameterized; import org.kie.api.command.Command; @@ -28,13 +38,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -import static org.drools.testcoverage.common.util.KieUtil.getCommands; - /** * Test to verify that BRMS-580 is fixed. NPE when trying to update fact with * rules with different saliences. @@ -72,8 +75,8 @@ public void test() { session.execute(getCommands().newBatchExecution(commands, null)); - Assertions.assertThat(firedRules.isRuleFired("PERSON_PAUL")).isTrue(); - Assertions.assertThat(firedRules.isRuleFired("PERSON_PETER")).isTrue(); + assertThat(firedRules.isRuleFired("PERSON_PAUL")).isTrue(); + assertThat(firedRules.isRuleFired("PERSON_PETER")).isTrue(); } @Override diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSheetsLoadingTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSheetsLoadingTest.java index 0a2f73efa03..681688f0ebf 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSheetsLoadingTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSheetsLoadingTest.java @@ -16,11 +16,12 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; import java.util.HashSet; import java.util.Set; -import org.assertj.core.api.Assertions; import org.drools.core.builder.conf.impl.DecisionTableConfigurationImpl; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; @@ -76,7 +77,7 @@ public void test() { if (results.size() > 0) { LOGGER.error(results.toString()); } - Assertions.assertThat(results).as("Some errors/warnings found").isEmpty(); + assertThat(results).as("Some errors/warnings found").isEmpty(); final KieBase kbase = KieBaseUtil.getDefaultKieBaseFromKieBuilder(kbuilder); final StatelessKieSession ksession = kbase.newStatelessKieSession(); @@ -84,9 +85,9 @@ public void test() { final Set resultSet = new HashSet(); ksession.execute((Object) resultSet); - Assertions.assertThat(resultSet.size()).as("Wrong number of rules was fired").isEqualTo(2); + assertThat(resultSet.size()).as("Wrong number of rules was fired").isEqualTo(2); for (String ruleName : new String[] { "rule1", "rule2" }) { - Assertions.assertThat(resultSet.contains(ruleName)).as("Rule " + ruleName + " was not fired!").isTrue(); + assertThat(resultSet.contains(ruleName)).as("Rule " + ruleName + " was not fired!").isTrue(); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MvelOverloadedMethodsUsageTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MvelOverloadedMethodsUsageTest.java index 04d9204f96f..90c8daa2724 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MvelOverloadedMethodsUsageTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MvelOverloadedMethodsUsageTest.java @@ -16,20 +16,24 @@ package org.drools.testcoverage.regression; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.drools.testcoverage.common.KieSessionTest; import org.drools.testcoverage.common.model.Overloaded; -import org.drools.testcoverage.common.util.*; +import org.drools.testcoverage.common.util.KieBaseTestConfiguration; +import org.drools.testcoverage.common.util.KieSessionTestConfiguration; +import org.drools.testcoverage.common.util.KieUtil; +import org.drools.testcoverage.common.util.TestParametersUtil; import org.junit.Test; import org.junit.runners.Parameterized; import org.kie.api.command.Command; import org.kie.api.io.Resource; import org.kie.internal.command.CommandFactory; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** * Test verifies that bug #843284 is fixed. Bug is about Mvel not choosing * correct overloaded method from multiple with same types of arguments but in @@ -75,8 +79,8 @@ public void testMvelOverloadedMethodsUsage() { commands.add(CommandFactory.newFireAllRules()); session.execute(CommandFactory.newBatchExecution(commands)); - Assertions.assertThat(firedRules.ruleFiredCount("MvelOverloadedMethods")).isEqualTo(1); - Assertions.assertThat(firedRules.ruleFiredCount("MvelOverloadedMethods2")).isEqualTo(1); + assertThat(firedRules.ruleFiredCount("MvelOverloadedMethods")).isEqualTo(1); + assertThat(firedRules.ruleFiredCount("MvelOverloadedMethods2")).isEqualTo(1); } @Override diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NonStringCompareTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NonStringCompareTest.java index 70a6f33a5cf..3f655265b18 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NonStringCompareTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NonStringCompareTest.java @@ -16,9 +16,10 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; import org.drools.testcoverage.common.util.KieUtil; @@ -67,7 +68,7 @@ public void testStringCompare() throws Exception { @Test public void testNonQuotedStringComapre() { final KieBuilder kbuilder = build("someString"); - Assertions.assertThat(kbuilder.getResults().getMessages(Level.ERROR).size()).isEqualTo(1); + assertThat(kbuilder.getResults().getMessages(Level.ERROR).size()).isEqualTo(1); } @Test @@ -79,7 +80,7 @@ private void testScenario(final String factFieldValueForDrl, final String factFi throws IllegalAccessException, InstantiationException { final KieBuilder kbuilder = build(factFieldValueForDrl); - Assertions.assertThat(kbuilder.getResults().getMessages(Level.ERROR)).isEmpty(); + assertThat(kbuilder.getResults().getMessages(Level.ERROR)).isEmpty(); final KieBase kbase = KieBaseUtil.getDefaultKieBaseFromKieBuilder(kbuilder); final KieSession ksession = kbase.newKieSession(); @@ -91,7 +92,7 @@ private void testScenario(final String factFieldValueForDrl, final String factFi ksession.insert(fact); final int count = ksession.fireAllRules(); - Assertions.assertThat(count).isEqualTo(1); + assertThat(count).isEqualTo(1); } finally { ksession.dispose(); } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NotInFusionTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NotInFusionTest.java index f645215b6cb..3929054450d 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NotInFusionTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NotInFusionTest.java @@ -16,17 +16,21 @@ package org.drools.testcoverage.regression; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Collection; + import org.drools.testcoverage.common.KieSessionTest; -import org.drools.testcoverage.common.util.*; +import org.drools.testcoverage.common.util.KieBaseTestConfiguration; +import org.drools.testcoverage.common.util.KieSessionTestConfiguration; +import org.drools.testcoverage.common.util.KieUtil; +import org.drools.testcoverage.common.util.TestParametersUtil; import org.junit.Test; import org.junit.runners.Parameterized; import org.kie.api.definition.type.FactType; import org.kie.api.io.Resource; import org.kie.api.runtime.KieSession; -import java.util.Collection; - // BZ 1009348 public class NotInFusionTest extends KieSessionTest { @@ -51,7 +55,7 @@ public void testNoEvent() { KieSession ksession = session.getStateful(); ksession.fireAllRules(); - Assertions.assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isTrue(); + assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isTrue(); } @Test @@ -61,7 +65,7 @@ public void testInsertFirst() throws Exception { insertNotEvent(ksession); ksession.fireAllRules(); - Assertions.assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isFalse(); + assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isFalse(); } @Test @@ -71,14 +75,14 @@ public void testInsertFirstAndAdd() throws Exception { insertNotEvent(ksession); ksession.fireAllRules(); - Assertions.assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isFalse(); + assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isFalse(); insertEvent(ksession); insertEvent(ksession); insertEvent(ksession); ksession.fireAllRules(); - Assertions.assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isTrue(); + assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isTrue(); } @Test @@ -88,7 +92,7 @@ public void testInsertFirstAndAdd2() throws Exception { insertNotEvent(ksession); ksession.fireAllRules(); - Assertions.assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isFalse(); + assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isFalse(); for (int i = 0; i < 3; i++) { insertNotEvent(ksession, "different value"); @@ -96,7 +100,7 @@ public void testInsertFirstAndAdd2() throws Exception { ksession.fireAllRules(); - Assertions.assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isTrue(); + assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isTrue(); } @Test @@ -106,16 +110,16 @@ public void testInsertFirstAndAdd3() throws Exception { insertNotEvent(ksession); ksession.fireAllRules(); - Assertions.assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isFalse(); - Assertions.assertThat(firedRules.isRuleFired(RULE3)).as(RULE3).isFalse(); + assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isFalse(); + assertThat(firedRules.isRuleFired(RULE3)).as(RULE3).isFalse(); for (int i = 0; i < 4; i++) { insertNotEvent(ksession, "different value"); ksession.fireAllRules(); } - Assertions.assertThat(firedRules.isRuleFired(RULE3)).as(RULE3).isTrue(); - Assertions.assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isTrue(); + assertThat(firedRules.isRuleFired(RULE3)).as(RULE3).isTrue(); + assertThat(firedRules.isRuleFired(RULE1)).as(RULE1).isTrue(); } @Test @@ -125,7 +129,7 @@ public void testNoEntryPoint() throws Exception { ksession.insert(createNotEvent(ksession, "value")); ksession.fireAllRules(); - Assertions.assertThat(firedRules.isRuleFired(RULE2)).isFalse(); + assertThat(firedRules.isRuleFired(RULE2)).isFalse(); for (int i = 0; i < 3; i++) { ksession.insert(createNotEvent(ksession, "different value")); @@ -133,7 +137,7 @@ public void testNoEntryPoint() throws Exception { ksession.fireAllRules(); - Assertions.assertThat(firedRules.isRuleFired(RULE2)).as(RULE2).isTrue(); + assertThat(firedRules.isRuleFired(RULE2)).as(RULE2).isTrue(); } private void insertNotEvent(KieSession ksession) throws Exception { diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/PropertyListenerTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/PropertyListenerTest.java index cabca59406d..a640af62d0b 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/PropertyListenerTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/PropertyListenerTest.java @@ -16,13 +16,14 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.assertThat; + import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; import org.drools.testcoverage.common.util.TestConstants; @@ -102,7 +103,7 @@ private void printAndAssertListenersFromPeople(final Collection people) LOGGER.info("Listener attached of type: " + listener); } // there should be no listeners - Assertions.assertThat(person.getBoundSupport().getPropertyChangeListeners()).isEmpty(); + assertThat(person.getBoundSupport().getPropertyChangeListeners()).isEmpty(); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SerializationWithCollectTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SerializationWithCollectTest.java index 7cc1620f6fb..d7e1521969f 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SerializationWithCollectTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SerializationWithCollectTest.java @@ -16,7 +16,11 @@ package org.drools.testcoverage.regression; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.fail; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -27,9 +31,6 @@ import org.kie.internal.marshalling.MarshallerFactory; import org.kie.internal.utils.KieHelper; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; - /** * Simple reproducer for BZ 1193600 - serialization of rules with collect. */ @@ -73,7 +74,7 @@ public void test() throws Exception { ksession = marshaller.unmarshall(bais); } } catch (NullPointerException e) { - Assertions.fail("Consider reopening BZ 1193600!", e); + fail("Consider reopening BZ 1193600!", e); } } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SessionInsertMultiThreadingTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SessionInsertMultiThreadingTest.java index 4fc6067ccd1..acc2ea78c83 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SessionInsertMultiThreadingTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SessionInsertMultiThreadingTest.java @@ -16,6 +16,8 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -23,7 +25,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.assertj.core.api.Assertions; + import org.drools.testcoverage.common.model.Message; import org.drools.testcoverage.common.model.Person; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; @@ -31,7 +33,6 @@ import org.drools.testcoverage.common.util.TestParametersUtil; import org.junit.After; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -203,8 +204,8 @@ public void run() { statelessKieSession.execute(kieCommands.newBatchExecution(commandList)); - Assertions.assertThat(p.getName()).isNotNull(); - Assertions.assertThat(m.getMessage()).isNotNull(); + assertThat(p.getName()).isNotNull(); + assertThat(m.getMessage()).isNotNull(); } } @@ -229,8 +230,8 @@ public void run() { ksession.fireAllRules(); - Assertions.assertThat(p.getName()).isNotNull(); - Assertions.assertThat(m.getMessage()).isNotNull(); + assertThat(p.getName()).isNotNull(); + assertThat(m.getMessage()).isNotNull(); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/StarImportTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/StarImportTest.java index 2f5a439fe84..2dec016a776 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/StarImportTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/StarImportTest.java @@ -16,10 +16,23 @@ package org.drools.testcoverage.regression; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.fail; +import static org.drools.testcoverage.common.util.KieUtil.getCommands; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.drools.testcoverage.common.KieSessionTest; import org.drools.testcoverage.common.model.TestEvent; -import org.drools.testcoverage.common.util.*; +import org.drools.testcoverage.common.util.KieBaseTestConfiguration; +import org.drools.testcoverage.common.util.KieSessionTestConfiguration; +import org.drools.testcoverage.common.util.KieUtil; +import org.drools.testcoverage.common.util.TestParametersUtil; import org.junit.Test; import org.junit.runners.Parameterized; import org.kie.api.command.Command; @@ -30,16 +43,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import static org.drools.testcoverage.common.util.KieUtil.getCommands; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - /** * Test suite for processing of facts imported using a "star" import and * declared in DRL at the same time. @@ -81,7 +84,7 @@ public void starImportedFactAlsoDeclaredInDRL() throws Exception { try { verify(ael, times(1)).afterMatchFired(any(AfterMatchFiredEvent.class)); } catch (WantedButNotInvoked e) { - Assertions.fail("The rule does not fire. For more information see BZ 973264", e); + fail("The rule does not fire. For more information see BZ 973264", e); } } diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/UnwantedStringConversionTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/UnwantedStringConversionTest.java index 08e68d14794..497017115d0 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/UnwantedStringConversionTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/UnwantedStringConversionTest.java @@ -16,9 +16,10 @@ package org.drools.testcoverage.regression; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.Collection; -import org.assertj.core.api.Assertions; import org.drools.testcoverage.common.listener.TrackingAgendaEventListener; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; import org.drools.testcoverage.common.util.KieBaseUtil; @@ -67,10 +68,10 @@ public void testStringToDecimalConversion() { ksession.insert(message); ksession.fireAllRules(); - Assertions.assertThat(listener.isRuleFired("R1")).isFalse(); - Assertions.assertThat(listener.isRuleFired("R2")).isFalse(); + assertThat(listener.isRuleFired("R1")).isFalse(); + assertThat(listener.isRuleFired("R2")).isFalse(); - Assertions.assertThat(listener.rulesCount()).isEqualTo(0); + assertThat(listener.rulesCount()).isEqualTo(0); } public static class Message { diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/XSDResourceTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/XSDResourceTest.java index f08be7e2d4b..3593160a842 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/XSDResourceTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/XSDResourceTest.java @@ -16,7 +16,8 @@ package org.drools.testcoverage.regression; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.Test; import org.kie.api.KieServices; import org.kie.api.runtime.KieContainer; @@ -33,7 +34,7 @@ public class XSDResourceTest { public void testXSDResourceNotBreakingCompilation() { final KieContainer kcontainer = KieServices.Factory.get().getKieClasspathContainer(); - Assertions.assertThat(kcontainer.getKieBase("kbaseXsdResource")) + assertThat(kcontainer.getKieBase("kbaseXsdResource")) .as("Created KieBase with XSD should not be null").isNotNull(); } } \ No newline at end of file diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/mvel/MvelLinkageErrorTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/mvel/MvelLinkageErrorTest.java index f4b22de6653..4e27d551673 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/mvel/MvelLinkageErrorTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/mvel/MvelLinkageErrorTest.java @@ -16,10 +16,12 @@ package org.drools.testcoverage.regression.mvel; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatCode; + import java.util.ArrayList; import java.util.List; -import org.assertj.core.api.Assertions; import org.junit.Test; import org.kie.api.KieServices; import org.kie.api.builder.KieFileSystem; @@ -48,7 +50,7 @@ public class MvelLinkageErrorTest { public void testMvelLinkageError() { final KieServices ks = KieServices.Factory.get(); final KieFileSystem kfs = ks.newKieFileSystem().write("src/main/resources/r1.drl", DRL); - Assertions.assertThatCode(() -> ks.newKieBuilder(kfs).buildAll()).doesNotThrowAnyException(); + assertThatCode(() -> ks.newKieBuilder(kfs).buildAll()).doesNotThrowAnyException(); final KieSession kieSession = ks.newKieContainer(ks.getRepository().getDefaultReleaseId()).newKieSession(); try { @@ -57,7 +59,7 @@ public void testMvelLinkageError() { kieSession.insert(TEST_FACT); final int fired = kieSession.fireAllRules(); - Assertions.assertThat(fired).as("Unexpected number of rules fired.").isEqualTo(1); + assertThat(fired).as("Unexpected number of rules fired.").isEqualTo(1); } finally { kieSession.dispose(); } From ce971f83855d9cbb803e47b375439e63e0ebfe07 Mon Sep 17 00:00:00 2001 From: Paolo Bizzarri Date: Wed, 23 Mar 2022 14:25:26 +0100 Subject: [PATCH 5/9] Fix assertj imports for remaining drools projects --- .../ancompiler/LargeAlphaNetworkTest.java | 5 +- .../ancompiler/MixedConstraintsTest.java | 5 +- .../MultipleIndexableConstraintsTest.java | 5 +- .../drools/ancompiler/RangeIndexANCTest.java | 18 ++--- .../ByteArrayResourceSerializationTest.java | 5 +- .../core/util/index/RangeIndexTest.java | 31 ++++---- .../SpreadsheetCompilerUnitTest.java | 44 +++++------ .../integrationtests/ImpactAnalysisTest.java | 18 ++--- .../mvel/asm/KnowledgeHelperFixerTest.java | 5 +- .../JpaPersistentStatefulSessionTest.java | 74 +++++++++---------- .../impl/RuleUnitDescriptionTest.java | 60 +++++++-------- .../AbstractExpressionEvaluatorTest.java | 21 +++--- .../BaseExpressionEvaluatorTest.java | 19 ++--- .../BaseExpressionOperatorTest.java | 13 ++-- .../backend/util/DMNSimulationUtilsTest.java | 10 +-- .../ScenarioSimulationXMLPersistenceTest.java | 22 +++--- .../template/DataProviderCompilerTest.java | 11 +-- .../drools/xml/support/XStreamXMLTest.java | 11 +-- 18 files changed, 194 insertions(+), 183 deletions(-) diff --git a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/LargeAlphaNetworkTest.java b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/LargeAlphaNetworkTest.java index 6d7137c6ec5..5552415c313 100644 --- a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/LargeAlphaNetworkTest.java +++ b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/LargeAlphaNetworkTest.java @@ -16,9 +16,10 @@ package org.drools.ancompiler; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; -import org.assertj.core.api.Assertions; import org.junit.Test; import org.kie.api.runtime.KieSession; @@ -52,7 +53,7 @@ public void testLargeCompiledAlphaNetwork() { try { ksession.fireAllRules(); - Assertions.assertThat(results).contains(a, b, c); + assertThat(results).contains(a, b, c); } finally { ksession.dispose(); } diff --git a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MixedConstraintsTest.java b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MixedConstraintsTest.java index aff35960f7c..75ea2127780 100644 --- a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MixedConstraintsTest.java +++ b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MixedConstraintsTest.java @@ -16,9 +16,10 @@ package org.drools.ancompiler; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; -import org.assertj.core.api.Assertions; import org.junit.Ignore; import org.junit.Test; import org.kie.api.runtime.KieSession; @@ -55,7 +56,7 @@ public void testMixedConstraints() { try { ksession.fireAllRules(); - Assertions.assertThat(results).contains(a, b, c); + assertThat(results).contains(a, b, c); } finally { ksession.dispose(); } diff --git a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MultipleIndexableConstraintsTest.java b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MultipleIndexableConstraintsTest.java index 4d18a69b4e1..1b6f6090d21 100644 --- a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MultipleIndexableConstraintsTest.java +++ b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MultipleIndexableConstraintsTest.java @@ -16,9 +16,10 @@ package org.drools.ancompiler; +import static org.assertj.core.api.Assertions.assertThat; + import java.util.ArrayList; -import org.assertj.core.api.Assertions; import org.junit.Test; import org.kie.api.runtime.KieSession; @@ -54,7 +55,7 @@ public void testMultipleIndexedConstraintTest() { try { ksession.fireAllRules(); - Assertions.assertThat(results).contains(a, b, c); + assertThat(results).contains(a, b, c); } finally { ksession.dispose(); } diff --git a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/RangeIndexANCTest.java b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/RangeIndexANCTest.java index 0b87102175d..3ecd3312b4a 100644 --- a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/RangeIndexANCTest.java +++ b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/RangeIndexANCTest.java @@ -16,10 +16,12 @@ package org.drools.ancompiler; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + import java.util.ArrayList; import java.util.List; -import org.assertj.core.api.Assertions; import org.junit.Test; import org.kie.api.KieBase; import org.kie.api.KieBaseConfiguration; @@ -28,8 +30,6 @@ import org.kie.api.runtime.KieSession; import org.kie.internal.conf.AlphaRangeIndexThresholdOption; -import static org.junit.Assert.assertEquals; - public class RangeIndexANCTest extends BaseModelTest { public RangeIndexANCTest(RUN_TYPE testRunType) { @@ -119,12 +119,12 @@ public void testMixedRangeHashAndOther() { ksession.insert(new Person("John", 18)); ksession.fireAllRules(); - Assertions.assertThat(results).containsOnly("test1", "test2", "test3"); + assertThat(results).containsOnly("test1", "test2", "test3"); results.clear(); ksession.insert(new Person("Paul", 60)); ksession.fireAllRules(); - Assertions.assertThat(results).containsOnly("test1", "test3", "test4", "test7"); + assertThat(results).containsOnly("test1", "test3", "test4", "test7"); } @Test @@ -171,12 +171,12 @@ public void testChainRange() { ksession.insert(new Person("John", 35)); ksession.fireAllRules(); - Assertions.assertThat(results).containsOnly("test3", "test5"); + assertThat(results).containsOnly("test3", "test5"); results.clear(); ksession.insert(new Person("Paul", 20)); ksession.fireAllRules(); - Assertions.assertThat(results).containsOnly("test2", "test3"); + assertThat(results).containsOnly("test2", "test3"); results.clear(); } @@ -221,12 +221,12 @@ public void testRangeWithBeta() { ksession.insert(new Person("John", 35)); ksession.fireAllRules(); - Assertions.assertThat(results).containsOnly("test1"); + assertThat(results).containsOnly("test1"); results.clear(); ksession.insert(new Person("Paul", 25)); ksession.fireAllRules(); - Assertions.assertThat(results).containsOnly("test1", "test2", "test3"); + assertThat(results).containsOnly("test1", "test2", "test3"); results.clear(); } } diff --git a/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceSerializationTest.java b/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceSerializationTest.java index 7c4def781c8..0072f89a605 100644 --- a/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceSerializationTest.java +++ b/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceSerializationTest.java @@ -1,5 +1,7 @@ package org.drools.core.io.impl; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -7,7 +9,6 @@ import java.io.ObjectOutputStream; import java.nio.charset.StandardCharsets; -import org.assertj.core.api.Assertions; import org.junit.Test; public class ByteArrayResourceSerializationTest { @@ -29,7 +30,7 @@ public void bytesAttributesIsStillSerializedDeserializedCorrectly() throws IOExc try (ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(serializedBar))){ desBar = (ByteArrayResource) ois.readObject(); } - Assertions.assertThat(desBar.getBytes()).isEqualTo(content); + assertThat(desBar.getBytes()).isEqualTo(content); } } diff --git a/drools-core/src/test/java/org/drools/core/util/index/RangeIndexTest.java b/drools-core/src/test/java/org/drools/core/util/index/RangeIndexTest.java index fb2d8644d42..319359aa2da 100644 --- a/drools-core/src/test/java/org/drools/core/util/index/RangeIndexTest.java +++ b/drools-core/src/test/java/org/drools/core/util/index/RangeIndexTest.java @@ -15,7 +15,8 @@ package org.drools.core.util.index; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + import org.drools.core.test.model.Person; import org.junit.Test; @@ -60,20 +61,20 @@ public void test() { index.addIndex(RangeIndex.IndexType.GT, 12, "E"); index.addIndex(RangeIndex.IndexType.LE, 4, "F"); - Assertions.assertThat(index.getValues(18)).containsExactlyInAnyOrder("A", "B", "C", "D", "E"); - Assertions.assertThat(index.getValues(60)).containsExactlyInAnyOrder("A", "C", "E"); - Assertions.assertThat(index.getValues(59)).containsExactlyInAnyOrder("A", "C", "D", "E"); - Assertions.assertThat(index.getValues(4)).containsExactlyInAnyOrder("B", "D", "F"); - Assertions.assertThat(index.getAllValues()).containsExactlyInAnyOrder("A", "B", "C", "D", "E", "F"); + assertThat(index.getValues(18)).containsExactlyInAnyOrder("A", "B", "C", "D", "E"); + assertThat(index.getValues(60)).containsExactlyInAnyOrder("A", "C", "E"); + assertThat(index.getValues(59)).containsExactlyInAnyOrder("A", "C", "D", "E"); + assertThat(index.getValues(4)).containsExactlyInAnyOrder("B", "D", "F"); + assertThat(index.getAllValues()).containsExactlyInAnyOrder("A", "B", "C", "D", "E", "F"); index.removeIndex(RangeIndex.IndexType.GT, 8); // "C" index.removeIndex(RangeIndex.IndexType.LT, 60); // "D" - Assertions.assertThat(index.getValues(18)).containsExactlyInAnyOrder("A", "B", "E"); - Assertions.assertThat(index.getValues(60)).containsExactlyInAnyOrder("A", "E"); - Assertions.assertThat(index.getValues(59)).containsExactlyInAnyOrder("A", "E"); - Assertions.assertThat(index.getValues(4)).containsExactlyInAnyOrder("B", "F"); - Assertions.assertThat(index.getAllValues()).containsExactlyInAnyOrder("A", "B", "E", "F"); + assertThat(index.getValues(18)).containsExactlyInAnyOrder("A", "B", "E"); + assertThat(index.getValues(60)).containsExactlyInAnyOrder("A", "E"); + assertThat(index.getValues(59)).containsExactlyInAnyOrder("A", "E"); + assertThat(index.getValues(4)).containsExactlyInAnyOrder("B", "F"); + assertThat(index.getAllValues()).containsExactlyInAnyOrder("A", "B", "E", "F"); } @Test @@ -84,9 +85,9 @@ public void testBoundary() { index.addIndex(RangeIndex.IndexType.GE, 40, "C"); index.addIndex(RangeIndex.IndexType.GT, 60, "D"); - Assertions.assertThat(index.getValues(25)).containsExactlyInAnyOrder("B"); - Assertions.assertThat(index.getValues(26)).isEmpty(); - Assertions.assertThat(index.getValues(39)).isEmpty(); - Assertions.assertThat(index.getValues(40)).containsExactlyInAnyOrder("C"); + assertThat(index.getValues(25)).containsExactlyInAnyOrder("B"); + assertThat(index.getValues(26)).isEmpty(); + assertThat(index.getValues(39)).isEmpty(); + assertThat(index.getValues(40)).containsExactlyInAnyOrder("C"); } } diff --git a/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java b/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java index 7786d744b65..0d4a008521c 100644 --- a/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java +++ b/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java @@ -16,6 +16,12 @@ package org.drools.decisiontable; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import java.io.InputStream; import java.util.ArrayList; import java.util.List; @@ -23,12 +29,11 @@ import java.util.regex.Pattern; import java.util.stream.Stream; -import org.assertj.core.api.Assertions; -import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.decisiontable.parser.DefaultRuleSheetListener; import org.drools.decisiontable.parser.RuleMatrixSheetListener; import org.drools.decisiontable.parser.RuleSheetParserUtil; import org.drools.decisiontable.parser.xls.ExcelParser; +import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.kiesession.rulebase.KnowledgeBaseFactory; import org.drools.template.model.Global; import org.drools.template.model.Import; @@ -45,11 +50,6 @@ import org.kie.internal.builder.KnowledgeBuilderFactory; import org.kie.internal.io.ResourceFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - /** * Some basic unit tests for converter utility. Note that some of this may still * use the drools 2.x syntax, as it is not compiled, only tested that it @@ -91,7 +91,7 @@ public void testMultilineActions() { final String drl = converter.compile(stream, InputType.XLS); - Assertions.assertThat(drl).doesNotContain("\\n"); + assertThat(drl).doesNotContain("\\n"); } @Test @@ -101,7 +101,7 @@ public void testMultilineActionsAndMultiLineInConstant() { final String drl = converter.compile(stream, InputType.XLS); - Assertions.assertThat(drl).contains(" **\n** "); + assertThat(drl).contains(" **\n** "); } @Test @@ -111,7 +111,7 @@ public void testMultilineActionsAndMultiLineAsConstant() { final String drl = converter.compile(stream, InputType.XLS); - Assertions.assertThat(drl).contains(" **\\n** "); + assertThat(drl).contains(" **\\n** "); } @Test @@ -121,8 +121,8 @@ public void testMultilineCommentsInDescription() { final String drl = converter.compile(stream, InputType.XLS); - Assertions.assertThat(drl).containsSubsequence("/* Say", "Hello */", "/* Say", "Goobye */"); - Assertions.assertThat(drl).doesNotContain("// Say"); + assertThat(drl).containsSubsequence("/* Say", "Hello */", "/* Say", "Goobye */"); + assertThat(drl).doesNotContain("// Say"); } @Test @@ -132,15 +132,15 @@ public void testMultilineComplexCommentsInDescription() { final String drl = converter.compile(stream, InputType.XLS); - Assertions.assertThat(drl).containsSubsequence("/* Do these actions:", + assertThat(drl).containsSubsequence("/* Do these actions:", "- Print Greeting", "- Set params: {message:'bye cruel world', status:'bye'} */", "/* Print message: \"Bye!\"", "Author: james@company.org */"); - Assertions.assertThat(drl).doesNotContain("* - Print Greeting"); - Assertions.assertThat(drl).doesNotContain("* - Set params: {message:'bye cruel world', status:'bye'}"); - Assertions.assertThat(drl).doesNotContain("* Author: james@company.org"); + assertThat(drl).doesNotContain("* - Print Greeting"); + assertThat(drl).doesNotContain("* - Set params: {message:'bye cruel world', status:'bye'}"); + assertThat(drl).doesNotContain("* Author: james@company.org"); } @Test @@ -522,7 +522,7 @@ public void testNoConstraintsEmptyCells() { "end"; //No Pattern generated when all constraints have empty values - Assertions.assertThat(expected).isEqualToIgnoringWhitespace(drl); + assertThat(expected).isEqualToIgnoringWhitespace(drl); } @Test @@ -570,7 +570,7 @@ public void testNoConstraintsSpacesInCells() { "end"; //No Pattern generated when all constraints have empty values - Assertions.assertThat(expected).isEqualToIgnoringWhitespace(drl); + assertThat(expected).isEqualToIgnoringWhitespace(drl); } @Test @@ -637,7 +637,7 @@ public void testNoConstraintsDelimitedSpacesInCells() { " then\n" + "end"; - Assertions.assertThat(expected).isEqualToIgnoringWhitespace(drl); + assertThat(expected).isEqualToIgnoringWhitespace(drl); } @Test @@ -695,7 +695,7 @@ public void testForAllConstraintQuoteRemoval() { " System.out.println(false);\n" + "end\n"; - Assertions.assertThat(expected).isEqualToIgnoringWhitespace(drl); + assertThat(expected).isEqualToIgnoringWhitespace(drl); } public static class IntHolder { @@ -806,7 +806,7 @@ public void checkLhsBuilderFixValue() { " System.out.println(m.getMessage());\n" + "end\n"; - Assertions.assertThat(expected).isEqualToIgnoringWhitespace(drl); + assertThat(expected).isEqualToIgnoringWhitespace(drl); } @Test @@ -815,7 +815,7 @@ public void testLhsOrder() { final SpreadsheetCompiler converter = new SpreadsheetCompiler(); String drl = converter.compile("/data/LhsOrder.drl.xls", InputType.XLS); - Assertions.assertThat(Stream.of(drl.split("\n")).map(String::trim).toArray()) + assertThat(Stream.of(drl.split("\n")).map(String::trim).toArray()) .as("Lhs order is wrong") .containsSequence("accumulate(Person(name == \"John\", $a : age); $max:max($a))", "$p:Person(name == \"John\", age == $max)"); diff --git a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/ImpactAnalysisTest.java b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/ImpactAnalysisTest.java index 0ac860ffaa3..227c34ff81e 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/ImpactAnalysisTest.java +++ b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/ImpactAnalysisTest.java @@ -16,10 +16,14 @@ package org.drools.impact.analysis.integrationtests; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.impact.analysis.graph.TextReporter.INDENT; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + import java.util.Arrays; import java.util.List; -import org.assertj.core.api.Assertions; import org.drools.impact.analysis.graph.Graph; import org.drools.impact.analysis.graph.ImpactAnalysisHelper; import org.drools.impact.analysis.graph.ModelToGraphConverter; @@ -30,10 +34,6 @@ import org.drools.impact.analysis.parser.ModelBuilder; import org.junit.Test; -import static org.drools.impact.analysis.graph.TextReporter.INDENT; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - public class ImpactAnalysisTest extends AbstractGraphTest { private static final String ORDER_RULES = "package mypkg;\n" + @@ -112,7 +112,7 @@ public void testOrderRules() { // TextReporter test String hierarchyText = TextReporter.toHierarchyText(impactedSubGraph); List lines = Arrays.asList(hierarchyText.split(System.lineSeparator())); - Assertions.assertThat(lines).containsExactlyInAnyOrder("R2[*]", + assertThat(lines).containsExactlyInAnyOrder("R2[*]", INDENT + "R3[+]", INDENT + INDENT + "R6[+]", INDENT + INDENT + "R5[+]", @@ -120,7 +120,7 @@ public void testOrderRules() { String flatText = TextReporter.toFlatText(impactedSubGraph); List lines2 = Arrays.asList(flatText.split(System.lineSeparator())); - Assertions.assertThat(lines2).containsExactlyInAnyOrder("R2[*]", + assertThat(lines2).containsExactlyInAnyOrder("R2[*]", "R3[+]", "R6[+]", "R5[+]"); @@ -147,7 +147,7 @@ public void testOrderRulesBackward() { // TextReporter test String hierarchyText = TextReporter.toHierarchyText(impactingSubGraph); List lines = Arrays.asList(hierarchyText.split(System.lineSeparator())); - Assertions.assertThat(lines).containsExactlyInAnyOrder("R1[!]", + assertThat(lines).containsExactlyInAnyOrder("R1[!]", INDENT + "R3[!]", INDENT + INDENT + "R5[@]", INDENT + INDENT + INDENT + "(R3)", @@ -158,7 +158,7 @@ public void testOrderRulesBackward() { String flatText = TextReporter.toFlatText(impactingSubGraph); List lines2 = Arrays.asList(flatText.split(System.lineSeparator())); - Assertions.assertThat(lines2).containsExactlyInAnyOrder("R1[!]", + assertThat(lines2).containsExactlyInAnyOrder("R1[!]", "R2[!]", "R3[!]", "R4[!]", diff --git a/drools-mvel/src/test/java/org/drools/mvel/asm/KnowledgeHelperFixerTest.java b/drools-mvel/src/test/java/org/drools/mvel/asm/KnowledgeHelperFixerTest.java index 881c19b6101..e670fce9c66 100644 --- a/drools-mvel/src/test/java/org/drools/mvel/asm/KnowledgeHelperFixerTest.java +++ b/drools-mvel/src/test/java/org/drools/mvel/asm/KnowledgeHelperFixerTest.java @@ -14,7 +14,8 @@ package org.drools.mvel.asm; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.Test; public class KnowledgeHelperFixerTest { @@ -22,7 +23,7 @@ public class KnowledgeHelperFixerTest { private static final KnowledgeHelperFixer fixer = new KnowledgeHelperFixer(); private void assertEqualsIgnoreWhitespace(final String expected, final String actual) { - Assertions.assertThat(expected).isEqualToIgnoringWhitespace(actual); + assertThat(expected).isEqualToIgnoringWhitespace(actual); } @Test diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java index 46b009534c9..46c7caab404 100644 --- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java +++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java @@ -15,6 +15,16 @@ */ package org.drools.persistence.kie.persistence.session; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.persistence.util.DroolsPersistenceUtil.DROOLS_PERSISTENCE_UNIT_NAME; +import static org.drools.persistence.util.DroolsPersistenceUtil.OPTIMISTIC_LOCKING; +import static org.drools.persistence.util.DroolsPersistenceUtil.PESSIMISTIC_LOCKING; +import static org.drools.persistence.util.DroolsPersistenceUtil.createEnvironment; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -28,7 +38,6 @@ import javax.naming.InitialContext; import javax.transaction.UserTransaction; -import org.assertj.core.api.Assertions; import org.drools.core.SessionConfiguration; import org.drools.core.command.impl.CommandBasedStatefulKnowledgeSession; import org.drools.core.command.impl.FireAllRulesInterceptor; @@ -63,15 +72,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.drools.persistence.util.DroolsPersistenceUtil.DROOLS_PERSISTENCE_UNIT_NAME; -import static org.drools.persistence.util.DroolsPersistenceUtil.OPTIMISTIC_LOCKING; -import static org.drools.persistence.util.DroolsPersistenceUtil.PESSIMISTIC_LOCKING; -import static org.drools.persistence.util.DroolsPersistenceUtil.createEnvironment; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - @RunWith(Parameterized.class) public class JpaPersistentStatefulSessionTest { @@ -569,44 +569,44 @@ public void testFamilyRulesSerialization() throws Exception { // asserts List manList = listHolder.getManList(); - Assertions.assertThat(manList.size()).isEqualTo(4); - Assertions.assertThat(manList.contains("Adam")).isTrue(); - Assertions.assertThat(manList.contains("Kain")).isTrue(); - Assertions.assertThat(manList.contains("Abel")).isTrue(); - Assertions.assertThat(manList.contains("Josef")).isTrue(); + assertThat(manList.size()).isEqualTo(4); + assertThat(manList.contains("Adam")).isTrue(); + assertThat(manList.contains("Kain")).isTrue(); + assertThat(manList.contains("Abel")).isTrue(); + assertThat(manList.contains("Josef")).isTrue(); List personList = listHolder.getPersonList(); - Assertions.assertThat(personList.size()).isEqualTo(5); - Assertions.assertThat(personList.contains("Adam")).isTrue(); - Assertions.assertThat(personList.contains("Kain")).isTrue(); - Assertions.assertThat(personList.contains("Abel")).isTrue(); - Assertions.assertThat(personList.contains("Josef")).isTrue(); - Assertions.assertThat(personList.contains("Eva")).isTrue(); + assertThat(personList.size()).isEqualTo(5); + assertThat(personList.contains("Adam")).isTrue(); + assertThat(personList.contains("Kain")).isTrue(); + assertThat(personList.contains("Abel")).isTrue(); + assertThat(personList.contains("Josef")).isTrue(); + assertThat(personList.contains("Eva")).isTrue(); List parentList = listHolder.getParentList(); - Assertions.assertThat(parentList.size()).isEqualTo(5); - Assertions.assertThat(parentList.contains("Adam")).isTrue(); - Assertions.assertThat(parentList.contains("Eva")).isTrue(); - Assertions.assertThat(parentList.contains("Abel")).isTrue(); + assertThat(parentList.size()).isEqualTo(5); + assertThat(parentList.contains("Adam")).isTrue(); + assertThat(parentList.contains("Eva")).isTrue(); + assertThat(parentList.contains("Abel")).isTrue(); List motherList = listHolder.getMotherList(); - Assertions.assertThat(motherList.size()).isEqualTo(2); - Assertions.assertThat(motherList.contains("Eva")).isTrue(); + assertThat(motherList.size()).isEqualTo(2); + assertThat(motherList.contains("Eva")).isTrue(); List fatherList = listHolder.getFatherList(); - Assertions.assertThat(fatherList.size()).isEqualTo(3); - Assertions.assertThat(fatherList.contains("Adam")).isTrue(); - Assertions.assertThat(fatherList.contains("Abel")).isTrue(); - Assertions.assertThat(fatherList.contains("Eva")).isFalse(); - Assertions.assertThat(fatherList.contains("Kain")).isFalse(); - Assertions.assertThat(fatherList.contains("Josef")).isFalse(); + assertThat(fatherList.size()).isEqualTo(3); + assertThat(fatherList.contains("Adam")).isTrue(); + assertThat(fatherList.contains("Abel")).isTrue(); + assertThat(fatherList.contains("Eva")).isFalse(); + assertThat(fatherList.contains("Kain")).isFalse(); + assertThat(fatherList.contains("Josef")).isFalse(); List grandparentList = listHolder.getGrandparentList(); - Assertions.assertThat(grandparentList.size()).isEqualTo(2); - Assertions.assertThat(grandparentList.contains("Eva")).isTrue(); - Assertions.assertThat(grandparentList.contains("Adam")).isTrue(); + assertThat(grandparentList.size()).isEqualTo(2); + assertThat(grandparentList.contains("Eva")).isTrue(); + assertThat(grandparentList.contains("Adam")).isTrue(); - Assertions.assertThat(listHolder.isGrandmaBlessedAgeTriggered()).isTrue(); + assertThat(listHolder.isGrandmaBlessedAgeTriggered()).isTrue(); } /** diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/RuleUnitDescriptionTest.java b/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/RuleUnitDescriptionTest.java index aa0d76090ef..9a39108ac43 100755 --- a/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/RuleUnitDescriptionTest.java +++ b/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/RuleUnitDescriptionTest.java @@ -15,12 +15,14 @@ */ package org.drools.ruleunits.impl; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import java.math.BigDecimal; import java.util.Collection; import java.util.List; import java.util.Optional; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.kie.internal.ruleunit.RuleUnitVariable; @@ -36,24 +38,24 @@ public void prepareRuleUnitDescr() { @Test public void getRuleUnitClass() { - Assertions.assertThat(ruleUnitDescr.getRuleUnitClass()).isEqualTo(TestRuleUnit.class); + assertThat(ruleUnitDescr.getRuleUnitClass()).isEqualTo(TestRuleUnit.class); } @Test public void getRuleUnitName() { - Assertions.assertThat(ruleUnitDescr.getRuleUnitName()).isEqualTo(TestRuleUnit.class.getName()); + assertThat(ruleUnitDescr.getRuleUnitName()).isEqualTo(TestRuleUnit.class.getName()); } @Test public void getRuleUnitVariable() { - Assertions.assertThat(ruleUnitDescr.getVar("number")).isNotNull(); - Assertions.assertThatThrownBy(() -> ruleUnitDescr.getVar("undefinedField")).isInstanceOf(UndefinedRuleUnitVariableException.class); + assertThat(ruleUnitDescr.getVar("number")).isNotNull(); + assertThatThrownBy(() -> ruleUnitDescr.getVar("undefinedField")).isInstanceOf(UndefinedRuleUnitVariableException.class); } @Test public void getEntryPointId() { final String entryPointId = ruleUnitDescr.getEntryPointName("nonexisting"); - Assertions.assertThat(entryPointId).isNotNull(); + assertThat(entryPointId).isNotNull(); assertEntryPointIdExists("numbersArray"); assertEntryPointIdExists("number"); @@ -64,7 +66,7 @@ public void getEntryPointId() { @Test public void getDatasourceType() { final Optional> dataSourceType = ruleUnitDescr.getDatasourceType("nonexisting"); - Assertions.assertThat(dataSourceType).isNotPresent(); + assertThat(dataSourceType).isNotPresent(); assertDataSourceType("strings", String.class); } @@ -72,7 +74,7 @@ public void getDatasourceType() { @Test public void getVarType() { final Optional> varType = ruleUnitDescr.getVarType("nonexisting"); - Assertions.assertThat(varType).isNotPresent(); + assertThat(varType).isNotPresent(); assertVarType("number", BigDecimal.class); assertVarType("numbersArray", Integer[].class); @@ -82,54 +84,54 @@ public void getVarType() { @Test public void hasVar() { - Assertions.assertThat(ruleUnitDescr.hasVar("nonexisting")).isFalse(); - Assertions.assertThat(ruleUnitDescr.hasVar("numbers")).isFalse(); - Assertions.assertThat(ruleUnitDescr.hasVar("number")).isTrue(); - Assertions.assertThat(ruleUnitDescr.hasVar("numbersArray")).isTrue(); - Assertions.assertThat(ruleUnitDescr.hasVar("stringList")).isTrue(); - Assertions.assertThat(ruleUnitDescr.hasVar("simpleFactList")).isTrue(); + assertThat(ruleUnitDescr.hasVar("nonexisting")).isFalse(); + assertThat(ruleUnitDescr.hasVar("numbers")).isFalse(); + assertThat(ruleUnitDescr.hasVar("number")).isTrue(); + assertThat(ruleUnitDescr.hasVar("numbersArray")).isTrue(); + assertThat(ruleUnitDescr.hasVar("stringList")).isTrue(); + assertThat(ruleUnitDescr.hasVar("simpleFactList")).isTrue(); } @Test public void getUnitVars() { final Collection unitVars = ruleUnitDescr.getUnitVars(); - Assertions.assertThat(unitVars).isNotEmpty(); - Assertions.assertThat(unitVars).hasSize(6); - Assertions.assertThat(unitVars).containsExactlyInAnyOrder("strings", "bound", "number", "numbersArray", "stringList", "simpleFactList"); + assertThat(unitVars).isNotEmpty(); + assertThat(unitVars).hasSize(6); + assertThat(unitVars).containsExactlyInAnyOrder("strings", "bound", "number", "numbersArray", "stringList", "simpleFactList"); } @Test public void getUnitVarAccessors() { final Collection unitVarAccessors = ruleUnitDescr.getUnitVarDeclarations(); - Assertions.assertThat(unitVarAccessors).isNotEmpty(); - Assertions.assertThat(unitVarAccessors).hasSize(6); - Assertions.assertThat(unitVarAccessors) + assertThat(unitVarAccessors).isNotEmpty(); + assertThat(unitVarAccessors).hasSize(6); + assertThat(unitVarAccessors) .extracting("name", String.class) .containsExactlyInAnyOrder("strings", "bound", "number", "numbersArray", "stringList", "simpleFactList"); } @Test public void hasDataSource() { - Assertions.assertThat(ruleUnitDescr.hasDataSource("nonexisting")).isFalse(); - Assertions.assertThat(ruleUnitDescr.hasDataSource("numbers")).isFalse(); - Assertions.assertThat(ruleUnitDescr.hasDataSource("strings")).isTrue(); + assertThat(ruleUnitDescr.hasDataSource("nonexisting")).isFalse(); + assertThat(ruleUnitDescr.hasDataSource("numbers")).isFalse(); + assertThat(ruleUnitDescr.hasDataSource("strings")).isTrue(); } private void assertEntryPointIdExists(final String entryPointIdName) { final String entryPointId = ruleUnitDescr.getEntryPointName(entryPointIdName); - Assertions.assertThat(entryPointId).isNotNull(); - Assertions.assertThat(TestRuleUnit.class.getName() + "." + entryPointIdName).isEqualTo(entryPointId); + assertThat(entryPointId).isNotNull(); + assertThat(TestRuleUnit.class.getName() + "." + entryPointIdName).isEqualTo(entryPointId); } private void assertDataSourceType(final String dataSourceName, final Class expectedType) { final Optional> dataSourceType = ruleUnitDescr.getDatasourceType(dataSourceName); - Assertions.assertThat(dataSourceType).isPresent(); - Assertions.assertThat(expectedType).isEqualTo(dataSourceType.get()); + assertThat(dataSourceType).isPresent(); + assertThat(expectedType).isEqualTo(dataSourceType.get()); } private void assertVarType(final String varName, final Class expectedType) { final Optional> variableTable = ruleUnitDescr.getVarType(varName); - Assertions.assertThat(variableTable).isPresent(); - Assertions.assertThat(expectedType).isEqualTo(variableTable.get()); + assertThat(variableTable).isPresent(); + assertThat(expectedType).isEqualTo(variableTable.get()); } } diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/AbstractExpressionEvaluatorTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/AbstractExpressionEvaluatorTest.java index 00eaa58a508..87d038f805c 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/AbstractExpressionEvaluatorTest.java +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/AbstractExpressionEvaluatorTest.java @@ -15,6 +15,14 @@ */ package org.drools.scenariosimulation.backend.expression; +import static java.util.Collections.emptyList; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import java.util.AbstractMap; import java.util.ArrayList; import java.util.Collections; @@ -25,20 +33,13 @@ import java.util.Map; import java.util.Set; +import org.junit.Test; + import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.IntNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; -import org.assertj.core.api.Assertions; -import org.junit.Test; - -import static java.util.Collections.emptyList; -import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; public class AbstractExpressionEvaluatorTest { @@ -204,7 +205,7 @@ public void isSimpleTypeNode() { @Test public void getSimpleTypeNodeTextValue() { - Assertions.assertThatThrownBy(() -> expressionEvaluatorLocal.getSimpleTypeNodeTextValue(new ArrayNode(factory))) + assertThatThrownBy(() -> expressionEvaluatorLocal.getSimpleTypeNodeTextValue(new ArrayNode(factory))) .isInstanceOf(IllegalArgumentException.class) .hasMessage("Parameter does not contains a simple type"); diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionEvaluatorTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionEvaluatorTest.java index 7289e75326a..a24e7950936 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionEvaluatorTest.java +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionEvaluatorTest.java @@ -16,6 +16,14 @@ package org.drools.scenariosimulation.backend.expression; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -24,17 +32,10 @@ import java.util.List; import java.util.Map; -import com.fasterxml.jackson.databind.node.TextNode; -import org.assertj.core.api.Assertions; import org.drools.scenariosimulation.backend.model.ListMapClass; import org.junit.Test; -import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import com.fasterxml.jackson.databind.node.TextNode; public class BaseExpressionEvaluatorTest { @@ -60,7 +61,7 @@ public void createObjectTest() { assertNotNull(expressionEvaluator.createObject(String.class.getCanonicalName(), Collections.emptyList())); assertTrue(expressionEvaluator.createObject(Map.class.getCanonicalName(), Arrays.asList(String.class.getCanonicalName(), String.class.getCanonicalName())) instanceof Map); - Assertions.assertThatThrownBy(() -> expressionEvaluator.createObject("com.invalid.class.Name", Collections.emptyList())).isInstanceOf(IllegalArgumentException.class) + assertThatThrownBy(() -> expressionEvaluator.createObject("com.invalid.class.Name", Collections.emptyList())).isInstanceOf(IllegalArgumentException.class) .hasMessage("Impossible to instantiate com.invalid.class.Name"); } diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionOperatorTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionOperatorTest.java index 6c44d7d2fbe..67674b84d4f 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionOperatorTest.java +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionOperatorTest.java @@ -16,12 +16,6 @@ package org.drools.scenariosimulation.backend.expression; -import java.time.LocalDate; -import java.util.Arrays; - -import org.assertj.core.api.Assertions; -import org.junit.Test; - import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.drools.scenariosimulation.backend.expression.BaseExpressionOperator.EQUALS; import static org.drools.scenariosimulation.backend.expression.BaseExpressionOperator.LIST_OF_CONDITION; @@ -35,6 +29,11 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import java.time.LocalDate; +import java.util.Arrays; + +import org.junit.Test; + public class BaseExpressionOperatorTest { private static final ClassLoader classLoader = BaseExpressionOperatorTest.class.getClassLoader(); @@ -44,7 +43,7 @@ public void evaluateLiteralExpression() { Arrays.stream(values()) .filter(e -> !EQUALS.equals(e)) .forEach(operator -> { - Assertions.assertThatThrownBy( + assertThatThrownBy( () -> operator.evaluateLiteralExpression(String.class.getCanonicalName(), " Test ", classLoader)) .isInstanceOf(IllegalStateException.class) .hasMessageEndingWith(" operator cannot be used in a GIVEN clause"); diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DMNSimulationUtilsTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DMNSimulationUtilsTest.java index 5b450563e72..0d78119b08a 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DMNSimulationUtilsTest.java +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DMNSimulationUtilsTest.java @@ -15,21 +15,21 @@ */ package org.drools.scenariosimulation.backend.util; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.assertj.core.api.Assertions; import org.junit.Test; import org.junit.runner.RunWith; import org.kie.api.io.Resource; import org.kie.dmn.api.core.DMNModel; import org.mockito.junit.MockitoJUnitRunner; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - @RunWith(MockitoJUnitRunner.class) public class DMNSimulationUtilsTest { @@ -44,7 +44,7 @@ public void findDMNModel() { List impossibleToFind = Arrays.asList(new StringBuilder("not/find").reverse().toString().split("/")); - Assertions.assertThatThrownBy(() -> DMNSimulationUtils.findDMNModel(models, impossibleToFind, 1)) + assertThatThrownBy(() -> DMNSimulationUtils.findDMNModel(models, impossibleToFind, 1)) .isInstanceOf(ImpossibleToFindDMNException.class) .hasMessage("Retrieving the DMNModel has failed. Make sure the used DMN asset does not " + "produce any compilation errors and that the project does not " + diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java index c7ae860df10..3a25cd9e59a 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java @@ -15,16 +15,7 @@ */ package org.drools.scenariosimulation.backend.util; -import java.util.List; -import java.util.Map; - -import org.assertj.core.api.Assertions; -import org.drools.scenariosimulation.api.model.ScenarioSimulationModel; -import org.drools.scenariosimulation.api.model.imports.Import; -import org.junit.Test; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.drools.scenariosimulation.api.utils.ConstantsHolder.BACKGROUND_NODE; import static org.drools.scenariosimulation.api.utils.ConstantsHolder.DMO_SESSION_NODE; import static org.drools.scenariosimulation.api.utils.ConstantsHolder.FACT_MAPPINGS_NODE; @@ -43,6 +34,15 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import java.util.List; +import java.util.Map; + +import org.drools.scenariosimulation.api.model.ScenarioSimulationModel; +import org.drools.scenariosimulation.api.model.imports.Import; +import org.junit.Test; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + public class ScenarioSimulationXMLPersistenceTest { protected ScenarioSimulationXMLPersistence instance = ScenarioSimulationXMLPersistence.getInstance(); @@ -288,7 +288,7 @@ private void commonCheckFactMappingValueType(Document document, String scesimMod @Test public void migrateIfNecessary() throws Exception { - Assertions.assertThatThrownBy(() -> instance.migrateIfNecessary("")) + assertThatThrownBy(() -> instance.migrateIfNecessary("")) .isInstanceOf(IllegalArgumentException.class) .hasMessage("Version 9999999999.99999999999 of the file is not supported. Current version is " + ScenarioSimulationXMLPersistence.getCurrentVersion()); diff --git a/drools-templates/src/test/java/org/drools/template/DataProviderCompilerTest.java b/drools-templates/src/test/java/org/drools/template/DataProviderCompilerTest.java index 79820c38370..c947f87fb5d 100644 --- a/drools-templates/src/test/java/org/drools/template/DataProviderCompilerTest.java +++ b/drools-templates/src/test/java/org/drools/template/DataProviderCompilerTest.java @@ -15,6 +15,8 @@ package org.drools.template; +import static org.assertj.core.api.Assertions.assertThat; + import java.io.InputStream; import java.util.ArrayList; import java.util.Collection; @@ -23,7 +25,6 @@ import java.util.List; import java.util.Map; -import org.assertj.core.api.Assertions; import org.drools.template.parser.Column; import org.drools.template.parser.DefaultTemplateContainer; import org.drools.template.parser.TemplateContainer; @@ -138,7 +139,7 @@ public void testCompiler() throws Exception { final String drl = converter.compile(tdp, "/templates/rule_template_1.drl"); - Assertions.assertThat(EXPECTED_RULES.toString()).isEqualToIgnoringWhitespace(drl); + assertThat(EXPECTED_RULES.toString()).isEqualToIgnoringWhitespace(drl); } @Test @@ -147,7 +148,7 @@ public void testCompileIndentedKeywords() throws Exception { final DataProviderCompiler converter = new DataProviderCompiler(); final String drl = converter.compile( tdp, "/templates/rule_template_indented.drl" ); - Assertions.assertThat(EXPECTED_RULES.toString()).isEqualToIgnoringWhitespace(drl); + assertThat(EXPECTED_RULES.toString()).isEqualToIgnoringWhitespace(drl); } @Test @@ -174,7 +175,7 @@ public void testCompilerMaps() throws Exception { this.getClass().getResourceAsStream("/templates/rule_template_1.drl"); final String drl = converter.compile(maps, templateStream); - Assertions.assertThat(EXPECTED_RULES.toString()).isEqualToIgnoringWhitespace(drl); + assertThat(EXPECTED_RULES.toString()).isEqualToIgnoringWhitespace(drl); } public static class OBJ { @@ -242,7 +243,7 @@ public void testCompilerObjs() throws Exception { } final String drl = converter.compile(objs, templateStream); - Assertions.assertThat(EXPECTED_RULES.toString()).isEqualToIgnoringWhitespace(drl); + assertThat(EXPECTED_RULES.toString()).isEqualToIgnoringWhitespace(drl); } } diff --git a/drools-xml-support/src/test/java/org/drools/xml/support/XStreamXMLTest.java b/drools-xml-support/src/test/java/org/drools/xml/support/XStreamXMLTest.java index 8f32586ff80..8384ce41ded 100644 --- a/drools-xml-support/src/test/java/org/drools/xml/support/XStreamXMLTest.java +++ b/drools-xml-support/src/test/java/org/drools/xml/support/XStreamXMLTest.java @@ -15,6 +15,9 @@ */ package org.drools.xml.support; +import static org.assertj.core.api.Assertions.assertThat; +import static org.kie.utll.xml.XStreamUtils.createTrustingXStream; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -24,8 +27,6 @@ import java.util.Map; import java.util.Set; -import com.thoughtworks.xstream.XStream; -import org.assertj.core.api.Assertions; import org.drools.core.base.RuleNameEndsWithAgendaFilter; import org.drools.core.command.runtime.process.StartProcessCommand; import org.drools.core.command.runtime.rule.AgendaGroupSetFocusCommand; @@ -47,7 +48,7 @@ import org.kie.api.runtime.rule.FactHandle; import org.kie.api.runtime.rule.QueryResults; -import static org.kie.utll.xml.XStreamUtils.createTrustingXStream; +import com.thoughtworks.xstream.XStream; public class XStreamXMLTest { @@ -381,7 +382,7 @@ public void testUpdateCommand() { " \n" + " \n" + ""; - Assertions.assertThat(expected).isEqualToIgnoringWhitespace(xmlString); + assertThat(expected).isEqualToIgnoringWhitespace(xmlString); UpdateCommand cmd2 = (UpdateCommand) xstream.fromXML(xmlString); Assert.assertEquals(factHandle.toExternalForm(), cmd2.getHandle().toExternalForm()); @@ -400,7 +401,7 @@ public void testFireAllRulesCommand() { " true\n" + " \n" + ""; - Assertions.assertThat(expected).isEqualToIgnoringWhitespace(xmlString); + assertThat(expected).isEqualToIgnoringWhitespace(xmlString); FireAllRulesCommand cmd2 = (FireAllRulesCommand) xstream.fromXML(xmlString); Assert.assertEquals(100, cmd2.getMax()); From ed22eb7715f132b58ddb33e1c2cc0edf5053c682 Mon Sep 17 00:00:00 2001 From: Paolo Bizzarri Date: Wed, 23 Mar 2022 18:12:34 +0100 Subject: [PATCH 6/9] Fixed errors with commits --- .../tests/SegmentationMaxMiningTest.java | 2 +- .../tests/SimpleScorecardCategoricalTest.java | 68 +------------------ 2 files changed, 2 insertions(+), 68 deletions(-) diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMaxMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMaxMiningTest.java index 51cdfc3dff1..f04b5beff08 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMaxMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMaxMiningTest.java @@ -73,6 +73,6 @@ public void testSegmentationMedianMiningTest() { PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - `pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); + assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isEqualTo(result); } } diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardCategoricalTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardCategoricalTest.java index 9a98feae953..e1e3c51b348 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardCategoricalTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardCategoricalTest.java @@ -82,73 +82,7 @@ public static Collection data() { public void testSimpleScorecardCategorical() { final Map inputData = new HashMap<>(); inputData.put("input1", input1); - inputData.put("input2", input2); * Copyright 2021 Red Hat, Inc. and/or its affiliates. - package org.kie.pmml.models.scorecard.tests; - - import java.util.Arrays; - import java.util.Collection; - import java.util.HashMap; - import java.util.Map; - - import static org.assertj.core.api.Assertions.assertThat; - import org.assertj.core.data.Percentage; - import org.junit.BeforeClass; - import org.junit.Test; - import org.junit.runner.RunWith; - import org.junit.runners.Parameterized; - import org.kie.api.pmml.PMML4Result; - import org.kie.pmml.api.runtime.PMMLRuntime; - import org.kie.pmml.models.tests.AbstractPMMLTest; - - @RunWith(Parameterized.class) - public class MultipleAirconditioningScorecardTest extends AbstractPMMLTest { - private static final String FILE_NAME = "MultipleScorecard.pmml"; - private static final String MODEL_NAME = "Forecast Score"; - private static final String TARGET_FIELD = "forecastScore"; - private static PMMLRuntime pmmlRuntime; - - private String period; - private String worldContinent; - private boolean precipitation; - private double humidity; - private double score; - - public MultipleAirconditioningScorecardTest(String period, String worldContinent, boolean precipitation, double humidity, - double score) { - this.period = period; - this.worldContinent = worldContinent; - this.precipitation = precipitation; - this.humidity = humidity; - this.score = score; - } - - @BeforeClass - public static void setupClass() { - pmmlRuntime = getPMMLRuntime(FILE_NAME); - } - - @Parameterized.Parameters - public static Collection data() { - return Arrays.asList(new Object[][]{ - {"SPRING", "EUROPE", true, 25.0, 9.5}, - {"SUMMER", "ASIA", true, 35.0, 10.0}, - }); - } - - @Test - public void testAirconditioningScorecard() { - final Map inputData = new HashMap<>(); - inputData.put("period", period); - inputData.put("worldcontinent", worldContinent); - inputData.put("precipitation", precipitation); - inputData.put("humidity", humidity); - PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); - - assertThat(pmml4Result.getResultVariables().get(TARGET_FIELD)).isNotNull(); - assertThat((double) (pmml4Result.getResultVariables().get(TARGET_FIELD))) - .isCloseTo(score, Percentage.withPercentage(0.1)); - } - } + inputData.put("input2", input2); PMML4Result pmml4Result = evaluate(pmmlRuntime, inputData, MODEL_NAME); From 717ea5752791aaff6cce6dd6710c2de6667fd042 Mon Sep 17 00:00:00 2001 From: Paolo Bizzarri Date: Thu, 7 Apr 2022 16:23:44 +0200 Subject: [PATCH 7/9] Restored correct import order --- .../ancompiler/LargeAlphaNetworkTest.java | 4 +- .../ancompiler/MixedConstraintsTest.java | 4 +- .../MultipleIndexableConstraintsTest.java | 4 +- .../drools/ancompiler/RangeIndexANCTest.java | 6 +- .../ByteArrayResourceSerializationTest.java | 4 +- .../core/util/index/RangeIndexTest.java | 4 +- .../SpreadsheetCompilerUnitTest.java | 12 ++-- .../integrationtests/ImpactAnalysisTest.java | 10 ++-- .../drools/modelcompiler/AccumulateTest.java | 16 +++--- .../drools/modelcompiler/CompilerTest.java | 18 +++--- .../ConstraintNormalizationTest.java | 8 +-- .../org/drools/modelcompiler/EvalTest.java | 6 +- .../modelcompiler/ExternalisedLambdaTest.java | 8 +-- .../org/drools/modelcompiler/FromTest.java | 10 ++-- .../org/drools/modelcompiler/GroupByTest.java | 12 ++-- .../drools/modelcompiler/HalfBinaryTest.java | 6 +- .../IncrementalCompilationTest.java | 6 +- .../modelcompiler/MaterializedLambdaTest.java | 6 +- .../drools/modelcompiler/MvelDialectTest.java | 12 ++-- .../modelcompiler/MvelOperatorsTest.java | 12 ++-- .../modelcompiler/NamedConsequencesTest.java | 10 ++-- .../NullSafeDereferencingTest.java | 6 +- .../org/drools/modelcompiler/OOPathTest.java | 6 +- .../java/org/drools/modelcompiler/OrTest.java | 12 ++-- .../drools/modelcompiler/PatternDSLTest.java | 56 +++++++++---------- .../org/drools/modelcompiler/QueryTest.java | 8 +-- .../modelcompiler/RuleAttributesTest.java | 8 +-- .../drools/modelcompiler/ToStringTest.java | 20 +++---- .../modelcompiler/TypeCoercionTest.java | 8 +-- .../modelcompiler/TypeObjectCoercionTest.java | 10 ++-- .../drlxparse/CoercedExpressionTest.java | 4 +- .../mvel/asm/KnowledgeHelperFixerTest.java | 4 +- .../JpaPersistentStatefulSessionTest.java | 20 +++---- .../impl/RuleUnitDescriptionTest.java | 6 +- .../AbstractExpressionEvaluatorTest.java | 19 +++---- .../BaseExpressionEvaluatorTest.java | 17 +++--- .../BaseExpressionOperatorTest.java | 10 ++-- .../backend/util/DMNSimulationUtilsTest.java | 8 +-- .../ScenarioSimulationXMLPersistenceTest.java | 18 +++--- .../template/DataProviderCompilerTest.java | 4 +- .../kieci/withdomain/KJarLoadingTest.java | 4 +- .../kieci/withoutdomain/KJarLoadingTest.java | 4 +- .../integrationtests/AccumulateTest.java | 18 +++--- .../AlphaNodeRangeIndexingTest.java | 10 ++-- .../AnnotationsOnPatternTest.java | 10 ++-- .../integrationtests/AnnotationsTest.java | 12 ++-- .../compiler/integrationtests/CepEspTest.java | 22 ++++---- .../integrationtests/CepJavaTypeTest.java | 6 +- .../integrationtests/ConstraintsTest.java | 8 +-- .../JoinNodeRangeIndexingTest.java | 10 ++-- .../integrationtests/StreamsTest.java | 23 ++++---- .../TimerAndCalendarExceptionTest.java | 6 +- .../TimerAndCalendarWithPseudoTimeTest.java | 10 ++-- .../integrationtests/drl/BindTest.java | 16 +++--- .../integrationtests/drl/ConsequenceTest.java | 16 +++--- .../integrationtests/drl/DRLCepTest.java | 4 +- .../integrationtests/drl/DRLTest.java | 14 ++--- .../drl/DrlSpecificFeaturesTest.java | 8 +-- .../integrationtests/drl/ExceptionTest.java | 4 +- .../integrationtests/drl/ImportsTest.java | 8 +-- .../integrationtests/drl/PatternTest.java | 10 ++-- .../equalitymode/EqualityModeTest.java | 4 +- .../AddRemoveRulesAddDeleteFactsTest.java | 4 +- .../AddRemoveRulesAdvOperatorsTest.java | 4 +- .../AddRemoveRulesTest.java | 18 +++--- .../AddRemoveTestCases.java | 4 +- .../integrationtests/operators/FromTest.java | 10 ++-- .../NativeJavaCompilerSettingsTest.java | 4 +- .../mvel/compiler/compiler/DrlParserTest.java | 8 +-- .../compiler/xml/rules/DumperTest.java | 8 +-- .../compiler/xml/rules/DumperTestHelper.java | 6 +- .../xml/rules/XmlPackageReaderTest.java | 12 ++-- ...ojectTransformUrlToFileSystemPathTest.java | 4 +- .../MemoryKieModuleResourceProviderTest.java | 4 +- .../mvel/compiler/kproject/ReleaseIdTest.java | 10 ++-- .../mvel/compiler/lang/RuleParserTest.java | 7 +-- .../compiler/lang/api/DescrBuilderTest.java | 22 ++++---- .../lang/descr/ConnectiveDescrTest.java | 4 +- .../compiler/oopath/OOPathAccumulateTest.java | 4 +- .../compiler/oopath/OOPathBenchmarkTest.java | 4 +- .../mvel/compiler/oopath/OOPathBindTest.java | 4 +- .../mvel/compiler/oopath/OOPathCastTest.java | 6 +- .../compiler/oopath/OOPathMultilevelTest.java | 4 +- .../compiler/oopath/OOPathQueriesTest.java | 4 +- .../compiler/oopath/OOPathReactiveTest.java | 14 ++--- .../mvel/compiler/oopath/OOPathTest.java | 12 ++-- .../mvel/integrationtests/ExpirationTest.java | 8 +-- .../mvel/integrationtests/FunctionsTest.java | 8 +-- .../mvel/integrationtests/JittingTest.java | 6 +- .../mvel/integrationtests/KieBuilderTest.java | 12 ++-- .../integrationtests/KieContainerTest.java | 12 ++-- .../mvel/integrationtests/Misc2Test.java | 20 +++---- .../NamedConsequencesTest.java | 10 ++-- .../PropertySpecificTest.java | 18 +++--- .../integrationtests/XSDResourceTest.java | 4 +- .../AbstractConcurrentInsertionsTest.java | 4 +- .../concurrency/AbstractConcurrentTest.java | 4 +- .../ConcurrentBasesParallelTest.java | 4 +- ...aTypeEvaluationConcurrentSessionsTest.java | 4 +- .../concurrency/MultithreadTest.java | 6 +- .../SharedSessionParallelTest.java | 4 +- .../phreak/PhreakLiaNodeTest.java | 4 +- .../integrationtests/session/DeleteTest.java | 12 ++-- .../session/SessionsPoolTest.java | 14 ++--- .../testcoverage/common/util/KieUtil.java | 4 +- .../testcoverage/common/util/Session.java | 5 +- .../functional/ActivationGroupTest.java | 4 +- .../functional/DecisionTableTest.java | 6 +- .../functional/DeclarativeAgendaTest.java | 4 +- .../functional/DuplicityTest.java | 4 +- .../functional/FactHandleTest.java | 4 +- .../functional/KieContainerDefaultsTest.java | 6 +- .../functional/KieContainerTest.java | 6 +- .../functional/KieRepositoryTest.java | 4 +- .../functional/LiveQueriesBadResultTest.java | 4 +- .../LogicalInsertFromCollectionTest.java | 4 +- .../functional/QueryBadResultTest.java | 8 +-- .../functional/ResourcesTest.java | 4 +- .../functional/RuleTemplateTest.java | 4 +- .../functional/TemplatesTest.java | 4 +- .../testcoverage/functional/UnicodeTest.java | 4 +- .../DecisionTableKieContainerTest.java | 4 +- .../functional/oopath/OOPathCepTest.java | 6 +- .../oopath/OOPathLogicalBranchesTest.java | 4 +- .../functional/oopath/OOPathSmokeTest.java | 4 +- .../AbstractCompositeRestrictionTest.java | 4 +- .../AccumulateRecalculationTest.java | 4 +- .../regression/DateExtendingFactTest.java | 4 +- .../regression/DeclarationWithOrTest.java | 4 +- ...serializationWithCompositeTriggerTest.java | 4 +- .../regression/DroolsGcCausesNPETest.java | 6 +- .../regression/EqualityKeyOverrideTest.java | 4 +- .../regression/EscapesInMetadataTest.java | 4 +- .../EventDeserializationInPastTest.java | 4 +- .../regression/FixedPatternTest.java | 4 +- .../regression/FromGenericCollectionTest.java | 4 +- .../regression/FusionAfterBeforeTest.java | 4 +- .../regression/GlobalOnLHSTest.java | 4 +- .../regression/InaccurateComparisonTest.java | 4 +- .../LogicalInsertionsSerializationTest.java | 6 +- .../MultiRestrictionPatternTest.java | 6 +- .../MultipleKieBaseListenersTest.java | 4 +- .../MultipleSalienceUpdateFactTest.java | 6 +- .../regression/MultipleSheetsLoadingTest.java | 4 +- .../MvelOverloadedMethodsUsageTest.java | 4 +- .../regression/NonStringCompareTest.java | 4 +- .../regression/NotInFusionTest.java | 4 +- .../regression/PropertyListenerTest.java | 4 +- .../SerializationWithCollectTest.java | 4 +- .../SessionInsertMultiThreadingTest.java | 4 +- .../regression/StarImportTest.java | 14 ++--- .../UnwantedStringConversionTest.java | 4 +- .../regression/XSDResourceTest.java | 4 +- .../regression/mvel/MvelLinkageErrorTest.java | 6 +- .../drools/xml/support/XStreamXMLTest.java | 7 +-- .../core/DMNDecisionTableHitPolicyTest.java | 8 +-- .../internal/utils/DRGAnalysisUtilsTest.java | 12 ++-- .../core/stronglytyped/AnnotationsTest.java | 7 +-- .../dmn/feel/jandex/AbstractJandexTest.java | 4 +- .../functions/interval/FormulasTest.java | 3 +- .../model/api/AssociationDirectionTest.java | 4 +- .../api/DecisionTableOrientationTest.java | 4 +- .../kie/dmn/model/api/FunctionKindTest.java | 4 +- .../model/api/dmndi/AlignmentKindTest.java | 4 +- .../dmn/model/api/dmndi/KnownColorTest.java | 4 +- .../model/jandex/KieDMNModelJandexTest.java | 4 +- .../kie/dmn/openapi/FEELSchemaEnumTest.java | 4 +- .../org/kie/dmn/openapi/ProcessItemTest.java | 9 ++- .../kie/dmn/pmml/DMNKMeansModelPMMLTest.java | 4 +- .../kie/dmn/pmml/DMNMiningModelPMMLTest.java | 4 +- .../kie/dmn/pmml/DMNNaiveBayesPMMLTest.java | 4 +- .../dmn/pmml/DMNNeuralNetworkPMMLTest.java | 4 +- .../kie/dmn/pmml/DMNRegressionPMMLTest.java | 4 +- .../org/kie/dmn/pmml/DMNTreePMMLTest.java | 4 +- .../dmn/validation/AbstractValidatorTest.java | 8 +-- .../org/kie/dmn/validation/ValidatorTest.java | 14 ++--- .../DMNDTAnalysisExceptionTest.java | 4 +- .../validation/dtanalysis/IntervalTest.java | 4 +- .../dtanalysis/model/NullBoundImplTest.java | 4 +- .../tests/ClusterWithTransformationsTest.java | 6 +- .../tests/EuclideanDistanceTest.java | 4 +- .../tests/MultipleClustersSameClassTest.java | 4 +- .../tests/SingleIrisKMeansClusteringTest.java | 4 +- .../tests/AirconditioningScorecardTest.java | 4 +- .../tests/BasicComplexPartialScoreTest.java | 4 +- .../CompoundNestedPredicateScorecardTest.java | 4 +- .../tests/CompoundPredicateScorecardTest.java | 4 +- .../MultipleAirconditioningScorecardTest.java | 4 +- ...eCompoundNestedPredicateScorecardTest.java | 4 +- .../tests/NestedComplexPartialScoreTest.java | 4 +- .../tests/SimpleScorecardCategoricalTest.java | 6 +- .../SimpleScorecardMixedVariablesTest.java | 4 +- .../scorecard/tests/SimpleScorecardTest.java | 6 +- ...impleScorecardWithTransformationsTest.java | 4 +- .../tree/tests/BostonHousingDataTreeTest.java | 4 +- .../tree/tests/CompoundPredicateTreeTest.java | 4 +- .../drools/tree/tests/IrisDataTreeTest.java | 4 +- .../tree/tests/PlanActivityTreeTest.java | 4 +- .../ReturnLastPredictionStrategyTreeTest.java | 4 +- .../tree/tests/SampleMineTreeModelTest.java | 4 +- ...eMineTreeModelWithTransformationsTest.java | 6 +- .../tests/SimpleClassificationTreeTest.java | 4 +- .../tests/SimpleSetPredicateTreeTest.java | 4 +- .../mining/tests/MiningModelChainTest.java | 4 +- .../mining/tests/MiningModelSummedTest.java | 4 +- .../tests/MiningWithNestedRefersTest.java | 4 +- .../pmml/mining/tests/MixedMiningTest.java | 6 +- .../mining/tests/MultipleMixedMiningTest.java | 4 +- .../tests/MultiplePredicatesMiningTest.java | 8 +-- .../mining/tests/PredicatesMiningTest.java | 8 +-- .../RandomForestClassifierMiningTest.java | 4 +- ...entationClassificationSelectFirstTest.java | 4 +- .../SegmentationMajorityVoteMiningTest.java | 4 +- .../tests/SegmentationMaxMiningTest.java | 4 +- .../tests/SegmentationMeanMiningTest.java | 4 +- .../tests/SegmentationMedian2MiningTest.java | 4 +- .../tests/SegmentationMedianMiningTest.java | 4 +- .../SegmentationSelectFirstMiningTest.java | 4 +- .../tests/SegmentationSumMiningTest.java | 4 +- .../CategoricalVariablesRegressionTest.java | 4 +- ...gressionSampleWithTransformationsTest.java | 6 +- .../tests/LogisticRegressionIrisDataTest.java | 4 +- ...gisticRegressionNoneNormalizationTest.java | 4 +- ...cRegressionSimplemaxNormalizationTest.java | 4 +- ...ticRegressionSoftmaxNormalizationTest.java | 4 +- .../tests/LogisticRegressionTest.java | 4 +- .../tests/MissingDataRegressionTest.java | 4 +- .../tests/MixedVariablesRegressionTest.java | 4 +- ...pleCategoricalVariablesRegressionTest.java | 4 +- .../tests/MultipleLogisticRegressionTest.java | 4 +- ...cVariablesDecimalAndNegativeCoefsTest.java | 4 +- .../NumericVariablesLinearRegressionTest.java | 4 +- ...ericVariablesPolynomialRegressionTest.java | 4 +- .../tests/OrderApprovalRegressionTest.java | 4 +- .../tests/PredictorTermRegressionTest.java | 4 +- .../tests/RegressionNormalizationExpTest.java | 4 +- .../RegressionNormalizationLogitTest.java | 4 +- .../RegressionNormalizationSoftmaxTest.java | 4 +- .../tests/AirconditioningScorecardTest.java | 4 +- .../tests/BasicComplexPartialScoreTest.java | 4 +- .../CompoundNestedPredicateScorecardTest.java | 4 +- .../tests/CompoundPredicateScorecardTest.java | 4 +- .../MultipleAirconditioningScorecardTest.java | 4 +- ...eCompoundNestedPredicateScorecardTest.java | 4 +- .../tests/NestedComplexPartialScoreTest.java | 4 +- .../tests/SimpleScorecardCategoricalTest.java | 7 +-- .../SimpleScorecardMixedVariablesTest.java | 4 +- .../scorecard/tests/SimpleScorecardTest.java | 6 +- ...impleScorecardWithTransformationsTest.java | 4 +- .../tree/tests/BostonHousingDataTreeTest.java | 4 +- .../tree/tests/CompoundPredicateTreeTest.java | 4 +- .../models/tree/tests/IrisDataTreeTest.java | 4 +- .../ReturnLastPredictionStrategyTreeTest.java | 4 +- .../tree/tests/SampleMineTreeModelTest.java | 4 +- ...eMineTreeModelWithTransformationsTest.java | 6 +- .../tests/SimpleClassificationTreeTest.java | 4 +- .../tests/SimpleSetPredicateTreeTest.java | 6 +- .../pmml/models/tree/tests/TestTreeTest.java | 4 +- 258 files changed, 846 insertions(+), 852 deletions(-) diff --git a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/LargeAlphaNetworkTest.java b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/LargeAlphaNetworkTest.java index 5552415c313..e2236a42bc1 100644 --- a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/LargeAlphaNetworkTest.java +++ b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/LargeAlphaNetworkTest.java @@ -16,13 +16,13 @@ package org.drools.ancompiler; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import org.junit.Test; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + public class LargeAlphaNetworkTest extends BaseModelTest { public LargeAlphaNetworkTest(RUN_TYPE testRunType) { diff --git a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MixedConstraintsTest.java b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MixedConstraintsTest.java index 75ea2127780..84038bef6f5 100644 --- a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MixedConstraintsTest.java +++ b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MixedConstraintsTest.java @@ -16,14 +16,14 @@ package org.drools.ancompiler; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import org.junit.Ignore; import org.junit.Test; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + public class MixedConstraintsTest extends BaseModelTest { public MixedConstraintsTest(RUN_TYPE testRunType) { diff --git a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MultipleIndexableConstraintsTest.java b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MultipleIndexableConstraintsTest.java index 1b6f6090d21..55a03a36458 100644 --- a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MultipleIndexableConstraintsTest.java +++ b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MultipleIndexableConstraintsTest.java @@ -16,13 +16,13 @@ package org.drools.ancompiler; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import org.junit.Test; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + public class MultipleIndexableConstraintsTest extends BaseModelTest { public MultipleIndexableConstraintsTest(RUN_TYPE testRunType) { diff --git a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/RangeIndexANCTest.java b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/RangeIndexANCTest.java index 3ecd3312b4a..48885152398 100644 --- a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/RangeIndexANCTest.java +++ b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/RangeIndexANCTest.java @@ -16,9 +16,6 @@ package org.drools.ancompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.List; @@ -30,6 +27,9 @@ import org.kie.api.runtime.KieSession; import org.kie.internal.conf.AlphaRangeIndexThresholdOption; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + public class RangeIndexANCTest extends BaseModelTest { public RangeIndexANCTest(RUN_TYPE testRunType) { diff --git a/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceSerializationTest.java b/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceSerializationTest.java index 0072f89a605..32278b9f569 100644 --- a/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceSerializationTest.java +++ b/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceSerializationTest.java @@ -1,7 +1,5 @@ package org.drools.core.io.impl; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -11,6 +9,8 @@ import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + public class ByteArrayResourceSerializationTest { //FIX https://issues.redhat.com/browse/DROOLS-5681 diff --git a/drools-core/src/test/java/org/drools/core/util/index/RangeIndexTest.java b/drools-core/src/test/java/org/drools/core/util/index/RangeIndexTest.java index 319359aa2da..a5c3a30a45f 100644 --- a/drools-core/src/test/java/org/drools/core/util/index/RangeIndexTest.java +++ b/drools-core/src/test/java/org/drools/core/util/index/RangeIndexTest.java @@ -15,11 +15,11 @@ package org.drools.core.util.index; -import static org.assertj.core.api.Assertions.assertThat; - import org.drools.core.test.model.Person; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + public class RangeIndexTest { // This DRL is not actually used but test() simulates this DRL use case. diff --git a/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java b/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java index 0d4a008521c..eb66832ad59 100644 --- a/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java +++ b/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java @@ -16,12 +16,6 @@ package org.drools.decisiontable; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.io.InputStream; import java.util.ArrayList; import java.util.List; @@ -50,6 +44,12 @@ import org.kie.internal.builder.KnowledgeBuilderFactory; import org.kie.internal.io.ResourceFactory; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * Some basic unit tests for converter utility. Note that some of this may still * use the drools 2.x syntax, as it is not compiled, only tested that it diff --git a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/ImpactAnalysisTest.java b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/ImpactAnalysisTest.java index 227c34ff81e..fda8f2c96a3 100644 --- a/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/ImpactAnalysisTest.java +++ b/drools-impact-analysis/drools-impact-analysis-itests/src/test/java/org/drools/impact/analysis/integrationtests/ImpactAnalysisTest.java @@ -16,11 +16,6 @@ package org.drools.impact.analysis.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.impact.analysis.graph.TextReporter.INDENT; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - import java.util.Arrays; import java.util.List; @@ -34,6 +29,11 @@ import org.drools.impact.analysis.parser.ModelBuilder; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.impact.analysis.graph.TextReporter.INDENT; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + public class ImpactAnalysisTest extends AbstractGraphTest { private static final String ORDER_RULES = "package mypkg;\n" + diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/AccumulateTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/AccumulateTest.java index c29931a47e3..5f3d966cfd9 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/AccumulateTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/AccumulateTest.java @@ -16,14 +16,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; @@ -71,6 +63,14 @@ import org.kie.api.runtime.rule.AccumulateFunction; import org.kie.api.runtime.rule.FactHandle; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class AccumulateTest extends BaseModelTest { public AccumulateTest( RUN_TYPE testRunType ) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/CompilerTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/CompilerTest.java index fa9c8de1ac4..ecd1a7adee2 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/CompilerTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/CompilerTest.java @@ -16,15 +16,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.math.BigDecimal; import java.math.BigInteger; import java.util.ArrayList; @@ -59,6 +50,15 @@ import org.kie.api.runtime.process.ProcessContext; import org.kie.api.runtime.rule.FactHandle; +import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class CompilerTest extends BaseModelTest { public CompilerTest( RUN_TYPE testRunType ) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ConstraintNormalizationTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ConstraintNormalizationTest.java index 0ec3c36f206..dc5f647af60 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ConstraintNormalizationTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ConstraintNormalizationTest.java @@ -16,10 +16,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; @@ -38,6 +34,10 @@ import org.kie.api.definition.type.FactType; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class ConstraintNormalizationTest extends BaseModelTest { public ConstraintNormalizationTest(RUN_TYPE testRunType) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/EvalTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/EvalTest.java index 1476586c4f2..b6ea8dbfec4 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/EvalTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/EvalTest.java @@ -16,9 +16,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; - import java.util.Collection; import org.drools.modelcompiler.domain.CalcFact; @@ -28,6 +25,9 @@ import org.junit.Test; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + public class EvalTest extends BaseModelTest { public EvalTest( RUN_TYPE testRunType ) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ExternalisedLambdaTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ExternalisedLambdaTest.java index 8b6b4398273..79699f5a18c 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ExternalisedLambdaTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ExternalisedLambdaTest.java @@ -16,10 +16,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -43,6 +39,10 @@ import org.kie.api.runtime.conf.ClockTypeOption; import org.kie.api.time.SessionPseudoClock; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * This test class enables CheckNonExternalisedLambda option * so it will throw NonExternalisedLambdaFoundException if non-externalized lambda is found. diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/FromTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/FromTest.java index b69042e28af..04ba10db585 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/FromTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/FromTest.java @@ -16,11 +16,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.util.AbstractMap; import java.util.ArrayList; import java.util.Arrays; @@ -46,6 +41,11 @@ import org.junit.Test; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class FromTest extends BaseModelTest { public FromTest( RUN_TYPE testRunType ) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/GroupByTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/GroupByTest.java index bc5ea9b1911..c56adbf9fd4 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/GroupByTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/GroupByTest.java @@ -14,12 +14,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.model.DSL.from; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -71,6 +65,12 @@ import org.kie.internal.event.rule.RuleEventListener; import org.kie.internal.event.rule.RuleEventManager; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.model.DSL.from; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class GroupByTest { @Test diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/HalfBinaryTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/HalfBinaryTest.java index 722f37965b2..80569c1531b 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/HalfBinaryTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/HalfBinaryTest.java @@ -14,9 +14,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.List; @@ -25,6 +22,9 @@ import org.junit.Test; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + public class HalfBinaryTest extends BaseModelTest { public HalfBinaryTest( RUN_TYPE testRunType ) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/IncrementalCompilationTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/IncrementalCompilationTest.java index 2aa992542ff..97008b3846d 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/IncrementalCompilationTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/IncrementalCompilationTest.java @@ -16,9 +16,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; - import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -33,6 +30,9 @@ import org.kie.api.runtime.KieSession; import org.kie.internal.builder.conf.AlphaNetworkCompilerOption; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + public class IncrementalCompilationTest extends BaseModelTest { public IncrementalCompilationTest( RUN_TYPE testRunType ) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MaterializedLambdaTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MaterializedLambdaTest.java index f3785c0381a..abc551f55b9 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MaterializedLambdaTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MaterializedLambdaTest.java @@ -1,8 +1,5 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; - import java.time.Instant; import java.util.Date; @@ -10,6 +7,9 @@ import org.junit.Test; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + public class MaterializedLambdaTest extends BaseModelTest { public MaterializedLambdaTest(RUN_TYPE testRunType) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelDialectTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelDialectTest.java index 1951e285d56..7dbd1d34c45 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelDialectTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelDialectTest.java @@ -16,12 +16,6 @@ package org.drools.modelcompiler; -import static java.math.BigDecimal.valueOf; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.math.BigDecimal; import java.math.BigInteger; import java.util.ArrayList; @@ -41,6 +35,12 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; +import static java.math.BigDecimal.valueOf; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class MvelDialectTest extends BaseModelTest { public MvelDialectTest( RUN_TYPE testRunType ) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelOperatorsTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelOperatorsTest.java index 3a43dd34c62..378a75c0113 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelOperatorsTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/MvelOperatorsTest.java @@ -16,12 +16,6 @@ package org.drools.modelcompiler; -import static java.util.Arrays.asList; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -33,6 +27,12 @@ import org.kie.api.builder.Results; import org.kie.api.runtime.KieSession; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class MvelOperatorsTest extends BaseModelTest { public MvelOperatorsTest( RUN_TYPE testRunType ) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NamedConsequencesTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NamedConsequencesTest.java index c0a39f98a75..5271d6387b4 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NamedConsequencesTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NamedConsequencesTest.java @@ -16,11 +16,6 @@ package org.drools.modelcompiler; -import static java.util.Arrays.asList; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -35,6 +30,11 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class NamedConsequencesTest extends BaseModelTest { public NamedConsequencesTest( RUN_TYPE testRunType ) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NullSafeDereferencingTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NullSafeDereferencingTest.java index 1377473abe2..e6c879f5c78 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NullSafeDereferencingTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/NullSafeDereferencingTest.java @@ -16,9 +16,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -30,6 +27,9 @@ import org.junit.Test; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + public class NullSafeDereferencingTest extends BaseModelTest { public NullSafeDereferencingTest( RUN_TYPE testRunType ) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OOPathTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OOPathTest.java index 7bd6f1fe0a1..734195a25cc 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OOPathTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OOPathTest.java @@ -16,9 +16,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.modelcompiler.domain.Employee.createEmployee; - import java.util.ArrayList; import java.util.List; @@ -32,6 +29,9 @@ import org.junit.Test; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.modelcompiler.domain.Employee.createEmployee; + public class OOPathTest extends BaseModelTest { public OOPathTest( RUN_TYPE testRunType ) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OrTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OrTest.java index 2216f931b83..912d65da579 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OrTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/OrTest.java @@ -16,12 +16,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.modelcompiler.domain.Employee.createEmployee; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.List; @@ -32,6 +26,12 @@ import org.kie.api.builder.Results; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.modelcompiler.domain.Employee.createEmployee; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class OrTest extends BaseModelTest { public OrTest( RUN_TYPE testRunType ) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/PatternDSLTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/PatternDSLTest.java index 8125f6cce46..58713d38618 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/PatternDSLTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/PatternDSLTest.java @@ -16,34 +16,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.model.DSL.accFunction; -import static org.drools.model.DSL.accumulate; -import static org.drools.model.DSL.after; -import static org.drools.model.DSL.and; -import static org.drools.model.DSL.declarationOf; -import static org.drools.model.DSL.execute; -import static org.drools.model.DSL.globalOf; -import static org.drools.model.DSL.not; -import static org.drools.model.DSL.on; -import static org.drools.model.DSL.or; -import static org.drools.model.DSL.reactiveFrom; -import static org.drools.model.DSL.supply; -import static org.drools.model.DSL.valueOf; -import static org.drools.model.PatternDSL.alphaIndexedBy; -import static org.drools.model.PatternDSL.betaIndexedBy; -import static org.drools.model.PatternDSL.pattern; -import static org.drools.model.PatternDSL.query; -import static org.drools.model.PatternDSL.reactOn; -import static org.drools.model.PatternDSL.rule; -import static org.drools.model.PatternDSL.when; -import static org.drools.modelcompiler.BaseModelTest.getObjectsIntoList; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -97,6 +69,34 @@ import org.kie.api.runtime.rule.QueryResults; import org.kie.api.time.SessionPseudoClock; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.model.DSL.accFunction; +import static org.drools.model.DSL.accumulate; +import static org.drools.model.DSL.after; +import static org.drools.model.DSL.and; +import static org.drools.model.DSL.declarationOf; +import static org.drools.model.DSL.execute; +import static org.drools.model.DSL.globalOf; +import static org.drools.model.DSL.not; +import static org.drools.model.DSL.on; +import static org.drools.model.DSL.or; +import static org.drools.model.DSL.reactiveFrom; +import static org.drools.model.DSL.supply; +import static org.drools.model.DSL.valueOf; +import static org.drools.model.PatternDSL.alphaIndexedBy; +import static org.drools.model.PatternDSL.betaIndexedBy; +import static org.drools.model.PatternDSL.pattern; +import static org.drools.model.PatternDSL.query; +import static org.drools.model.PatternDSL.reactOn; +import static org.drools.model.PatternDSL.rule; +import static org.drools.model.PatternDSL.when; +import static org.drools.modelcompiler.BaseModelTest.getObjectsIntoList; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; + public class PatternDSLTest { @Test diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/QueryTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/QueryTest.java index bba9b103738..5cb6416ddbb 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/QueryTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/QueryTest.java @@ -16,10 +16,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -44,6 +40,10 @@ import org.kie.api.runtime.rule.QueryResultsRow; import org.kie.api.runtime.rule.Variable; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class QueryTest extends BaseModelTest { public QueryTest( RUN_TYPE testRunType ) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/RuleAttributesTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/RuleAttributesTest.java index 11f398d1cbb..61a705ee688 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/RuleAttributesTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/RuleAttributesTest.java @@ -16,10 +16,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -35,6 +31,10 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class RuleAttributesTest extends BaseModelTest { public RuleAttributesTest( RUN_TYPE testRunType ) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ToStringTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ToStringTest.java index 7a12f40f9cc..f66281cd02b 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ToStringTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/ToStringTest.java @@ -15,16 +15,6 @@ */ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.model.DSL.accFunction; -import static org.drools.model.DSL.accumulate; -import static org.drools.model.DSL.declarationOf; -import static org.drools.model.DSL.on; -import static org.drools.model.PatternDSL.alphaIndexedBy; -import static org.drools.model.PatternDSL.betaIndexedBy; -import static org.drools.model.PatternDSL.pattern; -import static org.drools.model.PatternDSL.rule; - import java.util.function.Supplier; import org.drools.core.base.accumulators.AverageAccumulateFunction; @@ -40,6 +30,16 @@ import org.junit.Test; import org.kie.api.runtime.rule.AccumulateFunction; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.model.DSL.accFunction; +import static org.drools.model.DSL.accumulate; +import static org.drools.model.DSL.declarationOf; +import static org.drools.model.DSL.on; +import static org.drools.model.PatternDSL.alphaIndexedBy; +import static org.drools.model.PatternDSL.betaIndexedBy; +import static org.drools.model.PatternDSL.pattern; +import static org.drools.model.PatternDSL.rule; + public class ToStringTest { /** diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeCoercionTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeCoercionTest.java index 4fe2c71a977..96a300ac388 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeCoercionTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeCoercionTest.java @@ -16,10 +16,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Collection; @@ -33,6 +29,10 @@ import org.junit.Test; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + public class TypeCoercionTest extends BaseModelTest { public TypeCoercionTest( RUN_TYPE testRunType ) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeObjectCoercionTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeObjectCoercionTest.java index a22f918caf3..e0e4dd738a9 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeObjectCoercionTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/TypeObjectCoercionTest.java @@ -16,11 +16,6 @@ package org.drools.modelcompiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -29,6 +24,11 @@ import org.junit.Test; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class TypeObjectCoercionTest extends BaseModelTest { public TypeObjectCoercionTest(RUN_TYPE testRunType) { diff --git a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/builder/generator/drlxparse/CoercedExpressionTest.java b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/builder/generator/drlxparse/CoercedExpressionTest.java index f549b080f53..82299226296 100644 --- a/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/builder/generator/drlxparse/CoercedExpressionTest.java +++ b/drools-model/drools-model-compiler/src/test/java/org/drools/modelcompiler/builder/generator/drlxparse/CoercedExpressionTest.java @@ -18,15 +18,15 @@ import java.util.Map; import com.github.javaparser.ast.expr.StringLiteralExpr; -import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.drools.core.util.MethodUtils; import org.drools.modelcompiler.builder.generator.DrlxParseUtil; import org.drools.modelcompiler.builder.generator.TypedExpression; import org.junit.Ignore; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.drools.modelcompiler.builder.generator.DrlxParseUtil.THIS_PLACEHOLDER; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class CoercedExpressionTest { diff --git a/drools-mvel/src/test/java/org/drools/mvel/asm/KnowledgeHelperFixerTest.java b/drools-mvel/src/test/java/org/drools/mvel/asm/KnowledgeHelperFixerTest.java index e670fce9c66..949fa3751df 100644 --- a/drools-mvel/src/test/java/org/drools/mvel/asm/KnowledgeHelperFixerTest.java +++ b/drools-mvel/src/test/java/org/drools/mvel/asm/KnowledgeHelperFixerTest.java @@ -14,10 +14,10 @@ package org.drools.mvel.asm; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + public class KnowledgeHelperFixerTest { private static final KnowledgeHelperFixer fixer = new KnowledgeHelperFixer(); diff --git a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java index 46c7caab404..abca08806d3 100644 --- a/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java +++ b/drools-persistence/drools-persistence-jpa/src/test/java/org/drools/persistence/kie/persistence/session/JpaPersistentStatefulSessionTest.java @@ -15,16 +15,6 @@ */ package org.drools.persistence.kie.persistence.session; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.persistence.util.DroolsPersistenceUtil.DROOLS_PERSISTENCE_UNIT_NAME; -import static org.drools.persistence.util.DroolsPersistenceUtil.OPTIMISTIC_LOCKING; -import static org.drools.persistence.util.DroolsPersistenceUtil.PESSIMISTIC_LOCKING; -import static org.drools.persistence.util.DroolsPersistenceUtil.createEnvironment; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -72,6 +62,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.persistence.util.DroolsPersistenceUtil.DROOLS_PERSISTENCE_UNIT_NAME; +import static org.drools.persistence.util.DroolsPersistenceUtil.OPTIMISTIC_LOCKING; +import static org.drools.persistence.util.DroolsPersistenceUtil.PESSIMISTIC_LOCKING; +import static org.drools.persistence.util.DroolsPersistenceUtil.createEnvironment; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + @RunWith(Parameterized.class) public class JpaPersistentStatefulSessionTest { diff --git a/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/RuleUnitDescriptionTest.java b/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/RuleUnitDescriptionTest.java index 9a39108ac43..f101d31ea67 100755 --- a/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/RuleUnitDescriptionTest.java +++ b/drools-ruleunits/drools-ruleunits-impl/src/test/java/org/drools/ruleunits/impl/RuleUnitDescriptionTest.java @@ -15,9 +15,6 @@ */ package org.drools.ruleunits.impl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - import java.math.BigDecimal; import java.util.Collection; import java.util.List; @@ -27,6 +24,9 @@ import org.junit.jupiter.api.Test; import org.kie.internal.ruleunit.RuleUnitVariable; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + public class RuleUnitDescriptionTest { private ReflectiveRuleUnitDescription ruleUnitDescr; diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/AbstractExpressionEvaluatorTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/AbstractExpressionEvaluatorTest.java index 87d038f805c..e166862a742 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/AbstractExpressionEvaluatorTest.java +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/AbstractExpressionEvaluatorTest.java @@ -15,14 +15,6 @@ */ package org.drools.scenariosimulation.backend.expression; -import static java.util.Collections.emptyList; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.util.AbstractMap; import java.util.ArrayList; import java.util.Collections; @@ -33,13 +25,20 @@ import java.util.Map; import java.util.Set; -import org.junit.Test; - import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.IntNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; +import org.junit.Test; + +import static java.util.Collections.emptyList; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class AbstractExpressionEvaluatorTest { diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionEvaluatorTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionEvaluatorTest.java index a24e7950936..62abe8809b9 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionEvaluatorTest.java +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionEvaluatorTest.java @@ -16,14 +16,6 @@ package org.drools.scenariosimulation.backend.expression; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -32,10 +24,17 @@ import java.util.List; import java.util.Map; +import com.fasterxml.jackson.databind.node.TextNode; import org.drools.scenariosimulation.backend.model.ListMapClass; import org.junit.Test; -import com.fasterxml.jackson.databind.node.TextNode; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.drools.scenariosimulation.api.utils.ConstantsHolder.VALUE; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class BaseExpressionEvaluatorTest { diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionOperatorTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionOperatorTest.java index 67674b84d4f..0e353e6a220 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionOperatorTest.java +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/expression/BaseExpressionOperatorTest.java @@ -16,6 +16,11 @@ package org.drools.scenariosimulation.backend.expression; +import java.time.LocalDate; +import java.util.Arrays; + +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.drools.scenariosimulation.backend.expression.BaseExpressionOperator.EQUALS; import static org.drools.scenariosimulation.backend.expression.BaseExpressionOperator.LIST_OF_CONDITION; @@ -29,11 +34,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import java.time.LocalDate; -import java.util.Arrays; - -import org.junit.Test; - public class BaseExpressionOperatorTest { private static final ClassLoader classLoader = BaseExpressionOperatorTest.class.getClassLoader(); diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DMNSimulationUtilsTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DMNSimulationUtilsTest.java index 0d78119b08a..4badf95acaa 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DMNSimulationUtilsTest.java +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/DMNSimulationUtilsTest.java @@ -15,10 +15,6 @@ */ package org.drools.scenariosimulation.backend.util; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -30,6 +26,10 @@ import org.kie.dmn.api.core.DMNModel; import org.mockito.junit.MockitoJUnitRunner; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + @RunWith(MockitoJUnitRunner.class) public class DMNSimulationUtilsTest { diff --git a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java index 3a25cd9e59a..25b986b72cd 100644 --- a/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java +++ b/drools-scenario-simulation/drools-scenario-simulation-backend/src/test/java/org/drools/scenariosimulation/backend/util/ScenarioSimulationXMLPersistenceTest.java @@ -15,6 +15,15 @@ */ package org.drools.scenariosimulation.backend.util; +import java.util.List; +import java.util.Map; + +import org.drools.scenariosimulation.api.model.ScenarioSimulationModel; +import org.drools.scenariosimulation.api.model.imports.Import; +import org.junit.Test; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.drools.scenariosimulation.api.utils.ConstantsHolder.BACKGROUND_NODE; import static org.drools.scenariosimulation.api.utils.ConstantsHolder.DMO_SESSION_NODE; @@ -34,15 +43,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.util.List; -import java.util.Map; - -import org.drools.scenariosimulation.api.model.ScenarioSimulationModel; -import org.drools.scenariosimulation.api.model.imports.Import; -import org.junit.Test; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - public class ScenarioSimulationXMLPersistenceTest { protected ScenarioSimulationXMLPersistence instance = ScenarioSimulationXMLPersistence.getInstance(); diff --git a/drools-templates/src/test/java/org/drools/template/DataProviderCompilerTest.java b/drools-templates/src/test/java/org/drools/template/DataProviderCompilerTest.java index c947f87fb5d..0ed76af1408 100644 --- a/drools-templates/src/test/java/org/drools/template/DataProviderCompilerTest.java +++ b/drools-templates/src/test/java/org/drools/template/DataProviderCompilerTest.java @@ -15,8 +15,6 @@ package org.drools.template; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.InputStream; import java.util.ArrayList; import java.util.Collection; @@ -31,6 +29,8 @@ import org.junit.Before; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + public class DataProviderCompilerTest { private static final StringBuffer EXPECTED_RULES = new StringBuffer(); diff --git a/drools-test-coverage/standalone/kie-ci-with-domain/tests/src/test/java/org/drools/testcoverage/kieci/withdomain/KJarLoadingTest.java b/drools-test-coverage/standalone/kie-ci-with-domain/tests/src/test/java/org/drools/testcoverage/kieci/withdomain/KJarLoadingTest.java index 9777f09dace..09458a1d987 100644 --- a/drools-test-coverage/standalone/kie-ci-with-domain/tests/src/test/java/org/drools/testcoverage/kieci/withdomain/KJarLoadingTest.java +++ b/drools-test-coverage/standalone/kie-ci-with-domain/tests/src/test/java/org/drools/testcoverage/kieci/withdomain/KJarLoadingTest.java @@ -1,7 +1,5 @@ package org.drools.testcoverage.kieci.withdomain; -import static org.assertj.core.api.Assertions.assertThat; - import org.drools.testcoverage.domain.Customer; import org.drools.testcoverage.domain.Drink; import org.drools.testcoverage.domain.Order; @@ -14,6 +12,8 @@ import org.kie.api.runtime.KieContainer; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests loading a KJAR with non-trivial pom.xml (with dependencies, parent pom, ...). * diff --git a/drools-test-coverage/standalone/kie-ci-without-domain/tests/src/test/java/org/drools/testcoverage/kieci/withoutdomain/KJarLoadingTest.java b/drools-test-coverage/standalone/kie-ci-without-domain/tests/src/test/java/org/drools/testcoverage/kieci/withoutdomain/KJarLoadingTest.java index 503db052fb3..f705554833f 100644 --- a/drools-test-coverage/standalone/kie-ci-without-domain/tests/src/test/java/org/drools/testcoverage/kieci/withoutdomain/KJarLoadingTest.java +++ b/drools-test-coverage/standalone/kie-ci-without-domain/tests/src/test/java/org/drools/testcoverage/kieci/withoutdomain/KJarLoadingTest.java @@ -1,7 +1,5 @@ package org.drools.testcoverage.kieci.withoutdomain; -import static org.assertj.core.api.Assertions.assertThat; - import org.drools.testcoverage.kieci.withoutdomain.util.KJarLoadUtils; import org.junit.After; import org.junit.Before; @@ -11,6 +9,8 @@ import org.kie.api.runtime.KieContainer; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests loading a KJAR with non-trivial pom.xml (dependencies, parent pom, ...). * diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AccumulateTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AccumulateTest.java index 99bc755586d..9021b2f229e 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AccumulateTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AccumulateTest.java @@ -15,15 +15,6 @@ package org.drools.compiler.integrationtests; -import static java.util.Arrays.asList; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - import java.io.ObjectInput; import java.io.ObjectOutput; import java.io.Serializable; @@ -76,6 +67,15 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mockito; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + @RunWith(Parameterized.class) public class AccumulateTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AlphaNodeRangeIndexingTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AlphaNodeRangeIndexingTest.java index 328dc7ffd18..de7031bfb90 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AlphaNodeRangeIndexingTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AlphaNodeRangeIndexingTest.java @@ -16,11 +16,6 @@ package org.drools.compiler.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; @@ -55,6 +50,11 @@ import org.kie.api.runtime.KieSession; import org.kie.internal.conf.AlphaRangeIndexThresholdOption; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + @RunWith(Parameterized.class) public class AlphaNodeRangeIndexingTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsOnPatternTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsOnPatternTest.java index 2555ab16a2e..2a849c49748 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsOnPatternTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsOnPatternTest.java @@ -16,11 +16,6 @@ package org.drools.compiler.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.util.Arrays; import java.util.Collection; import java.util.List; @@ -41,6 +36,11 @@ import org.kie.api.builder.KieBuilder; import org.kie.api.definition.rule.Rule; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + @RunWith(Parameterized.class) public class AnnotationsOnPatternTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsTest.java index 9e464ee3fc8..e92499d5df6 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/AnnotationsTest.java @@ -16,12 +16,6 @@ package org.drools.compiler.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -44,6 +38,12 @@ import org.kie.api.definition.type.Position; import org.kie.api.definition.type.Role; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + @RunWith(Parameterized.class) public class AnnotationsTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepEspTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepEspTest.java index 6b4f2a5cac4..b1f0e13a7a9 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepEspTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepEspTest.java @@ -15,17 +15,6 @@ package org.drools.compiler.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -108,6 +97,17 @@ import org.kie.api.time.SessionPseudoClock; import org.mockito.ArgumentCaptor; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + @RunWith(Parameterized.class) public class CepEspTest extends AbstractCepEspTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepJavaTypeTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepJavaTypeTest.java index c6eeb2f37cc..93a069276be 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepJavaTypeTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/CepJavaTypeTest.java @@ -15,9 +15,6 @@ package org.drools.compiler.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; - import java.util.Collection; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; @@ -35,6 +32,9 @@ import org.kie.api.definition.type.Timestamp; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + @RunWith(Parameterized.class) public class CepJavaTypeTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/ConstraintsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/ConstraintsTest.java index 15c79788236..f8894df7f72 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/ConstraintsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/ConstraintsTest.java @@ -15,10 +15,6 @@ package org.drools.compiler.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -41,6 +37,10 @@ import org.kie.api.builder.KieBuilder; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + @RunWith(Parameterized.class) public class ConstraintsTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/JoinNodeRangeIndexingTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/JoinNodeRangeIndexingTest.java index 59d4b79cdaf..79f2654ba52 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/JoinNodeRangeIndexingTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/JoinNodeRangeIndexingTest.java @@ -16,11 +16,6 @@ package org.drools.compiler.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; @@ -53,6 +48,11 @@ import org.kie.api.conf.BetaRangeIndexOption; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + @RunWith(Parameterized.class) public class JoinNodeRangeIndexingTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/StreamsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/StreamsTest.java index 0aa3e0ecb62..3497a9a847b 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/StreamsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/StreamsTest.java @@ -15,17 +15,6 @@ */ package org.drools.compiler.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.core.rule.TypeDeclaration.NEVER_EXPIRES; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -45,7 +34,6 @@ import org.drools.testcoverage.common.util.KieSessionTestConfiguration; import org.drools.testcoverage.common.util.KieUtil; import org.drools.testcoverage.common.util.TestParametersUtil; -import org.hamcrest.CoreMatchers; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -60,6 +48,17 @@ import org.kie.api.runtime.rule.EntryPoint; import org.mockito.ArgumentCaptor; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.core.rule.TypeDeclaration.NEVER_EXPIRES; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * Tests related to the stream support features */ diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarExceptionTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarExceptionTest.java index 054858b434a..ce4944ce689 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarExceptionTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarExceptionTest.java @@ -16,9 +16,6 @@ package org.drools.compiler.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.fail; - import java.util.Collection; import org.drools.core.base.UndefinedCalendarExcption; @@ -33,6 +30,9 @@ import org.kie.api.builder.KieBuilder; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.fail; + @RunWith(Parameterized.class) public class TimerAndCalendarExceptionTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarWithPseudoTimeTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarWithPseudoTimeTest.java index 69d2fcd4f3b..c853d728da5 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarWithPseudoTimeTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarWithPseudoTimeTest.java @@ -16,11 +16,6 @@ package org.drools.compiler.integrationtests; -import static java.util.Arrays.asList; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -63,6 +58,11 @@ import org.kie.api.time.SessionClock; import org.kie.api.time.SessionPseudoClock; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + @RunWith(Parameterized.class) public class TimerAndCalendarWithPseudoTimeTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/BindTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/BindTest.java index e8cb6bd21d7..fe72828722e 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/BindTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/BindTest.java @@ -16,14 +16,6 @@ package org.drools.compiler.integrationtests.drl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -45,6 +37,14 @@ import org.kie.api.runtime.rule.FactHandle; import org.mockito.ArgumentCaptor; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + @RunWith(Parameterized.class) public class BindTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ConsequenceTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ConsequenceTest.java index dcb6c90c38b..1c5b59f7e6e 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ConsequenceTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ConsequenceTest.java @@ -16,14 +16,6 @@ package org.drools.compiler.integrationtests.drl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -47,6 +39,14 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mockito; +import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + @RunWith(Parameterized.class) public class ConsequenceTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLCepTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLCepTest.java index bcb2ccb1cc1..c484851bb82 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLCepTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLCepTest.java @@ -16,8 +16,6 @@ package org.drools.compiler.integrationtests.drl; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import org.drools.testcoverage.common.model.StockTick; @@ -30,6 +28,8 @@ import org.kie.api.KieBase; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class DRLCepTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLTest.java index b37886c2cdd..884dbd17da7 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DRLTest.java @@ -16,13 +16,6 @@ package org.drools.compiler.integrationtests.drl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -50,6 +43,13 @@ import org.kie.api.definition.type.FactType; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + @RunWith(Parameterized.class) public class DRLTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DrlSpecificFeaturesTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DrlSpecificFeaturesTest.java index 138a7be0ea3..ad561f17b24 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DrlSpecificFeaturesTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/DrlSpecificFeaturesTest.java @@ -16,10 +16,6 @@ package org.drools.compiler.integrationtests.drl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -38,6 +34,10 @@ import org.kie.api.builder.Message; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + @RunWith(Parameterized.class) public class DrlSpecificFeaturesTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ExceptionTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ExceptionTest.java index e0a7b3fc505..e5a57ece594 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ExceptionTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ExceptionTest.java @@ -16,8 +16,6 @@ package org.drools.compiler.integrationtests.drl; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - import java.util.Collection; import org.drools.testcoverage.common.model.Cheese; @@ -30,6 +28,8 @@ import org.kie.api.KieBase; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + @RunWith(Parameterized.class) public class ExceptionTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ImportsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ImportsTest.java index 46fc70525fd..f660c767290 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ImportsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/ImportsTest.java @@ -16,10 +16,6 @@ package org.drools.compiler.integrationtests.drl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -45,6 +41,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + @RunWith(Parameterized.class) public class ImportsTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/PatternTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/PatternTest.java index e07c685f9aa..c97a345b948 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/PatternTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/drl/PatternTest.java @@ -16,11 +16,6 @@ package org.drools.compiler.integrationtests.drl; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; @@ -60,6 +55,11 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + @RunWith(Parameterized.class) public class PatternTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/equalitymode/EqualityModeTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/equalitymode/EqualityModeTest.java index 11099f9b690..53c01d637cd 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/equalitymode/EqualityModeTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/equalitymode/EqualityModeTest.java @@ -16,8 +16,6 @@ package org.drools.compiler.integrationtests.equalitymode; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -32,6 +30,8 @@ import org.kie.api.KieBase; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class EqualityModeTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAddDeleteFactsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAddDeleteFactsTest.java index a89e9609fa4..8886d985311 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAddDeleteFactsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAddDeleteFactsTest.java @@ -1,7 +1,5 @@ package org.drools.compiler.integrationtests.incrementalcompilation; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -17,6 +15,8 @@ import org.kie.api.runtime.rule.FactHandle; import org.kie.test.testcategory.TurtleTestCategory; +import static org.assertj.core.api.Assertions.assertThat; + @Category(TurtleTestCategory.class) @RunWith(Parameterized.class) public class AddRemoveRulesAddDeleteFactsTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAdvOperatorsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAdvOperatorsTest.java index b3639124371..fe1dc96f7b8 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAdvOperatorsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesAdvOperatorsTest.java @@ -15,8 +15,6 @@ package org.drools.compiler.integrationtests.incrementalcompilation; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -29,6 +27,8 @@ import org.kie.api.runtime.KieSession; import org.kie.test.testcategory.TurtleTestCategory; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests adding and removing rules with advanced operators. */ diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesTest.java index 92d3366035c..2d298a2ec91 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveRulesTest.java @@ -15,15 +15,6 @@ package org.drools.compiler.integrationtests.incrementalcompilation; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.core.util.DroolsTestUtil.rulestoMap; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.io.StringReader; import java.util.ArrayList; import java.util.Collection; @@ -60,6 +51,15 @@ import org.kie.internal.builder.KnowledgeBuilderFactory; import org.kie.internal.io.ResourceFactory; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.core.util.DroolsTestUtil.rulestoMap; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @RunWith(Parameterized.class) public class AddRemoveRulesTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveTestCases.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveTestCases.java index 8ffc2d9c9c8..beda97d32ac 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveTestCases.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/incrementalcompilation/AddRemoveTestCases.java @@ -16,8 +16,6 @@ package org.drools.compiler.integrationtests.incrementalcompilation; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -25,6 +23,8 @@ import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + public final class AddRemoveTestCases { public static void runAllTestCases(final String rule1, diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/FromTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/FromTest.java index b747ce6afc0..6a9b862f351 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/FromTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/compiler/integrationtests/operators/FromTest.java @@ -16,11 +16,6 @@ package org.drools.compiler.integrationtests.operators; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -71,6 +66,11 @@ import org.kie.internal.builder.conf.LanguageLevelOption; import org.kie.internal.builder.conf.PropertySpecificOption; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + @RunWith(Parameterized.class) public class FromTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/commons/jci/compilers/NativeJavaCompilerSettingsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/commons/jci/compilers/NativeJavaCompilerSettingsTest.java index aaf6115b5af..ba6a7eac0f5 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/commons/jci/compilers/NativeJavaCompilerSettingsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/commons/jci/compilers/NativeJavaCompilerSettingsTest.java @@ -15,14 +15,14 @@ package org.drools.mvel.compiler.commons.jci.compilers; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.List; import org.assertj.core.data.Index; import org.junit.Test; import org.kie.memorycompiler.jdknative.NativeJavaCompilerSettings; +import static org.assertj.core.api.Assertions.assertThat; + public class NativeJavaCompilerSettingsTest { @Test diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/DrlParserTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/DrlParserTest.java index 5952e2f8943..32556e3eb60 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/DrlParserTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/DrlParserTest.java @@ -15,10 +15,6 @@ package org.drools.mvel.compiler.compiler; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - import java.io.StringReader; import java.util.Collection; import java.util.List; @@ -41,6 +37,10 @@ import org.kie.api.builder.Message; import org.kie.internal.builder.conf.LanguageLevelOption; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + @RunWith(Parameterized.class) public class DrlParserTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTest.java index 27a7d6fba7a..f69c29658b3 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTest.java @@ -15,10 +15,6 @@ package org.drools.mvel.compiler.compiler.xml.rules; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import org.drools.drl.ast.descr.PackageDescr; import org.drools.drl.ast.dsl.DescrFactory; import org.drools.drl.parser.DrlParser; @@ -27,6 +23,10 @@ import org.junit.Test; import org.kie.internal.builder.conf.LanguageLevelOption; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * Test the dump/convert format utilities. */ diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTestHelper.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTestHelper.java index d3b396e34ce..042c4c041fe 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTestHelper.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/DumperTestHelper.java @@ -15,9 +15,6 @@ package org.drools.mvel.compiler.compiler.xml.rules; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; - import java.io.IOException; import java.io.InputStreamReader; import java.io.StringReader; @@ -30,6 +27,9 @@ import org.drools.mvel.DrlDumper; import org.kie.internal.builder.conf.LanguageLevelOption; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + /** * Helper Class for both xml and drl Dump Tests */ diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/XmlPackageReaderTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/XmlPackageReaderTest.java index 8ec7c308b8a..82295cfa19d 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/XmlPackageReaderTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/compiler/xml/rules/XmlPackageReaderTest.java @@ -15,12 +15,6 @@ package org.drools.mvel.compiler.compiler.xml.rules; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.io.InputStreamReader; import java.util.List; @@ -47,6 +41,12 @@ import org.drools.mvel.DrlDumper; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class XmlPackageReaderTest extends CommonTestMethodBase { @Test diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/ClasspathKieProjectTransformUrlToFileSystemPathTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/ClasspathKieProjectTransformUrlToFileSystemPathTest.java index b93ae0e4e12..46b9457f35b 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/ClasspathKieProjectTransformUrlToFileSystemPathTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/ClasspathKieProjectTransformUrlToFileSystemPathTest.java @@ -15,8 +15,6 @@ package org.drools.mvel.compiler.kie.builder.impl; -import static org.assertj.core.api.Assertions.assertThat; - import java.net.URL; import java.util.Arrays; import java.util.Collection; @@ -26,6 +24,8 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class ClasspathKieProjectTransformUrlToFileSystemPathTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/MemoryKieModuleResourceProviderTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/MemoryKieModuleResourceProviderTest.java index d8b5cbee42c..d37390fdbed 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/MemoryKieModuleResourceProviderTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kie/builder/impl/MemoryKieModuleResourceProviderTest.java @@ -15,8 +15,6 @@ package org.drools.mvel.compiler.kie.builder.impl; -import static org.assertj.core.api.Assertions.assertThat; - import org.apache.commons.io.IOUtils; import org.drools.compiler.compiler.io.memory.MemoryFile; import org.drools.compiler.compiler.io.memory.MemoryFileSystem; @@ -29,6 +27,8 @@ import org.kie.memorycompiler.resources.KiePath; import org.mockito.Mock; +import static org.assertj.core.api.Assertions.assertThat; + public class MemoryKieModuleResourceProviderTest { @Mock diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kproject/ReleaseIdTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kproject/ReleaseIdTest.java index bb2b5fd761b..185c1e63dd7 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kproject/ReleaseIdTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/kproject/ReleaseIdTest.java @@ -15,11 +15,6 @@ */ package org.drools.mvel.compiler.kproject; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertSame; -import static org.kie.api.builder.ReleaseIdComparator.SortDirection.ASCENDING; -import static org.kie.api.builder.ReleaseIdComparator.SortDirection.DESCENDING; - import java.util.ArrayList; import java.util.List; @@ -29,6 +24,11 @@ import org.kie.api.builder.ReleaseIdComparator; import org.kie.util.maven.support.ReleaseIdImpl; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertSame; +import static org.kie.api.builder.ReleaseIdComparator.SortDirection.ASCENDING; +import static org.kie.api.builder.ReleaseIdComparator.SortDirection.DESCENDING; + public class ReleaseIdTest { private static final ReleaseId gav0 = newReleaseId("abc.def:ghi:9.0.1.GA"); diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/RuleParserTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/RuleParserTest.java index d235cb9fe35..db05857bdac 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/RuleParserTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/RuleParserTest.java @@ -16,9 +16,6 @@ package org.drools.mvel.compiler.lang; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.drl.parser.DRLFactory.buildParser; - import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; @@ -28,6 +25,7 @@ import java.util.Map; import java.util.regex.Pattern; +import junit.framework.TestCase; import org.antlr.runtime.ANTLRStringStream; import org.antlr.runtime.CharStream; import org.drools.compiler.builder.impl.EvaluatorRegistry; @@ -69,7 +67,8 @@ import org.junit.Test; import org.kie.internal.builder.conf.LanguageLevelOption; -import junit.framework.TestCase; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.drl.parser.DRLFactory.buildParser; public class RuleParserTest extends TestCase { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/api/DescrBuilderTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/api/DescrBuilderTest.java index 0c67718c1b2..091762a5dcc 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/api/DescrBuilderTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/api/DescrBuilderTest.java @@ -16,17 +16,6 @@ package org.drools.mvel.compiler.lang.api; -import static org.assertj.core.api.Assertions.assertThat; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -63,6 +52,17 @@ import org.kie.internal.io.ResourceFactory; import org.mockito.ArgumentCaptor; +import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + /** * DescrBuilderTest */ diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/descr/ConnectiveDescrTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/descr/ConnectiveDescrTest.java index a78062aa7b2..632c24c6332 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/descr/ConnectiveDescrTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/descr/ConnectiveDescrTest.java @@ -15,12 +15,12 @@ package org.drools.mvel.compiler.lang.descr; -import static org.assertj.core.api.Assertions.assertThat; - import org.drools.drl.ast.descr.ConnectiveDescr; import org.drools.drl.ast.descr.ConnectiveDescr.RestrictionConnectiveType; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + public class ConnectiveDescrTest { @Test diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathAccumulateTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathAccumulateTest.java index ef5a0aeecad..40141e1a856 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathAccumulateTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathAccumulateTest.java @@ -16,8 +16,6 @@ package org.drools.mvel.compiler.oopath; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import org.drools.mvel.compiler.oopath.model.Child; @@ -31,6 +29,8 @@ import org.kie.api.KieBase; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class OOPathAccumulateTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBenchmarkTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBenchmarkTest.java index 1b3d03faa7c..3ab644b49af 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBenchmarkTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBenchmarkTest.java @@ -15,8 +15,6 @@ package org.drools.mvel.compiler.oopath; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; @@ -30,6 +28,8 @@ import org.kie.api.runtime.KieSession; import org.kie.internal.utils.KieHelper; +import static org.assertj.core.api.Assertions.assertThat; + public class OOPathBenchmarkTest { private static final String RELATIONAL_DRL = diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBindTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBindTest.java index fbe6b8d7e2f..cc3d8e6ee27 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBindTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathBindTest.java @@ -16,8 +16,6 @@ package org.drools.mvel.compiler.oopath; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -39,6 +37,8 @@ import org.kie.api.KieBase; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class OOPathBindTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathCastTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathCastTest.java index e2aafa5c211..906dd0cd4b1 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathCastTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathCastTest.java @@ -16,9 +16,6 @@ package org.drools.mvel.compiler.oopath; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -40,6 +37,9 @@ import org.kie.api.builder.Message; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertFalse; + @RunWith(Parameterized.class) public class OOPathCastTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathMultilevelTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathMultilevelTest.java index f064eca8448..559e2a9f76f 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathMultilevelTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathMultilevelTest.java @@ -16,8 +16,6 @@ package org.drools.mvel.compiler.oopath; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -35,6 +33,8 @@ import org.kie.api.KieBase; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class OOPathMultilevelTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathQueriesTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathQueriesTest.java index 75ef9fb3389..07ae8e5d274 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathQueriesTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathQueriesTest.java @@ -15,8 +15,6 @@ package org.drools.mvel.compiler.oopath; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -38,6 +36,8 @@ import org.kie.api.runtime.rule.QueryResults; import org.kie.api.runtime.rule.Variable; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class OOPathQueriesTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathReactiveTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathReactiveTest.java index 49170fcae00..563a9163904 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathReactiveTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathReactiveTest.java @@ -16,13 +16,6 @@ package org.drools.mvel.compiler.oopath; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.mvel.compiler.oopath.model.BodyMeasurement.CHEST; -import static org.drools.mvel.compiler.oopath.model.BodyMeasurement.RIGHT_FOREARM; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -59,6 +52,13 @@ import org.kie.api.builder.Message; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.mvel.compiler.oopath.model.BodyMeasurement.CHEST; +import static org.drools.mvel.compiler.oopath.model.BodyMeasurement.RIGHT_FOREARM; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @RunWith(Parameterized.class) public class OOPathReactiveTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathTest.java index 422d64aa598..e97665164be 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/oopath/OOPathTest.java @@ -15,12 +15,6 @@ package org.drools.mvel.compiler.oopath; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.mvel.compiler.TestUtil.assertDrlHasCompilationError; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -59,6 +53,12 @@ import org.kie.api.event.rule.ObjectUpdatedEvent; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.mvel.compiler.TestUtil.assertDrlHasCompilationError; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + @RunWith(Parameterized.class) public class OOPathTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/ExpirationTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/ExpirationTest.java index 374bab33b06..6d58a8a2f97 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/ExpirationTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/ExpirationTest.java @@ -16,10 +16,6 @@ package org.drools.mvel.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.kie.api.definition.type.Expires.Policy.TIME_SOFT; - import java.time.Duration; import java.util.Collection; import java.util.Date; @@ -46,6 +42,10 @@ import org.kie.api.runtime.KieSessionConfiguration; import org.kie.api.runtime.conf.ClockTypeOption; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.kie.api.definition.type.Expires.Policy.TIME_SOFT; + @RunWith(Parameterized.class) public class ExpirationTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/FunctionsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/FunctionsTest.java index 676eb5cfdf1..85e38f856da 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/FunctionsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/FunctionsTest.java @@ -15,10 +15,6 @@ package org.drools.mvel.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -37,6 +33,10 @@ import org.kie.api.io.Resource; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + @RunWith(Parameterized.class) public class FunctionsTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/JittingTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/JittingTest.java index 1e26de85bcf..9163d8cbf84 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/JittingTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/JittingTest.java @@ -16,9 +16,6 @@ package org.drools.mvel.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; - import java.math.BigDecimal; import java.util.Collection; import java.util.HashMap; @@ -39,6 +36,9 @@ import org.kie.api.runtime.KieSession; import org.kie.internal.conf.ConstraintJittingThresholdOption; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + @RunWith(Parameterized.class) public class JittingTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java index f6daf13a328..12d06a74f4c 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieBuilderTest.java @@ -15,12 +15,6 @@ package org.drools.mvel.integrationtests; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.Collection; import java.util.List; import java.util.function.Predicate; @@ -54,6 +48,12 @@ import org.kie.internal.builder.KnowledgeBuilderFactory; import org.kie.internal.io.ResourceFactory; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @RunWith(Parameterized.class) public class KieBuilderTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieContainerTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieContainerTest.java index 5cf6fdf8170..b4091b90bc0 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieContainerTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/KieContainerTest.java @@ -15,12 +15,6 @@ package org.drools.mvel.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.core.util.DroolsAssert.assertEnumerationSize; -import static org.drools.core.util.DroolsAssert.assertUrlEnumerationContainsMatch; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import java.io.IOException; import java.io.StringReader; import java.lang.reflect.Constructor; @@ -53,6 +47,12 @@ import org.kie.api.runtime.KieContainer; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.core.util.DroolsAssert.assertEnumerationSize; +import static org.drools.core.util.DroolsAssert.assertUrlEnumerationContainsMatch; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + @RunWith(Parameterized.class) public class KieContainerTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/Misc2Test.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/Misc2Test.java index 9ca9984693b..0b860e131ad 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/Misc2Test.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/Misc2Test.java @@ -16,16 +16,6 @@ package org.drools.mvel.integrationtests; -import static java.util.Arrays.asList; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.mvel.compiler.TestUtil.assertDrlHasCompilationError; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.junit.Assume.assumeTrue; - import java.io.Serializable; import java.io.StringReader; import java.math.BigDecimal; @@ -144,6 +134,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.mvel.compiler.TestUtil.assertDrlHasCompilationError; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.junit.Assume.assumeTrue; + /** * Run all the tests with the ReteOO engine implementation */ diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/NamedConsequencesTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/NamedConsequencesTest.java index 9248e66ea93..fbaa53b9550 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/NamedConsequencesTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/NamedConsequencesTest.java @@ -15,11 +15,6 @@ package org.drools.mvel.integrationtests; -import static java.util.Arrays.asList; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -44,6 +39,11 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + @RunWith(Parameterized.class) public class NamedConsequencesTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/PropertySpecificTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/PropertySpecificTest.java index 93d34841b93..95bf6d1b945 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/PropertySpecificTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/PropertySpecificTest.java @@ -15,15 +15,6 @@ package org.drools.mvel.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.drools.core.reteoo.PropertySpecificUtil.calculateNegativeMask; -import static org.drools.core.reteoo.PropertySpecificUtil.calculatePositiveMask; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; @@ -62,6 +53,15 @@ import org.kie.api.definition.type.PropertyReactive; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.drools.core.reteoo.PropertySpecificUtil.calculateNegativeMask; +import static org.drools.core.reteoo.PropertySpecificUtil.calculatePositiveMask; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + @RunWith(Parameterized.class) public class PropertySpecificTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/XSDResourceTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/XSDResourceTest.java index c43891915b1..9e16b6ce155 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/XSDResourceTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/XSDResourceTest.java @@ -15,13 +15,13 @@ */ package org.drools.mvel.integrationtests; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.kie.api.KieBase; import org.kie.api.KieServices; import org.kie.api.runtime.KieContainer; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests KIE package compilation when there is a XSD resource (BZ 1120972) - manifests only when using * KieClasspathContainer. diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentInsertionsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentInsertionsTest.java index eebf69264b9..12d04bd4e9d 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentInsertionsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentInsertionsTest.java @@ -16,8 +16,6 @@ package org.drools.mvel.integrationtests.concurrency; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.concurrent.Callable; import java.util.concurrent.CompletionService; import java.util.concurrent.ExecutorCompletionService; @@ -30,6 +28,8 @@ import org.kie.api.KieBase; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + public abstract class AbstractConcurrentInsertionsTest { protected void testConcurrentInsertions(final String drl, final int objectCount, final int threadCount, diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentTest.java index bd733748b97..59da6498a7c 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/AbstractConcurrentTest.java @@ -16,8 +16,6 @@ package org.drools.mvel.integrationtests.concurrency; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -41,6 +39,8 @@ import org.kie.api.runtime.KieSession; import org.kie.internal.conf.ConstraintJittingThresholdOption; +import static org.assertj.core.api.Assertions.assertThat; + public abstract class AbstractConcurrentTest { protected final boolean enforcedJitting; diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/ConcurrentBasesParallelTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/ConcurrentBasesParallelTest.java index 7757317b3e0..1c9de34b635 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/ConcurrentBasesParallelTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/ConcurrentBasesParallelTest.java @@ -16,8 +16,6 @@ package org.drools.mvel.integrationtests.concurrency; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -36,6 +34,8 @@ import org.kie.api.runtime.rule.QueryResults; import org.kie.api.runtime.rule.QueryResultsRow; +import static org.assertj.core.api.Assertions.assertThat; + /** * Test each thread having it's own separate KieBase and KieSession. */ diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/DataTypeEvaluationConcurrentSessionsTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/DataTypeEvaluationConcurrentSessionsTest.java index 4bb64e0e771..30a02462212 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/DataTypeEvaluationConcurrentSessionsTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/DataTypeEvaluationConcurrentSessionsTest.java @@ -16,8 +16,6 @@ package org.drools.mvel.integrationtests.concurrency; -import static org.assertj.core.api.Assertions.assertThat; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -43,6 +41,8 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class DataTypeEvaluationConcurrentSessionsTest extends AbstractConcurrentTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/MultithreadTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/MultithreadTest.java index c268b9c458e..a3381007157 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/MultithreadTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/MultithreadTest.java @@ -16,9 +16,6 @@ package org.drools.mvel.integrationtests.concurrency; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -57,6 +54,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * This is a test case for multi-thred issues */ diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/SharedSessionParallelTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/SharedSessionParallelTest.java index 353f434e498..bc2bef77028 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/SharedSessionParallelTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/concurrency/SharedSessionParallelTest.java @@ -16,8 +16,6 @@ package org.drools.mvel.integrationtests.concurrency; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -36,6 +34,8 @@ import org.kie.api.runtime.KieSession; import org.kie.test.testcategory.TurtleTestCategory; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) @Category(TurtleTestCategory.class) public class SharedSessionParallelTest extends AbstractConcurrentTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/PhreakLiaNodeTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/PhreakLiaNodeTest.java index 2b9d9ca39c5..89e69447870 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/PhreakLiaNodeTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/phreak/PhreakLiaNodeTest.java @@ -15,8 +15,6 @@ package org.drools.mvel.integrationtests.phreak; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -31,6 +29,8 @@ import org.kie.api.KieBase; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class PhreakLiaNodeTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/DeleteTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/DeleteTest.java index 7bc0d9321e5..6cd072525db 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/DeleteTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/DeleteTest.java @@ -16,12 +16,6 @@ package org.drools.mvel.integrationtests.session; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -48,6 +42,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + @RunWith(Parameterized.class) public class DeleteTest { diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/SessionsPoolTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/SessionsPoolTest.java index 255422fafa2..87a6375c14a 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/SessionsPoolTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/integrationtests/session/SessionsPoolTest.java @@ -16,13 +16,6 @@ package org.drools.mvel.integrationtests.session; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -62,6 +55,13 @@ import org.kie.internal.event.rule.RuleEventListener; import org.kie.internal.event.rule.RuleEventManager; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + @RunWith(Parameterized.class) public class SessionsPoolTest { diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/KieUtil.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/KieUtil.java index 67b45a6752e..2a2247744f3 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/KieUtil.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/KieUtil.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.common.util; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.StringReader; import java.util.ArrayList; import java.util.HashMap; @@ -46,6 +44,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + /** * Util class that provides various methods related to Kie API. */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/Session.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/Session.java index f1583ff1b15..ab833baeb87 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/Session.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/common/util/Session.java @@ -16,7 +16,8 @@ package org.drools.testcoverage.common.util; -import static org.assertj.core.api.Assertions.assertThat; +import java.util.Collection; + import org.kie.api.command.Command; import org.kie.api.event.KieRuntimeEventManager; import org.kie.api.event.process.ProcessEventListener; @@ -27,7 +28,7 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.StatelessKieSession; -import java.util.Collection; +import static org.assertj.core.api.Assertions.assertThat; /** * Convenient class to help generalizing drools StatelessKnowledgeSession and diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ActivationGroupTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ActivationGroupTest.java index 4fdf09680bd..75285fdb9c9 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ActivationGroupTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ActivationGroupTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.functional; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -36,6 +34,8 @@ import org.kie.api.io.Resource; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class ActivationGroupTest { private final KieBaseTestConfiguration kieBaseTestConfiguration; diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DecisionTableTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DecisionTableTest.java index 670ddd9143f..04f0513f6ed 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DecisionTableTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DecisionTableTest.java @@ -16,9 +16,6 @@ package org.drools.testcoverage.functional; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; - import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -48,6 +45,9 @@ import org.kie.api.runtime.rule.FactHandle; import org.kie.internal.builder.DecisionTableInputType; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; + /** * Tests all features which can be used in decision tables. */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DeclarativeAgendaTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DeclarativeAgendaTest.java index c998816824e..a76a4fd2cfe 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DeclarativeAgendaTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DeclarativeAgendaTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.functional; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; @@ -35,6 +33,8 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; +import static org.assertj.core.api.Assertions.assertThat; + /** * * Declarative agenda test. Activation of rule creates diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DuplicityTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DuplicityTest.java index af22d9402fb..4450392a1a1 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DuplicityTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/DuplicityTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.functional; -import static org.assertj.core.api.Assertions.fail; - import java.util.Collection; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; @@ -30,6 +28,8 @@ import org.kie.api.io.Resource; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.fail; + /** * Testing of duplicities in rule files. * https://bugzilla.redhat.com/show_bug.cgi?id=724753 diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/FactHandleTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/FactHandleTest.java index de1737d136c..6369ca080d5 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/FactHandleTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/FactHandleTest.java @@ -15,8 +15,6 @@ package org.drools.testcoverage.functional; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -34,6 +32,8 @@ import org.kie.api.event.rule.ObjectInsertedEvent; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class FactHandleTest { diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerDefaultsTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerDefaultsTest.java index e247b964b97..3f2e52cdbda 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerDefaultsTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerDefaultsTest.java @@ -16,9 +16,6 @@ package org.drools.testcoverage.functional; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - import java.io.IOException; import org.drools.core.impl.InternalKieContainer; @@ -36,6 +33,9 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.StatelessKieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + /** * This class's purpose is to test obtaining default KieSessions and default KieBases from KieContainer. It tests * KieContainer's behaviour in other cases than simple one default KieBase with one default KieSession. diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerTest.java index 281213c1f49..1e46462553e 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieContainerTest.java @@ -17,9 +17,6 @@ package org.drools.testcoverage.functional; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.io.File; import java.io.IOException; @@ -37,6 +34,9 @@ import org.kie.api.runtime.KieContainer; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * Tests correct behavior of KieContainer in specific cases, not covered by other tests. */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieRepositoryTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieRepositoryTest.java index 258c9a9af07..0f8a583bab4 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieRepositoryTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/KieRepositoryTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.functional; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import org.drools.testcoverage.common.util.TestConstants; @@ -30,6 +28,8 @@ import org.kie.api.builder.ReleaseId; import org.kie.api.builder.model.KieModuleModel; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests correct behavior of KieRepository, such as adding/removing KieModules. */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LiveQueriesBadResultTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LiveQueriesBadResultTest.java index 49785e036c8..7d627085764 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LiveQueriesBadResultTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LiveQueriesBadResultTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.functional; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - import java.util.ArrayList; import java.util.Collection; @@ -35,6 +33,8 @@ import org.kie.api.runtime.rule.Row; import org.kie.api.runtime.rule.ViewChangedEventListener; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + /** * Tests bad using and accessing to livequeries. */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LogicalInsertFromCollectionTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LogicalInsertFromCollectionTest.java index 221228f145d..78dbbf4d512 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LogicalInsertFromCollectionTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/LogicalInsertFromCollectionTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.functional; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; @@ -36,6 +34,8 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; +import static org.assertj.core.api.Assertions.assertThat; + /** * Test which takes a collection in working memory and calls iserLogical on each * its elements, than changes the collection in program and checks the correct diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/QueryBadResultTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/QueryBadResultTest.java index 6023517d6c1..dc334260d92 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/QueryBadResultTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/QueryBadResultTest.java @@ -16,10 +16,6 @@ package org.drools.testcoverage.functional; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.Collection; import org.drools.testcoverage.common.model.Person; @@ -36,6 +32,10 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.QueryResults; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * Tests bad using and accessing to queries. */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ResourcesTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ResourcesTest.java index 8dad7ae1926..35f6206e3a2 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ResourcesTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/ResourcesTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.functional; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.StringReader; import java.util.Collection; @@ -37,6 +35,8 @@ import org.kie.api.io.ResourceType; import org.kie.internal.builder.DecisionTableInputType; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests loading of different types of resources (DRL, DSL, DRF, BPMN2, DTABLE). * Packages are loaded and built using KnowledgeBuilder. diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/RuleTemplateTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/RuleTemplateTest.java index aba44c2fec0..d5ebf1bf1ff 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/RuleTemplateTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/RuleTemplateTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.functional; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; @@ -42,6 +40,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class RuleTemplateTest { diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/TemplatesTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/TemplatesTest.java index eace575e4a6..e7665a892be 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/TemplatesTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/TemplatesTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.functional; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.IOException; import java.io.InputStream; import java.io.StringReader; @@ -47,6 +45,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests templates - providers, generating rules, performance. */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/UnicodeTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/UnicodeTest.java index 4c7f25a435a..d2c1ef58bc8 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/UnicodeTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/UnicodeTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.functional; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.Collection; @@ -46,6 +44,8 @@ import org.kie.internal.builder.DecisionTableInputType; import org.kie.internal.utils.KieHelper; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests Drools engine capabilities regarding Unicode characters * diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/decisiontable/DecisionTableKieContainerTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/decisiontable/DecisionTableKieContainerTest.java index 941b6ccb50d..a0bd37e5129 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/decisiontable/DecisionTableKieContainerTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/decisiontable/DecisionTableKieContainerTest.java @@ -1,7 +1,5 @@ package org.drools.testcoverage.functional.decisiontable; -import static org.assertj.core.api.Assertions.assertThat; - import org.drools.testcoverage.common.model.Record; import org.junit.Test; import org.kie.api.KieBase; @@ -9,6 +7,8 @@ import org.kie.api.runtime.KieContainer; import org.kie.api.runtime.StatelessKieSession; +import static org.assertj.core.api.Assertions.assertThat; + public class DecisionTableKieContainerTest { @Test diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathCepTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathCepTest.java index 4807d171f07..e4e1099822a 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathCepTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathCepTest.java @@ -16,9 +16,6 @@ package org.drools.testcoverage.functional.oopath; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.mvel.compiler.TestUtil.assertDrlHasCompilationError; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -41,6 +38,9 @@ import org.kie.api.runtime.rule.EntryPoint; import org.kie.api.time.SessionPseudoClock; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.mvel.compiler.TestUtil.assertDrlHasCompilationError; + /** * Tests usage of OOPath expressions with CEP (events, event windows, event streams). */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathLogicalBranchesTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathLogicalBranchesTest.java index c83f4d82ae6..2295b31df60 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathLogicalBranchesTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathLogicalBranchesTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.functional.oopath; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -36,6 +34,8 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests usage of OOPath expressions resulting in multiple conditional branches (e.g. OR operator). */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathSmokeTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathSmokeTest.java index 9447a11b63c..9b1031eefee 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathSmokeTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/functional/oopath/OOPathSmokeTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.functional.oopath; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import org.drools.testcoverage.common.model.Address; @@ -37,6 +35,8 @@ import org.kie.api.runtime.KieContainer; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests basic usage of OOPath expressions. */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AbstractCompositeRestrictionTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AbstractCompositeRestrictionTest.java index e5524ad420a..5c89d998474 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AbstractCompositeRestrictionTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AbstractCompositeRestrictionTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import java.util.List; @@ -31,6 +29,8 @@ import org.kie.api.builder.KieBuilder; import org.kie.api.builder.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * Bugfix test for bz#724655 'NPE in AbstractCompositionRestriction when using * unbound variables' diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AccumulateRecalculationTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AccumulateRecalculationTest.java index ade37af9574..84581d16ced 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AccumulateRecalculationTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/AccumulateRecalculationTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import org.drools.testcoverage.common.model.MyFact; import org.junit.Test; import org.kie.api.io.ResourceType; @@ -25,6 +23,8 @@ import org.kie.api.runtime.rule.FactHandle; import org.kie.internal.utils.KieHelper; +import static org.assertj.core.api.Assertions.assertThat; + /** * BZ 1190923 reproducer by Hisao Furuich. */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DateExtendingFactTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DateExtendingFactTest.java index 16d81a36758..06dcda07fd6 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DateExtendingFactTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DateExtendingFactTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import java.util.Date; @@ -30,6 +28,8 @@ import org.kie.api.builder.KieBuilder; import org.kie.api.builder.Message; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests compilation of facts extending java.util.Date (BZ 1072629). */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeclarationWithOrTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeclarationWithOrTest.java index 423f146f042..d455c1c8052 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeclarationWithOrTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeclarationWithOrTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -32,6 +30,8 @@ import org.kie.api.builder.KieBuilder; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests handling a variable binding in LHS with OR (BZ 1136424). */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeserializationWithCompositeTriggerTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeserializationWithCompositeTriggerTest.java index ffd0d55fab3..4da63c6d7ad 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeserializationWithCompositeTriggerTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DeserializationWithCompositeTriggerTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import org.drools.mvel.compiler.StockTick; @@ -40,6 +38,8 @@ import org.kie.api.runtime.KieSessionConfiguration; import org.kie.api.runtime.conf.TimerJobFactoryOption; +import static org.assertj.core.api.Assertions.assertThat; + /** * Verifies that serialization and de-serialization of a composite trigger succeeds (BZ 1142914). */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DroolsGcCausesNPETest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DroolsGcCausesNPETest.java index 484e93454f4..877260e39b0 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DroolsGcCausesNPETest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/DroolsGcCausesNPETest.java @@ -16,9 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; - import java.util.List; import java.util.Random; import java.util.concurrent.TimeUnit; @@ -45,6 +42,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; + /** * Reproducer for BZ 1181584, by Mike Wilson. */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EqualityKeyOverrideTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EqualityKeyOverrideTest.java index 15fe5f80023..24e9e31280e 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EqualityKeyOverrideTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EqualityKeyOverrideTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import org.drools.testcoverage.common.KieSessionTest; @@ -31,6 +29,8 @@ import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.FactHandle; +import static org.assertj.core.api.Assertions.assertThat; + public class EqualityKeyOverrideTest extends KieSessionTest { private static final int ANY_NUMBER = 42; diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EscapesInMetadataTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EscapesInMetadataTest.java index 8c09a5b5186..54daba2336e 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EscapesInMetadataTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EscapesInMetadataTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import java.util.Map; @@ -33,6 +31,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + /** * Test to verify BRMS-312 (Allow escaping characters in metadata value) is * fixed diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EventDeserializationInPastTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EventDeserializationInPastTest.java index 16dcfa178a6..d8442e736b4 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EventDeserializationInPastTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/EventDeserializationInPastTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.fail; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.Serializable; @@ -38,6 +36,8 @@ import org.kie.internal.marshalling.MarshallerFactory; import org.kie.internal.utils.KieHelper; +import static org.assertj.core.api.Assertions.fail; + /** * Reproducer for BZ 1205666, BZ 1205671 (DROOLS-749). */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FixedPatternTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FixedPatternTest.java index c2937e355e9..39d92976c21 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FixedPatternTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FixedPatternTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -35,6 +33,8 @@ import org.kie.api.io.Resource; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + /** * Test for BZ 1150308. */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FromGenericCollectionTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FromGenericCollectionTest.java index 05edee0026b..1e148e76d6a 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FromGenericCollectionTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FromGenericCollectionTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -36,6 +34,8 @@ import org.kie.api.KieBase; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class FromGenericCollectionTest { diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FusionAfterBeforeTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FusionAfterBeforeTest.java index 5704b7bd277..5c243d8d640 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FusionAfterBeforeTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/FusionAfterBeforeTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import java.util.SortedSet; import java.util.TreeSet; @@ -49,6 +47,8 @@ import org.kie.api.time.SessionPseudoClock; import org.kie.internal.utils.KieHelper; +import static org.assertj.core.api.Assertions.assertThat; + /** * Test to verify BRMS-582 (use of 'after' and 'before' operators ends with NPE) * is fixed. diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/GlobalOnLHSTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/GlobalOnLHSTest.java index a935e8a4718..abc5607167d 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/GlobalOnLHSTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/GlobalOnLHSTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -36,6 +34,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + public class GlobalOnLHSTest extends KieSessionTest { private static final Logger LOGGER = LoggerFactory.getLogger(GlobalOnLHSTest.class); diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/InaccurateComparisonTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/InaccurateComparisonTest.java index 91497d2a9e8..f489d229b74 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/InaccurateComparisonTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/InaccurateComparisonTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import org.drools.testcoverage.common.model.Message; @@ -32,6 +30,8 @@ import org.kie.api.KieBase; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests problems with large numbers to String conversion. See DROOLS-167. */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/LogicalInsertionsSerializationTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/LogicalInsertionsSerializationTest.java index 6ab1ef8c19b..ff2218779e3 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/LogicalInsertionsSerializationTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/LogicalInsertionsSerializationTest.java @@ -16,9 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.testcoverage.common.util.KieUtil.getServices; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -41,6 +38,9 @@ import org.kie.api.marshalling.Marshaller; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.testcoverage.common.util.KieUtil.getServices; + public class LogicalInsertionsSerializationTest extends KieSessionTest { private static final String DRL_FILE = "logical-insertion.drl"; diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultiRestrictionPatternTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultiRestrictionPatternTest.java index 9d790917102..f24e438798f 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultiRestrictionPatternTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultiRestrictionPatternTest.java @@ -16,9 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.testcoverage.common.util.KieUtil.getCommands; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -34,6 +31,9 @@ import org.kie.api.command.Command; import org.kie.api.io.Resource; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.testcoverage.common.util.KieUtil.getCommands; + /** * Test to verify BRMS-364 (multi-restriction pattern throws UnsupportedOpEx) is * fixed diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleKieBaseListenersTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleKieBaseListenersTest.java index ecbd958b0a0..afb6529a357 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleKieBaseListenersTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleKieBaseListenersTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; @@ -32,6 +30,8 @@ import org.kie.api.event.kiebase.DefaultKieBaseEventListener; import org.kie.api.event.kiebase.KieBaseEventListener; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class MultipleKieBaseListenersTest { diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSalienceUpdateFactTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSalienceUpdateFactTest.java index 6a1deee6622..ad2b9857c04 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSalienceUpdateFactTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSalienceUpdateFactTest.java @@ -16,9 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; -import static org.drools.testcoverage.common.util.KieUtil.getCommands; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -38,6 +35,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; +import static org.drools.testcoverage.common.util.KieUtil.getCommands; + /** * Test to verify that BRMS-580 is fixed. NPE when trying to update fact with * rules with different saliences. diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSheetsLoadingTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSheetsLoadingTest.java index 681688f0ebf..312813539bf 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSheetsLoadingTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MultipleSheetsLoadingTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import java.util.HashSet; import java.util.Set; @@ -43,6 +41,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests loading decision tables from several worksheets in a XLS file. */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MvelOverloadedMethodsUsageTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MvelOverloadedMethodsUsageTest.java index 90c8daa2724..30482f43209 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MvelOverloadedMethodsUsageTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/MvelOverloadedMethodsUsageTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -34,6 +32,8 @@ import org.kie.api.io.Resource; import org.kie.internal.command.CommandFactory; +import static org.assertj.core.api.Assertions.assertThat; + /** * Test verifies that bug #843284 is fixed. Bug is about Mvel not choosing * correct overloaded method from multiple with same types of arguments but in diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NonStringCompareTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NonStringCompareTest.java index 3f655265b18..d491bf0d000 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NonStringCompareTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NonStringCompareTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import org.drools.testcoverage.common.util.KieBaseTestConfiguration; @@ -34,6 +32,8 @@ import org.kie.api.definition.type.FactType; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class NonStringCompareTest { diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NotInFusionTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NotInFusionTest.java index 3929054450d..d1fad2a3118 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NotInFusionTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/NotInFusionTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import org.drools.testcoverage.common.KieSessionTest; @@ -31,6 +29,8 @@ import org.kie.api.io.Resource; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; + // BZ 1009348 public class NotInFusionTest extends KieSessionTest { diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/PropertyListenerTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/PropertyListenerTest.java index a640af62d0b..ed645745a9e 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/PropertyListenerTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/PropertyListenerTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.ArrayList; @@ -40,6 +38,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + /** * Bugfix regression test for: * https://bugzilla.redhat.com/show_bug.cgi?id=746887 diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SerializationWithCollectTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SerializationWithCollectTest.java index d7e1521969f..5a37ade8b06 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SerializationWithCollectTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SerializationWithCollectTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.fail; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -31,6 +29,8 @@ import org.kie.internal.marshalling.MarshallerFactory; import org.kie.internal.utils.KieHelper; +import static org.assertj.core.api.Assertions.fail; + /** * Simple reproducer for BZ 1193600 - serialization of rules with collect. */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SessionInsertMultiThreadingTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SessionInsertMultiThreadingTest.java index acc2ea78c83..3ee7480d53c 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SessionInsertMultiThreadingTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/SessionInsertMultiThreadingTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -46,6 +44,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + /** * Test to verify BRMS-532 (Drools Session insert * ConcurrentModificationException in Multithreading Environment) is fixed diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/StarImportTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/StarImportTest.java index 2dec016a776..b06c6036918 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/StarImportTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/StarImportTest.java @@ -16,13 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.fail; -import static org.drools.testcoverage.common.util.KieUtil.getCommands; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -43,6 +36,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.fail; +import static org.drools.testcoverage.common.util.KieUtil.getCommands; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + /** * Test suite for processing of facts imported using a "star" import and * declared in DRL at the same time. diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/UnwantedStringConversionTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/UnwantedStringConversionTest.java index 497017115d0..932dc401588 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/UnwantedStringConversionTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/UnwantedStringConversionTest.java @@ -16,8 +16,6 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Collection; import org.drools.testcoverage.common.listener.TrackingAgendaEventListener; @@ -36,6 +34,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class UnwantedStringConversionTest { private static final Logger LOGGER = LoggerFactory.getLogger(UnwantedStringConversionTest.class); diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/XSDResourceTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/XSDResourceTest.java index 3593160a842..f9a8830e9f4 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/XSDResourceTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/XSDResourceTest.java @@ -16,12 +16,12 @@ package org.drools.testcoverage.regression; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.kie.api.KieServices; import org.kie.api.runtime.KieContainer; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests KIE package compilation when there is a XSD resource (BZ 1120972). */ diff --git a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/mvel/MvelLinkageErrorTest.java b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/mvel/MvelLinkageErrorTest.java index 4e27d551673..4d1db18ad20 100644 --- a/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/mvel/MvelLinkageErrorTest.java +++ b/drools-test-coverage/test-suite/src/test/java/org/drools/testcoverage/regression/mvel/MvelLinkageErrorTest.java @@ -16,9 +16,6 @@ package org.drools.testcoverage.regression.mvel; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatCode; - import java.util.ArrayList; import java.util.List; @@ -27,6 +24,9 @@ import org.kie.api.builder.KieFileSystem; import org.kie.api.runtime.KieSession; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatCode; + /** * Tests handling a collision of identifer and dynamic package import (BZ 1321281). * The test is modified not to depend on specific platforms (Windows, MacOS) not preserving case in file names. diff --git a/drools-xml-support/src/test/java/org/drools/xml/support/XStreamXMLTest.java b/drools-xml-support/src/test/java/org/drools/xml/support/XStreamXMLTest.java index 8384ce41ded..c52e79d9a0f 100644 --- a/drools-xml-support/src/test/java/org/drools/xml/support/XStreamXMLTest.java +++ b/drools-xml-support/src/test/java/org/drools/xml/support/XStreamXMLTest.java @@ -15,9 +15,6 @@ */ package org.drools.xml.support; -import static org.assertj.core.api.Assertions.assertThat; -import static org.kie.utll.xml.XStreamUtils.createTrustingXStream; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -27,6 +24,7 @@ import java.util.Map; import java.util.Set; +import com.thoughtworks.xstream.XStream; import org.drools.core.base.RuleNameEndsWithAgendaFilter; import org.drools.core.command.runtime.process.StartProcessCommand; import org.drools.core.command.runtime.rule.AgendaGroupSetFocusCommand; @@ -48,7 +46,8 @@ import org.kie.api.runtime.rule.FactHandle; import org.kie.api.runtime.rule.QueryResults; -import com.thoughtworks.xstream.XStream; +import static org.assertj.core.api.Assertions.assertThat; +import static org.kie.utll.xml.XStreamUtils.createTrustingXStream; public class XStreamXMLTest { diff --git a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/DMNDecisionTableHitPolicyTest.java b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/DMNDecisionTableHitPolicyTest.java index fb6b6919bf6..73c982828b6 100644 --- a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/DMNDecisionTableHitPolicyTest.java +++ b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/DMNDecisionTableHitPolicyTest.java @@ -16,10 +16,6 @@ package org.kie.dmn.core; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -37,6 +33,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class DMNDecisionTableHitPolicyTest extends BaseInterpretedVsCompiledTest { public static final Logger LOG = LoggerFactory.getLogger(DMNDecisionTableHitPolicyTest.class); diff --git a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/internal/utils/DRGAnalysisUtilsTest.java b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/internal/utils/DRGAnalysisUtilsTest.java index 5177ac976f8..c61753a245d 100644 --- a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/internal/utils/DRGAnalysisUtilsTest.java +++ b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/internal/utils/DRGAnalysisUtilsTest.java @@ -16,12 +16,6 @@ package org.kie.dmn.core.internal.utils; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; - import java.util.Collection; import java.util.stream.Collectors; @@ -35,6 +29,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; + public class DRGAnalysisUtilsTest { public static final Logger LOG = LoggerFactory.getLogger(DRGAnalysisUtilsTest.class); diff --git a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/stronglytyped/AnnotationsTest.java b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/stronglytyped/AnnotationsTest.java index 3fb55ce2466..c1686c3e03e 100644 --- a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/stronglytyped/AnnotationsTest.java +++ b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/stronglytyped/AnnotationsTest.java @@ -16,8 +16,6 @@ package org.kie.dmn.core.stronglytyped; -import static org.assertj.core.api.Assertions.assertThat; - import java.lang.reflect.Field; import java.time.Duration; import java.time.LocalDate; @@ -26,6 +24,8 @@ import java.time.Period; import java.util.Arrays; +import com.fasterxml.jackson.databind.json.JsonMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import org.junit.Test; import org.kie.dmn.api.core.DMNContext; import org.kie.dmn.api.core.DMNModel; @@ -39,8 +39,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.databind.json.JsonMapper; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import static org.assertj.core.api.Assertions.assertThat; public class AnnotationsTest extends BaseVariantTest { diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java index e4535871cc7..15b311a6437 100644 --- a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java +++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/jandex/AbstractJandexTest.java @@ -16,8 +16,6 @@ package org.kie.dmn.feel.jandex; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -44,6 +42,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + public abstract class AbstractJandexTest { public static final Logger LOG = LoggerFactory.getLogger(AbstractJandexTest.class); diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/functions/interval/FormulasTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/functions/interval/FormulasTest.java index 2a4f9f5f814..ce3bbc096a6 100644 --- a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/functions/interval/FormulasTest.java +++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/functions/interval/FormulasTest.java @@ -16,9 +16,10 @@ package org.kie.dmn.feel.runtime.functions.interval; -import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + // ScratchPad to support discussion on https://issues.omg.org/browse/DMN14-125 public class FormulasTest { diff --git a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/AssociationDirectionTest.java b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/AssociationDirectionTest.java index a0d5a5bda63..c8a76e369ac 100644 --- a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/AssociationDirectionTest.java +++ b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/AssociationDirectionTest.java @@ -16,11 +16,11 @@ package org.kie.dmn.model.api; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import org.junit.Test; - public class AssociationDirectionTest { @Test diff --git a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/DecisionTableOrientationTest.java b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/DecisionTableOrientationTest.java index 8450ba507fd..0a06b19476b 100644 --- a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/DecisionTableOrientationTest.java +++ b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/DecisionTableOrientationTest.java @@ -16,11 +16,11 @@ package org.kie.dmn.model.api; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import org.junit.Test; - public class DecisionTableOrientationTest { @Test diff --git a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/FunctionKindTest.java b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/FunctionKindTest.java index e5cafe39177..09c172bc762 100644 --- a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/FunctionKindTest.java +++ b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/FunctionKindTest.java @@ -16,11 +16,11 @@ package org.kie.dmn.model.api; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import org.junit.Test; - public class FunctionKindTest { @Test diff --git a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/AlignmentKindTest.java b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/AlignmentKindTest.java index d6b57435c32..a40f9e33cd0 100644 --- a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/AlignmentKindTest.java +++ b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/AlignmentKindTest.java @@ -16,11 +16,11 @@ package org.kie.dmn.model.api.dmndi; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import org.junit.Test; - public class AlignmentKindTest { @Test diff --git a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/KnownColorTest.java b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/KnownColorTest.java index d8753ef5fd4..56bb0aca1a3 100644 --- a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/KnownColorTest.java +++ b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/api/dmndi/KnownColorTest.java @@ -16,11 +16,11 @@ package org.kie.dmn.model.api.dmndi; +import org.junit.Test; + import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import org.junit.Test; - public class KnownColorTest { @Test diff --git a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java index 4ff6dbf9947..c8d6625586b 100644 --- a/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java +++ b/kie-dmn/kie-dmn-model/src/test/java/org/kie/dmn/model/jandex/KieDMNModelJandexTest.java @@ -16,8 +16,6 @@ package org.kie.dmn.model.jandex; -import static org.assertj.core.api.Assertions.assertThat; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -44,6 +42,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + public class KieDMNModelJandexTest { public static final Logger LOG = LoggerFactory.getLogger(KieDMNModelJandexTest.class); diff --git a/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/FEELSchemaEnumTest.java b/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/FEELSchemaEnumTest.java index 1f8fe6ee16c..4d21b65a729 100644 --- a/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/FEELSchemaEnumTest.java +++ b/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/FEELSchemaEnumTest.java @@ -16,8 +16,6 @@ package org.kie.dmn.openapi; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.ArrayList; import java.util.List; @@ -27,6 +25,8 @@ import org.kie.dmn.feel.runtime.impl.RangeImpl; import org.kie.dmn.openapi.impl.FEELSchemaEnum; +import static org.assertj.core.api.Assertions.assertThat; + public class FEELSchemaEnumTest extends BaseDMNOASTest { @Test diff --git a/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/ProcessItemTest.java b/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/ProcessItemTest.java index c56ce4d48a9..d425074a447 100644 --- a/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/ProcessItemTest.java +++ b/kie-dmn/kie-dmn-openapi/src/test/java/org/kie/dmn/openapi/ProcessItemTest.java @@ -16,18 +16,17 @@ package org.kie.dmn.openapi; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.io.IOException; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.networknt.schema.JsonSchema; import org.junit.Test; import org.kie.dmn.api.core.DMNModel; import org.kie.dmn.api.core.DMNRuntime; import org.kie.dmn.openapi.model.DMNOASResult; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.networknt.schema.JsonSchema; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class ProcessItemTest extends BaseDMNOASTest { diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNKMeansModelPMMLTest.java b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNKMeansModelPMMLTest.java index 7ca87b546dc..303ce5cd6b3 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNKMeansModelPMMLTest.java +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNKMeansModelPMMLTest.java @@ -16,8 +16,6 @@ package org.kie.dmn.pmml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import org.junit.Test; @@ -30,6 +28,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + public abstract class DMNKMeansModelPMMLTest { private static final Logger LOG = LoggerFactory.getLogger(DMNKMeansModelPMMLTest.class); diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNMiningModelPMMLTest.java b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNMiningModelPMMLTest.java index ec321ccc53b..c8cf25ec7c4 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNMiningModelPMMLTest.java +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNMiningModelPMMLTest.java @@ -16,8 +16,6 @@ package org.kie.dmn.pmml; -import static org.assertj.core.api.Assertions.assertThat; - import java.math.BigDecimal; import org.junit.Test; @@ -30,6 +28,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + public abstract class DMNMiningModelPMMLTest { public static final Logger LOG = LoggerFactory.getLogger(DMNMiningModelPMMLTest.class); diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNaiveBayesPMMLTest.java b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNaiveBayesPMMLTest.java index e3a679a2018..19f7878a9e5 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNaiveBayesPMMLTest.java +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNaiveBayesPMMLTest.java @@ -16,8 +16,6 @@ package org.kie.dmn.pmml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import org.junit.Test; @@ -30,6 +28,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + public abstract class DMNNaiveBayesPMMLTest { private static final Logger LOG = LoggerFactory.getLogger(DMNNaiveBayesPMMLTest.class); diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNeuralNetworkPMMLTest.java b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNeuralNetworkPMMLTest.java index 244331dede3..dab86c5e533 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNeuralNetworkPMMLTest.java +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNNeuralNetworkPMMLTest.java @@ -16,8 +16,6 @@ package org.kie.dmn.pmml; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Map; import org.junit.Test; @@ -30,6 +28,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + public abstract class DMNNeuralNetworkPMMLTest { private static final Logger LOG = LoggerFactory.getLogger(DMNNeuralNetworkPMMLTest.class); diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNRegressionPMMLTest.java b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNRegressionPMMLTest.java index 4bc0ca4f7bc..a4fb964551d 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNRegressionPMMLTest.java +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNRegressionPMMLTest.java @@ -16,8 +16,6 @@ package org.kie.dmn.pmml; -import static org.assertj.core.api.Assertions.assertThat; - import java.math.BigDecimal; import org.junit.Test; @@ -30,6 +28,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + public abstract class DMNRegressionPMMLTest { public static final Logger LOG = LoggerFactory.getLogger(DMNRegressionPMMLTest.class); diff --git a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNTreePMMLTest.java b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNTreePMMLTest.java index 69e2c710999..ca559aa8bc1 100644 --- a/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNTreePMMLTest.java +++ b/kie-dmn/kie-dmn-pmml-tests-parent/kie-dmn-pmml-tests/src/test/java/org/kie/dmn/pmml/DMNTreePMMLTest.java @@ -16,8 +16,6 @@ package org.kie.dmn.pmml; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.kie.dmn.api.core.DMNContext; import org.kie.dmn.api.core.DMNModel; @@ -28,6 +26,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThat; + public abstract class DMNTreePMMLTest { public static final Logger LOG = LoggerFactory.getLogger(DMNTreePMMLTest.class); diff --git a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/AbstractValidatorTest.java b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/AbstractValidatorTest.java index adebf6d7af9..e5b72fd99b2 100644 --- a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/AbstractValidatorTest.java +++ b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/AbstractValidatorTest.java @@ -16,10 +16,6 @@ package org.kie.dmn.validation; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; - import java.io.File; import java.io.InputStreamReader; import java.io.Reader; @@ -41,6 +37,10 @@ import org.kie.dmn.model.api.Definitions; import org.kie.internal.utils.ChainedProperties; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; + public abstract class AbstractValidatorTest { protected static DMNValidator validator; diff --git a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/ValidatorTest.java b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/ValidatorTest.java index f89494a7af9..2ed458115f6 100644 --- a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/ValidatorTest.java +++ b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/ValidatorTest.java @@ -16,13 +16,6 @@ package org.kie.dmn.validation; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.kie.dmn.validation.DMNValidator.Validation.VALIDATE_COMPILATION; -import static org.kie.dmn.validation.DMNValidator.Validation.VALIDATE_MODEL; -import static org.kie.dmn.validation.DMNValidator.Validation.VALIDATE_SCHEMA; - import java.io.File; import java.io.IOException; import java.io.InputStreamReader; @@ -49,6 +42,13 @@ import org.kie.dmn.model.api.DMNModelInstrumentedBase; import org.kie.dmn.model.api.Definitions; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.kie.dmn.validation.DMNValidator.Validation.VALIDATE_COMPILATION; +import static org.kie.dmn.validation.DMNValidator.Validation.VALIDATE_MODEL; +import static org.kie.dmn.validation.DMNValidator.Validation.VALIDATE_SCHEMA; + public class ValidatorTest extends AbstractValidatorTest { @Test diff --git a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/DMNDTAnalysisExceptionTest.java b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/DMNDTAnalysisExceptionTest.java index 28f3281756b..590efc909c1 100644 --- a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/DMNDTAnalysisExceptionTest.java +++ b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/DMNDTAnalysisExceptionTest.java @@ -16,12 +16,12 @@ package org.kie.dmn.validation.dtanalysis; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Test; import org.kie.dmn.model.api.DecisionTable; import org.kie.dmn.model.v1_3.TDecisionTable; +import static org.assertj.core.api.Assertions.assertThat; + public class DMNDTAnalysisExceptionTest { @Test diff --git a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/IntervalTest.java b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/IntervalTest.java index d3b3d1a82c5..0683505c0a9 100644 --- a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/IntervalTest.java +++ b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/IntervalTest.java @@ -16,8 +16,6 @@ package org.kie.dmn.validation.dtanalysis; -import static org.assertj.core.api.Assertions.assertThat; - import java.time.LocalDate; import java.util.Arrays; import java.util.Collections; @@ -29,6 +27,8 @@ import org.kie.dmn.validation.dtanalysis.model.Domain; import org.kie.dmn.validation.dtanalysis.model.Interval; +import static org.assertj.core.api.Assertions.assertThat; + public class IntervalTest { @Test diff --git a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/model/NullBoundImplTest.java b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/model/NullBoundImplTest.java index 0bdd6a1c326..3375a5837ba 100644 --- a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/model/NullBoundImplTest.java +++ b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/dtanalysis/model/NullBoundImplTest.java @@ -16,8 +16,6 @@ package org.kie.dmn.validation.dtanalysis.model; -import static org.assertj.core.api.Assertions.assertThatIllegalStateException; - import java.math.BigDecimal; import org.junit.Test; @@ -25,6 +23,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; + public class NullBoundImplTest { public static final Logger LOG = LoggerFactory.getLogger(NullBoundImplTest.class); diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/ClusterWithTransformationsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/ClusterWithTransformationsTest.java index d49ecfce068..dd5e0ad0bb0 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/ClusterWithTransformationsTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/ClusterWithTransformationsTest.java @@ -16,9 +16,6 @@ package org.kie.pmml.clustering.tests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -33,6 +30,9 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + @RunWith(Parameterized.class) public class ClusterWithTransformationsTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/EuclideanDistanceTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/EuclideanDistanceTest.java index a2922b98563..589eb2cf899 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/EuclideanDistanceTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/EuclideanDistanceTest.java @@ -1,7 +1,5 @@ package org.kie.pmml.clustering.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -17,6 +15,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class EuclideanDistanceTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/MultipleClustersSameClassTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/MultipleClustersSameClassTest.java index 6aad28bff6a..581e8893000 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/MultipleClustersSameClassTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/MultipleClustersSameClassTest.java @@ -1,7 +1,5 @@ package org.kie.pmml.clustering.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -17,6 +15,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class MultipleClustersSameClassTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/SingleIrisKMeansClusteringTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/SingleIrisKMeansClusteringTest.java index 61562835caa..668bd431022 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/SingleIrisKMeansClusteringTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-tests/src/test/java/org/kie/pmml/clustering/tests/SingleIrisKMeansClusteringTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.clustering.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SingleIrisKMeansClusteringTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/AirconditioningScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/AirconditioningScorecardTest.java index c3648ad4df1..46610c17d73 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/AirconditioningScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/AirconditioningScorecardTest.java @@ -15,8 +15,6 @@ */ package org.kie.pmml.models.drools.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class AirconditioningScorecardTest extends AbstractPMMLTest { private static final String FILE_NAME = "air-conditioning-weather-scorecard.pmml"; diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/BasicComplexPartialScoreTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/BasicComplexPartialScoreTest.java index aba54015f0c..a080f284327 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/BasicComplexPartialScoreTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/BasicComplexPartialScoreTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.drools.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -32,6 +30,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class BasicComplexPartialScoreTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundNestedPredicateScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundNestedPredicateScorecardTest.java index 2ada90d7441..be18730a77a 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundNestedPredicateScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundNestedPredicateScorecardTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.drools.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class CompoundNestedPredicateScorecardTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundPredicateScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundPredicateScorecardTest.java index c93a283af91..875aac99af8 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundPredicateScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/CompoundPredicateScorecardTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.drools.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class CompoundPredicateScorecardTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleAirconditioningScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleAirconditioningScorecardTest.java index e4382e9c10f..ff616f83ff9 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleAirconditioningScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleAirconditioningScorecardTest.java @@ -15,8 +15,6 @@ */ package org.kie.pmml.models.drools.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class MultipleAirconditioningScorecardTest extends AbstractPMMLTest { private static final String FILE_NAME = "MultipleScorecard.pmml"; diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java index 0031b281eb5..e71061fb4f0 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.drools.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class MultipleCompoundNestedPredicateScorecardTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/NestedComplexPartialScoreTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/NestedComplexPartialScoreTest.java index ca9ae027f11..8ce5a473e5f 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/NestedComplexPartialScoreTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/NestedComplexPartialScoreTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.drools.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -32,6 +30,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class NestedComplexPartialScoreTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardCategoricalTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardCategoricalTest.java index 9b95aa11976..3b6acda5598 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardCategoricalTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardCategoricalTest.java @@ -16,9 +16,6 @@ package org.kie.pmml.models.drools.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -36,6 +33,9 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertFalse; + @RunWith(Parameterized.class) public class SimpleScorecardCategoricalTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardMixedVariablesTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardMixedVariablesTest.java index 4f7a8730272..99ed19e63a5 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardMixedVariablesTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardMixedVariablesTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.drools.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SimpleScorecardMixedVariablesTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardTest.java index 179b2208ecf..0b6463ed13a 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardTest.java @@ -16,9 +16,6 @@ package org.kie.pmml.models.drools.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -33,6 +30,9 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + @RunWith(Parameterized.class) public class SimpleScorecardTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardWithTransformationsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardWithTransformationsTest.java index 8fe911571f9..2ce081e348c 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardWithTransformationsTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-scorecard/kie-pmml-models-drools-scorecard-tests/src/test/java/org/kie/pmml/models/drools/scorecard/tests/SimpleScorecardWithTransformationsTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.drools.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SimpleScorecardWithTransformationsTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/BostonHousingDataTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/BostonHousingDataTreeTest.java index bd66dcdc1cc..6e64b052aac 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/BostonHousingDataTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/BostonHousingDataTreeTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.drools.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class BostonHousingDataTreeTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/CompoundPredicateTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/CompoundPredicateTreeTest.java index 39665ebbec6..ce15786e415 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/CompoundPredicateTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/CompoundPredicateTreeTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.drools.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class CompoundPredicateTreeTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/IrisDataTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/IrisDataTreeTest.java index 9c66e789cde..7204c8a5252 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/IrisDataTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/IrisDataTreeTest.java @@ -1,7 +1,5 @@ package org.kie.pmml.models.drools.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -15,6 +13,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class IrisDataTreeTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/PlanActivityTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/PlanActivityTreeTest.java index d5097fa06e1..6a6fc492856 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/PlanActivityTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/PlanActivityTreeTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.drools.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class PlanActivityTreeTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/ReturnLastPredictionStrategyTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/ReturnLastPredictionStrategyTreeTest.java index d0c2bd63e45..aabe8c7c5b6 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/ReturnLastPredictionStrategyTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/ReturnLastPredictionStrategyTreeTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.drools.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class ReturnLastPredictionStrategyTreeTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelTest.java index 80be1a1f2a0..67daf4e7df5 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelTest.java @@ -15,8 +15,6 @@ */ package org.kie.pmml.models.drools.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -30,6 +28,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SampleMineTreeModelTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelWithTransformationsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelWithTransformationsTest.java index 4d1c2aae24b..cd791c1683f 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelWithTransformationsTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SampleMineTreeModelWithTransformationsTest.java @@ -16,9 +16,6 @@ package org.kie.pmml.models.drools.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -33,6 +30,9 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + @RunWith(Parameterized.class) public class SampleMineTreeModelWithTransformationsTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleClassificationTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleClassificationTreeTest.java index f02ff4f8819..b869873361d 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleClassificationTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleClassificationTreeTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.drools.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SimpleClassificationTreeTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleSetPredicateTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleSetPredicateTreeTest.java index 4dde98c7dbc..ea5c5d28e5f 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleSetPredicateTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-drools/kie-pmml-models-drools-tree/kie-pmml-models-drools-tree-tests/src/test/java/org/kie/pmml/models/drools/tree/tests/SimpleSetPredicateTreeTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.drools.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SimpleSetPredicateTreeTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelChainTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelChainTest.java index 9035144abf3..70fe8686f1b 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelChainTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelChainTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class MiningModelChainTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelSummedTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelSummedTest.java index b8ac642f866..38aa36717e9 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelSummedTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningModelSummedTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class MiningModelSummedTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningWithNestedRefersTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningWithNestedRefersTest.java index a1ac139abad..5defc5a16cb 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningWithNestedRefersTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MiningWithNestedRefersTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class MiningWithNestedRefersTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MixedMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MixedMiningTest.java index d2334994796..0f18f07d5b3 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MixedMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MixedMiningTest.java @@ -16,9 +16,6 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -33,6 +30,9 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + @RunWith(Parameterized.class) public class MixedMiningTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultipleMixedMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultipleMixedMiningTest.java index 7c5fb497614..4448bb968c0 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultipleMixedMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultipleMixedMiningTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class MultipleMixedMiningTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultiplePredicatesMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultiplePredicatesMiningTest.java index 906e9922c56..853a09f3147 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultiplePredicatesMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/MultiplePredicatesMiningTest.java @@ -16,10 +16,6 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.kie.pmml.api.enums.ResultCode.FAIL; -import static org.kie.pmml.api.enums.ResultCode.OK; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -33,6 +29,10 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; +import static org.kie.pmml.api.enums.ResultCode.FAIL; +import static org.kie.pmml.api.enums.ResultCode.OK; + @RunWith(Parameterized.class) public class MultiplePredicatesMiningTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/PredicatesMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/PredicatesMiningTest.java index 82c11f679a0..c395de5c0fa 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/PredicatesMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/PredicatesMiningTest.java @@ -16,10 +16,6 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.kie.pmml.api.enums.ResultCode.FAIL; -import static org.kie.pmml.api.enums.ResultCode.OK; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -33,6 +29,10 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; +import static org.kie.pmml.api.enums.ResultCode.FAIL; +import static org.kie.pmml.api.enums.ResultCode.OK; + @RunWith(Parameterized.class) public class PredicatesMiningTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/RandomForestClassifierMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/RandomForestClassifierMiningTest.java index 9e1bb8a8020..e808943970e 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/RandomForestClassifierMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/RandomForestClassifierMiningTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class RandomForestClassifierMiningTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationClassificationSelectFirstTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationClassificationSelectFirstTest.java index ebed256fc16..dc8e13ca0c2 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationClassificationSelectFirstTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationClassificationSelectFirstTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SegmentationClassificationSelectFirstTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMajorityVoteMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMajorityVoteMiningTest.java index 7b114b9fb31..26dcca0d184 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMajorityVoteMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMajorityVoteMiningTest.java @@ -1,7 +1,5 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -15,6 +13,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SegmentationMajorityVoteMiningTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMaxMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMaxMiningTest.java index f04b5beff08..67ef37455ea 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMaxMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMaxMiningTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SegmentationMaxMiningTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMeanMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMeanMiningTest.java index 99787bba113..0e7b69b580d 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMeanMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMeanMiningTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SegmentationMeanMiningTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedian2MiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedian2MiningTest.java index 6a54a95ed13..ed14d98364e 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedian2MiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedian2MiningTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SegmentationMedian2MiningTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedianMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedianMiningTest.java index 0566cdeb34e..d28d2920db0 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedianMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationMedianMiningTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SegmentationMedianMiningTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSelectFirstMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSelectFirstMiningTest.java index bfb4b4b0fcd..0b71cdfc9fd 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSelectFirstMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSelectFirstMiningTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SegmentationSelectFirstMiningTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSumMiningTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSumMiningTest.java index e73d0d17968..eaae70f48ad 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSumMiningTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-tests/src/test/java/org/kie/pmml/mining/tests/SegmentationSumMiningTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.mining.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SegmentationSumMiningTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/CategoricalVariablesRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/CategoricalVariablesRegressionTest.java index d3225fb3389..f0781b942e8 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/CategoricalVariablesRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/CategoricalVariablesRegressionTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class CategoricalVariablesRegressionTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LinearRegressionSampleWithTransformationsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LinearRegressionSampleWithTransformationsTest.java index a0becea55d1..e20cd088f1e 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LinearRegressionSampleWithTransformationsTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LinearRegressionSampleWithTransformationsTest.java @@ -16,9 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -34,6 +31,9 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + @RunWith(Parameterized.class) public class LinearRegressionSampleWithTransformationsTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionIrisDataTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionIrisDataTest.java index 6b7658b1506..9334fa2acc6 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionIrisDataTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionIrisDataTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -32,6 +30,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class LogisticRegressionIrisDataTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionNoneNormalizationTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionNoneNormalizationTest.java index 2fb845cb7b8..ff9f36e5dd8 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionNoneNormalizationTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionNoneNormalizationTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -32,6 +30,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class LogisticRegressionNoneNormalizationTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSimplemaxNormalizationTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSimplemaxNormalizationTest.java index 6e41e0be9ed..cd43c5dc0b6 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSimplemaxNormalizationTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSimplemaxNormalizationTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -32,6 +30,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class LogisticRegressionSimplemaxNormalizationTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSoftmaxNormalizationTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSoftmaxNormalizationTest.java index fd5e742e625..206e67229a7 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSoftmaxNormalizationTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionSoftmaxNormalizationTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -32,6 +30,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class LogisticRegressionSoftmaxNormalizationTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionTest.java index eb29ac727a0..e2be864e315 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/LogisticRegressionTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -32,6 +30,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class LogisticRegressionTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MissingDataRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MissingDataRegressionTest.java index 5610c9c21ed..0092d78dbe4 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MissingDataRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MissingDataRegressionTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class MissingDataRegressionTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MixedVariablesRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MixedVariablesRegressionTest.java index f9e71104081..c467b6220be 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MixedVariablesRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MixedVariablesRegressionTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class MixedVariablesRegressionTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleCategoricalVariablesRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleCategoricalVariablesRegressionTest.java index 0844baaf575..ecccadcacc3 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleCategoricalVariablesRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleCategoricalVariablesRegressionTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class MultipleCategoricalVariablesRegressionTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleLogisticRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleLogisticRegressionTest.java index 468535080a0..9097b1ad31b 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleLogisticRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/MultipleLogisticRegressionTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -32,6 +30,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class MultipleLogisticRegressionTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesDecimalAndNegativeCoefsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesDecimalAndNegativeCoefsTest.java index 9fef7aa4881..eacc4d43675 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesDecimalAndNegativeCoefsTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesDecimalAndNegativeCoefsTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class NumericVariablesDecimalAndNegativeCoefsTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesLinearRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesLinearRegressionTest.java index b0e2892d5e3..1b75f8cc9e4 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesLinearRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesLinearRegressionTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class NumericVariablesLinearRegressionTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesPolynomialRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesPolynomialRegressionTest.java index 42524f59fca..c991afb04bf 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesPolynomialRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/NumericVariablesPolynomialRegressionTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class NumericVariablesPolynomialRegressionTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/OrderApprovalRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/OrderApprovalRegressionTest.java index c11e748773f..a0cd7b1cdd3 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/OrderApprovalRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/OrderApprovalRegressionTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -32,6 +30,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class OrderApprovalRegressionTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/PredictorTermRegressionTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/PredictorTermRegressionTest.java index 3d01982abf0..92878ac2e0a 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/PredictorTermRegressionTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/PredictorTermRegressionTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class PredictorTermRegressionTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationExpTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationExpTest.java index 4cce8daa0ab..e6f88b5b6eb 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationExpTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationExpTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class RegressionNormalizationExpTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationLogitTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationLogitTest.java index 6d68794a3c8..ebca9d9d395 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationLogitTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationLogitTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class RegressionNormalizationLogitTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationSoftmaxTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationSoftmaxTest.java index 12afd38c04f..737d50c1cfa 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationSoftmaxTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-tests/src/test/java/org/kie/pmml/regression/tests/RegressionNormalizationSoftmaxTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.regression.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class RegressionNormalizationSoftmaxTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/AirconditioningScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/AirconditioningScorecardTest.java index d15691eb408..9679ed53f8a 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/AirconditioningScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/AirconditioningScorecardTest.java @@ -15,8 +15,6 @@ */ package org.kie.pmml.models.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class AirconditioningScorecardTest extends AbstractPMMLTest { private static final String FILE_NAME = "air-conditioning-weather-scorecard.pmml"; diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/BasicComplexPartialScoreTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/BasicComplexPartialScoreTest.java index b1e9dc4e5ba..2e4c96ce728 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/BasicComplexPartialScoreTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/BasicComplexPartialScoreTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -32,6 +30,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class BasicComplexPartialScoreTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundNestedPredicateScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundNestedPredicateScorecardTest.java index 3d6428669a8..33c05ffd175 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundNestedPredicateScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundNestedPredicateScorecardTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class CompoundNestedPredicateScorecardTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundPredicateScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundPredicateScorecardTest.java index 16052dcfc02..784f977837e 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundPredicateScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/CompoundPredicateScorecardTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class CompoundPredicateScorecardTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleAirconditioningScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleAirconditioningScorecardTest.java index 7ee39f452c9..eb402b1a5de 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleAirconditioningScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleAirconditioningScorecardTest.java @@ -15,8 +15,6 @@ */ package org.kie.pmml.models.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class MultipleAirconditioningScorecardTest extends AbstractPMMLTest { private static final String FILE_NAME = "MultipleScorecard.pmml"; diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java index def295d5ea3..6a0ad802d81 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/MultipleCompoundNestedPredicateScorecardTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class MultipleCompoundNestedPredicateScorecardTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/NestedComplexPartialScoreTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/NestedComplexPartialScoreTest.java index 55b1761dd06..dbd2cbf80ca 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/NestedComplexPartialScoreTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/NestedComplexPartialScoreTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -32,6 +30,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class NestedComplexPartialScoreTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardCategoricalTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardCategoricalTest.java index e1e3c51b348..96354a7b8e1 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardCategoricalTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardCategoricalTest.java @@ -16,9 +16,6 @@ package org.kie.pmml.models.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -27,7 +24,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.assertj.core.data.Percentage; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -37,6 +33,9 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertFalse; + @RunWith(Parameterized.class) public class SimpleScorecardCategoricalTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardMixedVariablesTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardMixedVariablesTest.java index cbb9786d1bd..b33f1b98f54 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardMixedVariablesTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardMixedVariablesTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SimpleScorecardMixedVariablesTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardTest.java index 4b3f6e26698..929033f166d 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardTest.java @@ -16,9 +16,6 @@ package org.kie.pmml.models.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -33,6 +30,9 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + @RunWith(Parameterized.class) public class SimpleScorecardTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardWithTransformationsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardWithTransformationsTest.java index 734ab8ed5aa..db800d912d7 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardWithTransformationsTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-tests/src/test/java/org/kie/pmml/models/scorecard/tests/SimpleScorecardWithTransformationsTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.scorecard.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SimpleScorecardWithTransformationsTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/BostonHousingDataTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/BostonHousingDataTreeTest.java index 3c33930104c..76681d0d2d0 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/BostonHousingDataTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/BostonHousingDataTreeTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class BostonHousingDataTreeTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/CompoundPredicateTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/CompoundPredicateTreeTest.java index c4aec0f8e2b..17f71055590 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/CompoundPredicateTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/CompoundPredicateTreeTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class CompoundPredicateTreeTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/IrisDataTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/IrisDataTreeTest.java index c859625785f..d13423504c2 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/IrisDataTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/IrisDataTreeTest.java @@ -1,7 +1,5 @@ package org.kie.pmml.models.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -16,6 +14,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class IrisDataTreeTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/ReturnLastPredictionStrategyTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/ReturnLastPredictionStrategyTreeTest.java index c084bbd62bd..4ca96207c7c 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/ReturnLastPredictionStrategyTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/ReturnLastPredictionStrategyTreeTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class ReturnLastPredictionStrategyTreeTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelTest.java index 9f09af0a55f..7c47a7ac7cd 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelTest.java @@ -15,8 +15,6 @@ */ package org.kie.pmml.models.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -30,6 +28,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SampleMineTreeModelTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelWithTransformationsTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelWithTransformationsTest.java index 8ebdd76ef70..63573588d13 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelWithTransformationsTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SampleMineTreeModelWithTransformationsTest.java @@ -16,9 +16,6 @@ package org.kie.pmml.models.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -33,6 +30,9 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + @RunWith(Parameterized.class) public class SampleMineTreeModelWithTransformationsTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleClassificationTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleClassificationTreeTest.java index aa573708d70..b48a7473432 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleClassificationTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleClassificationTreeTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SimpleClassificationTreeTest extends AbstractPMMLTest { diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleSetPredicateTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleSetPredicateTreeTest.java index 235911e69db..0777f851406 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleSetPredicateTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/SimpleSetPredicateTreeTest.java @@ -16,8 +16,6 @@ package org.kie.pmml.models.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -31,6 +29,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class SimpleSetPredicateTreeTest extends AbstractPMMLTest { @@ -43,7 +43,7 @@ public class SimpleSetPredicateTreeTest extends AbstractPMMLTest { private double input2; private double input3; private String expectedResult; - + public SimpleSetPredicateTreeTest(double input1, double input2, double input3, String expectedResult) { this.input1 = input1; this.input2 = input2; diff --git a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/TestTreeTest.java b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/TestTreeTest.java index 687ad024d6d..49ae9dcacf9 100644 --- a/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/TestTreeTest.java +++ b/kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-tests/src/test/java/org/kie/pmml/models/tree/tests/TestTreeTest.java @@ -15,8 +15,6 @@ */ package org.kie.pmml.models.tree.tests; -import static org.assertj.core.api.Assertions.assertThat; - import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -30,6 +28,8 @@ import org.kie.pmml.api.runtime.PMMLRuntime; import org.kie.pmml.models.tests.AbstractPMMLTest; +import static org.assertj.core.api.Assertions.assertThat; + @RunWith(Parameterized.class) public class TestTreeTest extends AbstractPMMLTest { From 78499fa7d6910d85f942c4c6cc1c727a4edbcd44 Mon Sep 17 00:00:00 2001 From: Paolo Bizzarri Date: Thu, 7 Apr 2022 19:02:31 +0200 Subject: [PATCH 8/9] Fixed error in tests --- .../src/test/java/org/kie/dmn/validation/ValidatorTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/ValidatorTest.java b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/ValidatorTest.java index 2ed458115f6..45913de881a 100644 --- a/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/ValidatorTest.java +++ b/kie-dmn/kie-dmn-validation/src/test/java/org/kie/dmn/validation/ValidatorTest.java @@ -74,7 +74,7 @@ public void testMACDInputDefinitions() { List messages = DMNValidatorFactory.newValidator().validate(definitions, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat(messages).withFailMessage(messages.toString()).hasSizeGreaterThan(0); + assertThat(messages).as(messages.toString()).hasSize(0); } @Test @@ -466,7 +466,7 @@ public void testDMNv1_3_ch11example2() { @Test public void test_dttyperef() { List validate = validator.validate(getReader("wrongxml/dttyperef.dmn"), VALIDATE_SCHEMA, VALIDATE_MODEL, VALIDATE_COMPILATION); - assertThat(validate).withFailMessage(ValidatorUtil.formatMessages(validate)).hasSize(0); + assertThat(validate).as(ValidatorUtil.formatMessages(validate)).hasSize(1); DMNMessage v0 = validate.get(0); assertThat(v0.getLevel()).isEqualTo(Level.ERROR); assertThat(v0.getMessageType()).isEqualTo(DMNMessageType.MISSING_TYPE_REF); From c8327804d3498e143042394cd8a408e6f7902dbb Mon Sep 17 00:00:00 2001 From: Paolo Bizzarri Date: Thu, 7 Apr 2022 19:08:16 +0200 Subject: [PATCH 9/9] Fixed sonar warnings --- .../mvel/compiler/lang/descr/ConnectiveDescrTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/descr/ConnectiveDescrTest.java b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/descr/ConnectiveDescrTest.java index 632c24c6332..1863ec5a1f7 100644 --- a/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/descr/ConnectiveDescrTest.java +++ b/drools-test-coverage/test-compiler-integration/src/test/java/org/drools/mvel/compiler/lang/descr/ConnectiveDescrTest.java @@ -32,14 +32,14 @@ public void testBuildExpression() { StringBuilder sb = new StringBuilder(); descr1.buildExpression( sb ); - assertThat("name == 'darth' || == 'bobba'").isEqualToIgnoringWhitespace(sb.toString()); + assertThat(sb.toString()).isEqualToIgnoringWhitespace("name == 'darth' || == 'bobba'"); ConnectiveDescr descr2 = new ConnectiveDescr( RestrictionConnectiveType.AND); descr2.setPrefix( "name" ); descr2.add( "!= 'luke'" ); sb = new StringBuilder(); descr2.buildExpression( sb ); - assertThat("name != 'luke'").isEqualToIgnoringWhitespace(sb.toString()); + assertThat(sb.toString()).isEqualToIgnoringWhitespace("name != 'luke'"); descr2.add( "!= 'yoda'" ); ConnectiveDescr descr3 = new ConnectiveDescr(RestrictionConnectiveType.AND); @@ -48,7 +48,7 @@ public void testBuildExpression() { sb = new StringBuilder(); descr3.buildExpression( sb ); - assertThat("(name == 'darth' || == 'bobba') && (name != 'luke' && != 'yoda')").isEqualToIgnoringWhitespace(sb.toString()); + assertThat(sb.toString()).isEqualToIgnoringWhitespace("(name == 'darth' || == 'bobba') && (name != 'luke' && != 'yoda')"); ConnectiveDescr descr4 = new ConnectiveDescr(RestrictionConnectiveType.AND); descr4.setPrefix( "age" ); @@ -61,7 +61,7 @@ public void testBuildExpression() { sb = new StringBuilder(); descr5.buildExpression( sb ); - assertThat("((name == 'darth' || == 'bobba') && (name != 'luke' && != 'yoda')) || (age != 33 && != 34)").isEqualToIgnoringWhitespace(sb.toString()); + assertThat(sb.toString()).isEqualToIgnoringWhitespace("((name == 'darth' || == 'bobba') && (name != 'luke' && != 'yoda')) || (age != 33 && != 34)"); } }