diff --git a/dmn-core/pom.xml b/dmn-core/pom.xml index 99dce3eda..d8d81c7dd 100644 --- a/dmn-core/pom.xml +++ b/dmn-core/pom.xml @@ -37,86 +37,92 @@ jDMN: Core jar - - - com.goldmansachs.jdmn - jdmn-runtime - ${project.version} - - - - org.freemarker - freemarker - 2.3.31 - - - - org.antlr - antlr4 - ${antlr4.version} - - - - org.apache.commons - commons-lang3 - - - - commons-io - commons-io - - - - com.fasterxml.jackson.core - jackson-annotations - - - - com.fasterxml.jackson.core - jackson-core - - - - com.fasterxml.jackson.core - jackson-databind - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - - org.skyscreamer - jsonassert - - - - org.xmlunit - xmlunit-core - ${xmlunit.version} - test - - - - org.xmlunit - xmlunit-matchers - ${xmlunit.version} - test - - - - org.fitnesse - fitnesse - 20230503 - - - org.slf4j - slf4j-jdk14 - - - test - + + + com.goldmansachs.jdmn + jdmn-runtime + ${project.version} + + + + org.freemarker + freemarker + 2.3.31 + + + + org.antlr + antlr4 + ${antlr4.version} + + + + org.apache.commons + commons-lang3 + + + + commons-io + commons-io + + + + com.fasterxml.jackson.core + jackson-annotations + + + + com.fasterxml.jackson.core + jackson-core + + + + com.fasterxml.jackson.core + jackson-databind + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + + org.skyscreamer + jsonassert + + + + org.xmlunit + xmlunit-core + ${xmlunit.version} + test + + + + org.xmlunit + xmlunit-matchers + ${xmlunit.version} + test + + + + org.fitnesse + fitnesse + 20230503 + + + org.slf4j + slf4j-jdk14 + + + test + + + org.junit.jupiter + junit-jupiter + 5.10.1 + test + commons-lang diff --git a/dmn-core/src/main/resources/templates/aws/pomFile.ftl b/dmn-core/src/main/resources/templates/aws/pomFile.ftl index cdf2f2cd2..e6c72ffa3 100644 --- a/dmn-core/src/main/resources/templates/aws/pomFile.ftl +++ b/dmn-core/src/main/resources/templates/aws/pomFile.ftl @@ -70,10 +70,16 @@ - junit - junit - 4.13.2 - test + org.junit.jupiter + junit-jupiter-api + 5.10.1 + test + + + org.junit.vintage + junit-vintage-engine + 5.10.1 + test diff --git a/dmn-core/src/test/java/com/gs/dmn/DMNModelRepositoryTest.java b/dmn-core/src/test/java/com/gs/dmn/DMNModelRepositoryTest.java index 6059b0d36..27871d632 100644 --- a/dmn-core/src/test/java/com/gs/dmn/DMNModelRepositoryTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/DMNModelRepositoryTest.java @@ -15,8 +15,8 @@ import com.gs.dmn.ast.*; import com.gs.dmn.serialization.DMNSerializer; import com.gs.dmn.serialization.xstream.XMLDMNSerializer; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.File; import java.net.URI; @@ -26,13 +26,13 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DMNModelRepositoryTest extends AbstractTest { private DMNModelRepository dmnModelRepository; private final DMNSerializer dmnSerializer = new XMLDMNSerializer(LOGGER, false); - @Before + @BeforeEach public void setUp() { String pathName = "tck/1.1/cl3/0004-lending/0004-lending.dmn"; this.dmnModelRepository = readDMN(pathName); diff --git a/dmn-core/src/test/java/com/gs/dmn/ast/TAssociationDirectionTest.java b/dmn-core/src/test/java/com/gs/dmn/ast/TAssociationDirectionTest.java index 1e7dc6324..2113ccd6e 100644 --- a/dmn-core/src/test/java/com/gs/dmn/ast/TAssociationDirectionTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/ast/TAssociationDirectionTest.java @@ -12,9 +12,10 @@ */ package com.gs.dmn.ast; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TAssociationDirectionTest { @Test @@ -24,8 +25,10 @@ public void testFromValue() { assertEquals(TAssociationDirection.BOTH, TAssociationDirection.fromValue("Both")); } - @Test(expected = IllegalArgumentException.class) + @Test public void testFromValueWhenIncorrectName() { - TAssociationDirection.fromValue("asd"); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + TAssociationDirection.fromValue("asd"); + }); } } diff --git a/dmn-core/src/test/java/com/gs/dmn/ast/TBuiltinAggregatorTest.java b/dmn-core/src/test/java/com/gs/dmn/ast/TBuiltinAggregatorTest.java index a8877181e..06b85065e 100644 --- a/dmn-core/src/test/java/com/gs/dmn/ast/TBuiltinAggregatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/ast/TBuiltinAggregatorTest.java @@ -12,9 +12,10 @@ */ package com.gs.dmn.ast; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TBuiltinAggregatorTest { @Test @@ -25,9 +26,11 @@ public void testFromValue() { assertEquals(TBuiltinAggregator.SUM, TBuiltinAggregator.fromValue("SUM")); } - @Test(expected = IllegalArgumentException.class) + @Test public void testFromValueWhenIncorrectName() { - TBuiltinAggregator.fromValue("asd"); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + TBuiltinAggregator.fromValue("asd"); + }); } } diff --git a/dmn-core/src/test/java/com/gs/dmn/ast/TDecisionTableOrientationTest.java b/dmn-core/src/test/java/com/gs/dmn/ast/TDecisionTableOrientationTest.java index 7d4eb28e6..b31e21d14 100644 --- a/dmn-core/src/test/java/com/gs/dmn/ast/TDecisionTableOrientationTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/ast/TDecisionTableOrientationTest.java @@ -12,9 +12,10 @@ */ package com.gs.dmn.ast; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TDecisionTableOrientationTest { @Test @@ -24,8 +25,10 @@ public void testFromValue() { assertEquals(TDecisionTableOrientation.CROSS_TABLE, TDecisionTableOrientation.fromValue("CrossTable")); } - @Test(expected = IllegalArgumentException.class) + @Test public void testFromValueWhenIncorrectName() { - TDecisionTableOrientation.fromValue("asd"); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + TDecisionTableOrientation.fromValue("asd"); + }); } } diff --git a/dmn-core/src/test/java/com/gs/dmn/ast/TFunctionKindTest.java b/dmn-core/src/test/java/com/gs/dmn/ast/TFunctionKindTest.java index cc3f34f13..81e5d9f52 100644 --- a/dmn-core/src/test/java/com/gs/dmn/ast/TFunctionKindTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/ast/TFunctionKindTest.java @@ -12,9 +12,10 @@ */ package com.gs.dmn.ast; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TFunctionKindTest { @Test @@ -24,8 +25,10 @@ public void testFromValue() { assertEquals(TFunctionKind.PMML, TFunctionKind.fromValue("PMML")); } - @Test(expected = IllegalArgumentException.class) + @Test public void testFromValueWhenIncorrectName() { - TFunctionKind.fromValue("asd"); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + TFunctionKind.fromValue("asd"); + }); } } diff --git a/dmn-core/src/test/java/com/gs/dmn/ast/THitPolicyTest.java b/dmn-core/src/test/java/com/gs/dmn/ast/THitPolicyTest.java index dd2cf1958..f30f705fe 100644 --- a/dmn-core/src/test/java/com/gs/dmn/ast/THitPolicyTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/ast/THitPolicyTest.java @@ -12,9 +12,10 @@ */ package com.gs.dmn.ast; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class THitPolicyTest { @Test @@ -28,9 +29,11 @@ public void testFromValue() { assertEquals(THitPolicy.OUTPUT_ORDER, THitPolicy.fromValue("OUTPUT ORDER")); } - @Test(expected = IllegalArgumentException.class) + @Test public void testFromValueWhenIncorrectName() { - THitPolicy.fromValue("asd"); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + THitPolicy.fromValue("asd"); + }); } } diff --git a/dmn-core/src/test/java/com/gs/dmn/ast/dmndi/AlignmentKindTest.java b/dmn-core/src/test/java/com/gs/dmn/ast/dmndi/AlignmentKindTest.java index 83c620be1..00866a463 100644 --- a/dmn-core/src/test/java/com/gs/dmn/ast/dmndi/AlignmentKindTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/ast/dmndi/AlignmentKindTest.java @@ -12,9 +12,10 @@ */ package com.gs.dmn.ast.dmndi; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class AlignmentKindTest { @Test @@ -24,8 +25,10 @@ public void testFromValue() { assertEquals(AlignmentKind.CENTER, AlignmentKind.fromValue("center")); } - @Test(expected = IllegalArgumentException.class) + @Test public void testFromValueWhenIncorrectName() { - AlignmentKind.fromValue("asd"); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + AlignmentKind.fromValue("asd"); + }); } } diff --git a/dmn-core/src/test/java/com/gs/dmn/ast/dmndi/KnownColorTest.java b/dmn-core/src/test/java/com/gs/dmn/ast/dmndi/KnownColorTest.java index 1aef4e19f..a64ff8140 100644 --- a/dmn-core/src/test/java/com/gs/dmn/ast/dmndi/KnownColorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/ast/dmndi/KnownColorTest.java @@ -12,9 +12,10 @@ */ package com.gs.dmn.ast.dmndi; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class KnownColorTest { @@ -39,8 +40,10 @@ public void testFromValue() { assertEquals(KnownColor.GRAY, KnownColor.fromValue("gray")); } - @Test(expected = IllegalArgumentException.class) + @Test public void testFromValueWhenIncorrectName() { - KnownColor.fromValue("asd"); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + KnownColor.fromValue("asd"); + }); } } diff --git a/dmn-core/src/test/java/com/gs/dmn/ast/visitor/NopVisitorTest.java b/dmn-core/src/test/java/com/gs/dmn/ast/visitor/NopVisitorTest.java index 19a8ef69c..775cd66dc 100644 --- a/dmn-core/src/test/java/com/gs/dmn/ast/visitor/NopVisitorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/ast/visitor/NopVisitorTest.java @@ -17,12 +17,12 @@ import com.gs.dmn.error.NopErrorHandler; import com.gs.dmn.serialization.DMNMarshaller; import com.gs.dmn.serialization.xstream.DMNMarshallerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.FileReader; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class NopVisitorTest { private final DMNMarshaller marshaller = DMNMarshallerFactory.newDefaultMarshaller(); diff --git a/dmn-core/src/test/java/com/gs/dmn/ast/visitor/TraversalVisitorTest.java b/dmn-core/src/test/java/com/gs/dmn/ast/visitor/TraversalVisitorTest.java index 6b0dc446c..4f1a9fb2f 100644 --- a/dmn-core/src/test/java/com/gs/dmn/ast/visitor/TraversalVisitorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/ast/visitor/TraversalVisitorTest.java @@ -17,12 +17,12 @@ import com.gs.dmn.error.NopErrorHandler; import com.gs.dmn.serialization.DMNMarshaller; import com.gs.dmn.serialization.xstream.DMNMarshallerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.FileReader; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TraversalVisitorTest { private final DMNMarshaller marshaller = DMNMarshallerFactory.newDefaultMarshaller(); diff --git a/dmn-core/src/test/java/com/gs/dmn/dialect/AbstractDMNDialectDefinitionTest.java b/dmn-core/src/test/java/com/gs/dmn/dialect/AbstractDMNDialectDefinitionTest.java index 703a2eb0e..3ee100760 100644 --- a/dmn-core/src/test/java/com/gs/dmn/dialect/AbstractDMNDialectDefinitionTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/dialect/AbstractDMNDialectDefinitionTest.java @@ -27,12 +27,12 @@ import com.gs.dmn.transformation.lazy.NopLazyEvaluationDetector; import com.gs.dmn.transformation.template.TemplateProvider; import com.gs.dmn.validation.NopDMNValidator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public abstract class AbstractDMNDialectDefinitionTest extends AbstractTest { private final DMNDialectDefinition dialect = makeDialect(); diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/AbstractFEELProcessorTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/AbstractFEELProcessorTest.java index 986cdcfbd..f552dc8d8 100644 --- a/dmn-core/src/test/java/com/gs/dmn/feel/AbstractFEELProcessorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/feel/AbstractFEELProcessorTest.java @@ -29,15 +29,15 @@ import com.gs.dmn.feel.analysis.syntax.ast.test.UnaryTests; import com.gs.dmn.feel.lib.FEELLib; import com.gs.dmn.runtime.Context; -import com.gs.dmn.runtime.DMNRuntimeException; import com.gs.dmn.runtime.interpreter.DMNInterpreter; import com.gs.dmn.runtime.interpreter.Result; import com.gs.dmn.transformation.InputParameters; import com.gs.dmn.transformation.basic.BasicDMNToNativeTransformer; import com.gs.dmn.transformation.lazy.NopLazyEvaluationDetector; import org.apache.commons.lang3.StringUtils; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; @@ -49,7 +49,7 @@ import static com.gs.dmn.feel.analysis.semantics.type.DateType.DATE; import static com.gs.dmn.feel.analysis.semantics.type.NumberType.NUMBER; import static com.gs.dmn.feel.analysis.semantics.type.StringType.STRING; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public abstract class AbstractFEELProcessorTest extends AbstractTest { protected final ELTranslator feelTranslator; @@ -420,21 +420,25 @@ public void testEndpointsRange() { true); } - @Test(expected = SemanticError.class) + @Test public void testEqualityWhenTypeMismatch() { - Boolean input = true; - List entries = Arrays.asList( - new EnvironmentEntry("input", BOOLEAN, input)); + Assertions.assertThrows(SemanticError.class, () -> { + Boolean input = true; + List entries = Arrays.asList( + new EnvironmentEntry("input", BOOLEAN, input)); - doUnaryTestsTest(entries, "input", "123.56", "", "TupleType(boolean)", "", null, ""); + doUnaryTestsTest(entries, "input", "123.56", "", "TupleType(boolean)", "", null, ""); + }); } - @Test(expected = SemanticError.class) + @Test public void testOperatorRangeWhenTypeMismatch() { - List entries = Arrays.asList( - new EnvironmentEntry("input", BOOLEAN, true)); + Assertions.assertThrows(SemanticError.class, () -> { + List entries = Arrays.asList( + new EnvironmentEntry("input", BOOLEAN, true)); - doUnaryTestsTest(entries, "input", "< 123.56", "", "TupleType(boolean)", "", null, ""); + doUnaryTestsTest(entries, "input", "< 123.56", "", "TupleType(boolean)", "", null, ""); + }); } @Test @@ -565,30 +569,34 @@ public void testIfExpression() { this.lib.number("1")); } - @Test(expected = SemanticError.class) + @Test public void testIfExpressionWhenConditionIsNotBoolean() { - List entries = Arrays.asList( - new EnvironmentEntry("input", NUMBER, this.lib.number("1"))); - - doExpressionTest(entries, "", "if 5 then 1 else 2", - "", - "number", - "", - "", - ""); + Assertions.assertThrows(SemanticError.class, () -> { + List entries = Arrays.asList( + new EnvironmentEntry("input", NUMBER, this.lib.number("1"))); + + doExpressionTest(entries, "", "if 5 then 1 else 2", + "", + "number", + "", + "", + ""); + }); } - @Test(expected = SemanticError.class) + @Test public void testIfExpressionWhenTypesDontMatch() { - List entries = Arrays.asList( - new EnvironmentEntry("input", NUMBER, this.lib.number("1"))); - - doExpressionTest(entries, "", "if true then true else 2", - "", - "number", - "", - "", - ""); + Assertions.assertThrows(SemanticError.class, () -> { + List entries = Arrays.asList( + new EnvironmentEntry("input", NUMBER, this.lib.number("1"))); + + doExpressionTest(entries, "", "if true then true else 2", + "", + "number", + "", + "", + ""); + }); } @Test @@ -1407,17 +1415,19 @@ public void testInExpression() { true); } - @Test(expected = SemanticError.class) + @Test public void testInExpressionWhenOperatorRangeAndTypeMismatch() { - List entries = Arrays.asList( - new EnvironmentEntry("input", NUMBER, this.lib.number("1"))); - - doExpressionTest(entries, "", "1 in (true)", - "", - "boolean", - "", - "", - ""); + Assertions.assertThrows(SemanticError.class, () -> { + List entries = Arrays.asList( + new EnvironmentEntry("input", NUMBER, this.lib.number("1"))); + + doExpressionTest(entries, "", "1 in (true)", + "", + "boolean", + "", + "", + ""); + }); } @Test @@ -1878,25 +1888,27 @@ public void testArithmeticNegation() { this.lib.number("-1")); } - @Test(expected = SemanticError.class) + @Test public void testArithmeticNegationOnIncorrectOperands() { - String yearsAndMonthsDuration = "duration(\"P1Y1M\")"; - String daysAndTimeDuration = "duration(\"P1DT1H\")"; - - List entries = Arrays.asList( - new EnvironmentEntry("input", NUMBER, this.lib.number("1"))); - doExpressionTest(entries, "", String.format("- %s", yearsAndMonthsDuration), - "ArithmeticNegation(DateTimeLiteral(duration, \"P1Y1M\"))", - "years and months duration", - "numericUnaryMinus(duration(\"P1Y1M\"))", - null, - null); - doExpressionTest(entries, "", String.format("- %s", daysAndTimeDuration), - "ArithmeticNegation(DateTimeLiteral(duration, \"P1DT1H\"))", - "days and time duration", - "numericUnaryMinus(duration(\"P1DT1H\"))", - null, - null); + Assertions.assertThrows(SemanticError.class, () -> { + String yearsAndMonthsDuration = "duration(\"P1Y1M\")"; + String daysAndTimeDuration = "duration(\"P1DT1H\")"; + + List entries = Arrays.asList( + new EnvironmentEntry("input", NUMBER, this.lib.number("1"))); + doExpressionTest(entries, "", String.format("- %s", yearsAndMonthsDuration), + "ArithmeticNegation(DateTimeLiteral(duration, \"P1Y1M\"))", + "years and months duration", + "numericUnaryMinus(duration(\"P1Y1M\"))", + null, + null); + doExpressionTest(entries, "", String.format("- %s", daysAndTimeDuration), + "ArithmeticNegation(DateTimeLiteral(duration, \"P1DT1H\"))", + "days and time duration", + "numericUnaryMinus(duration(\"P1DT1H\"))", + null, + null); + }); } @Test @@ -2139,8 +2151,8 @@ public void testConversionFunctions() { this.lib.duration("P1DT1H")); } - @Ignore - @Test(expected = DMNRuntimeException.class) + @Disabled + @Test public void testFunctionInvocationWhenMultipleMatch() { List entries = Arrays.asList(); @@ -2585,8 +2597,8 @@ protected void doExpressionTest(List entries, String inputExpr Expression actual = (Expression) this.feelTranslator.analyzeExpression(expressionText, expressionContext); // Check expression - assertEquals("Augmented AST mismatch", expectedAST, actual.toString()); - assertEquals("Type mismatch", expectedType, (actual.getType() == null ? null : actual.getType().toString())); + assertEquals(expectedAST, actual.toString(), "Augmented AST mismatch"); + assertEquals(expectedType, (actual.getType() == null ? null : actual.getType().toString()), "Type mismatch"); // Generate code and check doCodeGenerationTest(actual, expressionContext, expectedJavaCode); @@ -2639,7 +2651,7 @@ protected void doBoxedExpressionTest(List entries, String expr } private void checkGeneratedAndEvaluatedValue(Object expectedGeneratedValue, Object expectedEvaluatedValue) { - assertEquals("Evaluated and generated value mismatch", expectedEvaluatedValue, expectedGeneratedValue); + assertEquals(expectedEvaluatedValue, expectedGeneratedValue, "Evaluated and generated value mismatch"); } private Result evaluateInputEntry(Expression inputExpression, DMNContext inputExpressionContext, UnaryTests inputEntryTest, DMNContext inputEntryContext) { @@ -2654,14 +2666,14 @@ private Result evaluateInputEntry(Expression inputExpression, DMNContext i private void doCodeGenerationTest(UnaryTests inputEntry, DMNContext inputEntryContext, String expectedJavaCode) { if (expectedJavaCode != null) { String javaCode = this.feelTranslator.expressionToNative(inputEntry, inputEntryContext); - assertEquals("Generated code mismatch", expectedJavaCode, javaCode); + assertEquals(expectedJavaCode, javaCode, "Generated code mismatch"); } } private void doCodeGenerationTest(Expression expression, DMNContext expressionContext, String expectedJavaCode) { if (expectedJavaCode != null) { String javaCode = this.feelTranslator.expressionToNative(expression, expressionContext); - assertEquals("Generated code mismatch", expectedJavaCode, javaCode); + assertEquals(expectedJavaCode, javaCode, "Generated code mismatch"); } } @@ -2669,7 +2681,7 @@ private void doEvaluationTest(Expression inputExpression, DMNContext input if (expectedEvaluatedValue != null) { Result actualResult = evaluateInputEntry(inputExpression, inputExpressionContext, inputEntry, inputEntryContext); Object actualValue = Result.value(actualResult); - assertEquals("Evaluated value mismatch", expectedEvaluatedValue, actualValue); + assertEquals(expectedEvaluatedValue, actualValue, "Evaluated value mismatch"); } } diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/AbstractStandardFEELProcessorTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/AbstractStandardFEELProcessorTest.java index 18ad77dd0..6af7ed2e3 100644 --- a/dmn-core/src/test/java/com/gs/dmn/feel/AbstractStandardFEELProcessorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/feel/AbstractStandardFEELProcessorTest.java @@ -16,7 +16,7 @@ import com.gs.dmn.feel.analysis.semantics.type.*; import com.gs.dmn.feel.lib.StandardFEELLib; import com.gs.dmn.tck.ast.TestCases; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/DefaultStandardFEELProcessorTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/DefaultStandardFEELProcessorTest.java index ae5f17c04..7865699ea 100644 --- a/dmn-core/src/test/java/com/gs/dmn/feel/DefaultStandardFEELProcessorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/feel/DefaultStandardFEELProcessorTest.java @@ -15,7 +15,7 @@ import com.gs.dmn.dialect.DMNDialectDefinition; import com.gs.dmn.dialect.StandardDMNDialectDefinition; import com.gs.dmn.tck.ast.TestCases; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; @@ -31,6 +31,7 @@ protected DMNDialectDefinition { @Override protected DMNDialectDefinition makeDialect() { @@ -36,6 +34,7 @@ protected DMNDialectDefinition()).size()); + Assertions.assertEquals(0, makeParameterTypes(new ArrayList<>()).size()); } @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/semantics/type/TypeConformanceTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/semantics/type/TypeConformanceTest.java index d3c3fc4be..9f6d49c97 100644 --- a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/semantics/type/TypeConformanceTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/semantics/type/TypeConformanceTest.java @@ -16,7 +16,7 @@ import com.gs.dmn.el.analysis.semantics.type.Type; import com.gs.dmn.feel.analysis.syntax.ast.expression.function.FormalParameter; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.LinkedHashMap; @@ -31,7 +31,7 @@ import static com.gs.dmn.feel.analysis.semantics.type.NumberType.NUMBER; import static com.gs.dmn.feel.analysis.semantics.type.StringType.STRING; import static com.gs.dmn.feel.analysis.semantics.type.TimeType.TIME; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TypeConformanceTest { public final Map, Boolean> dataTypesTable = new LinkedHashMap, Boolean>() {{ @@ -196,6 +196,6 @@ public void testNullType() { } private void checkConformsTo(boolean expected, Type left, Type right) { - assertEquals(String.format("'%s'.conformsTo('%s') mismatch ", left, right), expected, com.gs.dmn.el.analysis.semantics.type.Type.conformsTo(left, right)); + assertEquals(expected, com.gs.dmn.el.analysis.semantics.type.Type.conformsTo(left, right), String.format("'%s'.conformsTo('%s') mismatch ", left, right)); } } \ No newline at end of file diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/semantics/type/TypeEqualsTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/semantics/type/TypeEqualsTest.java index 4d638d09c..6176a0fff 100644 --- a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/semantics/type/TypeEqualsTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/semantics/type/TypeEqualsTest.java @@ -16,7 +16,7 @@ import com.gs.dmn.el.analysis.semantics.type.Type; import com.gs.dmn.feel.analysis.syntax.ast.expression.function.FormalParameter; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.LinkedHashMap; @@ -31,7 +31,7 @@ import static com.gs.dmn.feel.analysis.semantics.type.NumberType.NUMBER; import static com.gs.dmn.feel.analysis.semantics.type.StringType.STRING; import static com.gs.dmn.feel.analysis.semantics.type.TimeType.TIME; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TypeEqualsTest { public final Map, Boolean> dataTypeTable = new LinkedHashMap, Boolean>() {{ @@ -194,6 +194,6 @@ public void testNullType() { } private void checkEquals(boolean expected, Type left, Type right) { - assertEquals(String.format("'%s'.equals('%s') mismatch ", left, right), expected, left.equals(right)); + assertEquals(expected, left.equals(right), String.format("'%s'.equals('%s') mismatch ", left, right)); } } \ No newline at end of file diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/semantics/type/TypeEquivalenceTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/semantics/type/TypeEquivalenceTest.java index cd6034bc9..e6594b830 100644 --- a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/semantics/type/TypeEquivalenceTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/semantics/type/TypeEquivalenceTest.java @@ -16,7 +16,7 @@ import com.gs.dmn.el.analysis.semantics.type.Type; import com.gs.dmn.feel.analysis.syntax.ast.expression.function.FormalParameter; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.LinkedHashMap; @@ -31,7 +31,7 @@ import static com.gs.dmn.feel.analysis.semantics.type.NumberType.NUMBER; import static com.gs.dmn.feel.analysis.semantics.type.StringType.STRING; import static com.gs.dmn.feel.analysis.semantics.type.TimeType.TIME; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TypeEquivalenceTest { public final Map, Boolean> dataTypeTable = new LinkedHashMap, Boolean>() {{ @@ -194,6 +194,6 @@ public void testNullType() { } private void checkEquivalentTo(boolean expected, Type left, Type right) { - assertEquals(String.format("'%s'.equivalentTo('%s') mismatch ", left, right), expected, com.gs.dmn.el.analysis.semantics.type.Type.equivalentTo(left, right)); + assertEquals(expected, com.gs.dmn.el.analysis.semantics.type.Type.equivalentTo(left, right), String.format("'%s'.equivalentTo('%s') mismatch ", left, right)); } } \ No newline at end of file diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/AbstractLexerTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/AbstractLexerTest.java index a80914454..4c7e39e9d 100644 --- a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/AbstractLexerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/AbstractLexerTest.java @@ -15,17 +15,17 @@ import org.antlr.v4.runtime.Lexer; import org.antlr.v4.runtime.Token; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public abstract class AbstractLexerTest { protected void checkPosition(Token token, int beginLine, int beginColumn, int endLine, int endColumn, int beginOffset, int endOffset) { String message = String.format("Error when checking '%s'", token.getText()); - assertEquals(message, beginLine, getBeginLine(token)); - assertEquals(message, beginColumn, getBeginColumn(token)); - assertEquals(message, endLine, getEndLine(token)); - assertEquals(message, endColumn, getEndColumn(token)); - assertEquals(message, beginOffset, getBeginOffset(token)); - assertEquals(message, endOffset, getEndOffset(token)); + assertEquals(beginLine, getBeginLine(token), message); + assertEquals(beginColumn, getBeginColumn(token), message); + assertEquals(endLine, getEndLine(token), message); + assertEquals(endColumn, getEndColumn(token), message); + assertEquals(beginOffset, getBeginOffset(token), message); + assertEquals(endOffset, getEndOffset(token), message); } private int getBeginLine(Token token) { diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/FEELLexerTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/FEELLexerTest.java index 629ca92df..67d8df439 100644 --- a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/FEELLexerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/FEELLexerTest.java @@ -17,7 +17,7 @@ import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.Lexer; import org.antlr.v4.runtime.Token; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/ast/expression/QualifiedNameTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/ast/expression/QualifiedNameTest.java index e7fa1dffb..0eb7dea63 100644 --- a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/ast/expression/QualifiedNameTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/ast/expression/QualifiedNameTest.java @@ -13,13 +13,13 @@ package com.gs.dmn.feel.analysis.syntax.ast.expression; import com.gs.dmn.el.analysis.semantics.type.Type; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class QualifiedNameTest { @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/ast/visitor/BaseVisitorTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/ast/visitor/BaseVisitorTest.java index bdf09296e..c31acdd6d 100644 --- a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/ast/visitor/BaseVisitorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/ast/visitor/BaseVisitorTest.java @@ -38,9 +38,9 @@ import com.gs.dmn.feel.analysis.syntax.ast.expression.type.ListTypeExpression; import com.gs.dmn.feel.analysis.syntax.ast.expression.type.NamedTypeExpression; import com.gs.dmn.feel.analysis.syntax.ast.test.*; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public abstract class BaseVisitorTest { // diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/ast/visitor/NamesVisitorTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/ast/visitor/NamesVisitorTest.java index add878503..91adb741a 100644 --- a/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/ast/visitor/NamesVisitorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/feel/analysis/syntax/ast/visitor/NamesVisitorTest.java @@ -12,14 +12,14 @@ import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CommonTokenStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Set; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class NamesVisitorTest { @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/FEELToTripleNativeVisitorTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/FEELToTripleNativeVisitorTest.java index 1034387c9..72356bce6 100644 --- a/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/FEELToTripleNativeVisitorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/FEELToTripleNativeVisitorTest.java @@ -19,7 +19,7 @@ import com.gs.dmn.transformation.basic.BasicDMNToNativeTransformer; import com.gs.dmn.transformation.lazy.NopLazyEvaluationDetector; import org.apache.commons.lang3.StringUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.time.LocalDate; @@ -30,7 +30,7 @@ import static com.gs.dmn.feel.analysis.semantics.type.NumberType.NUMBER; import static com.gs.dmn.feel.analysis.semantics.type.StringType.STRING; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class FEELToTripleNativeVisitorTest extends AbstractTest { private final EnvironmentFactory environmentFactory; diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/ReplaceItemFilterVisitorTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/ReplaceItemFilterVisitorTest.java index f5dc6d245..1458f52b1 100644 --- a/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/ReplaceItemFilterVisitorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/ReplaceItemFilterVisitorTest.java @@ -19,9 +19,9 @@ import com.gs.dmn.feel.analysis.syntax.ast.Visitor; import com.gs.dmn.feel.analysis.syntax.ast.expression.Name; import com.gs.dmn.feel.analysis.syntax.ast.visitor.BaseVisitorTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ReplaceItemFilterVisitorTest extends BaseVisitorTest { private final String oldLambdaParameterName = "oldName"; diff --git a/dmn-core/src/test/java/com/gs/dmn/log/NopBuildLoggerTest.java b/dmn-core/src/test/java/com/gs/dmn/log/NopBuildLoggerTest.java index ace8f4206..bb8ff89a7 100644 --- a/dmn-core/src/test/java/com/gs/dmn/log/NopBuildLoggerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/log/NopBuildLoggerTest.java @@ -12,9 +12,9 @@ */ package com.gs.dmn.log; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class NopBuildLoggerTest { diff --git a/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/AbstractDMNInterpreterTest.java b/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/AbstractDMNInterpreterTest.java index 94b17942c..b07d16d66 100644 --- a/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/AbstractDMNInterpreterTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/AbstractDMNInterpreterTest.java @@ -38,6 +38,7 @@ import com.gs.dmn.transformation.ToQuotedNameTransformer; import com.gs.dmn.transformation.basic.BasicDMNToNativeTransformer; import org.apache.commons.lang3.exception.ExceptionUtils; +import org.junit.jupiter.api.Assertions; import org.slf4j.LoggerFactory; import java.io.File; @@ -191,7 +192,7 @@ private void doTest(String testCaseFileName, TestCases testCases, TestCase testC String stackTrace = ExceptionUtils.getStackTrace(e); LOGGER.error(stackTrace); String errorMessage = String.format("%s ResultNode '%s' output mismatch, expected '%s' actual '%s'", testLocation, res.getName(), expectedValue, actualValue); - org.junit.Assert.fail(errorMessage + ". Exception thrown while testing"); + Assertions.fail(errorMessage + ". Exception thrown while testing"); } } } diff --git a/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL2SDMNInterpreterTest.java b/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL2SDMNInterpreterTest.java index 20a249b4e..e4340b49b 100644 --- a/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL2SDMNInterpreterTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL2SDMNInterpreterTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.runtime.interpreter; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class CL2SDMNInterpreterTest extends AbstractDMNInterpreterTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL3DMNInterpreterTest.java b/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL3DMNInterpreterTest.java index 5359fc430..023bb8eba 100644 --- a/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL3DMNInterpreterTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL3DMNInterpreterTest.java @@ -13,8 +13,8 @@ package com.gs.dmn.runtime.interpreter; import com.gs.dmn.runtime.Pair; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -295,7 +295,7 @@ public void test_12_cl3_0076_feel_external_java() { doSingleModelTest("1.2", "0076-feel-external-java"); } - @Ignore("incorrect DS type") + @Disabled("incorrect DS type") public void test_12_cl3_0082_feel_coercion() { doSingleModelTest("1.2", "0082-feel-coercion"); } @@ -305,7 +305,7 @@ public void test_12_cl3_0085_decision_services() { doSingleModelTest("1.2", "0085-decision-services"); } - @Ignore("incorrect DS type") + @Disabled("incorrect DS type") public void test_12_cl3_0086_import() { doMultipleModelsTest("1.2", Arrays.asList("0086-import", "0086-imported-model"), new Pair<>("singletonInputData", "false")); } diff --git a/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/ImportDMNInterpreterTest.java b/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/ImportDMNInterpreterTest.java index 3f8197cbd..21b49b50a 100644 --- a/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/ImportDMNInterpreterTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/ImportDMNInterpreterTest.java @@ -16,7 +16,7 @@ import com.gs.dmn.dialect.StandardDMNDialectDefinition; import com.gs.dmn.runtime.Pair; import com.gs.dmn.tck.ast.TestCases; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; diff --git a/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/InterpretedRuleOutputTest.java b/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/InterpretedRuleOutputTest.java index 00fb8c7d8..50ce0dd7b 100644 --- a/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/InterpretedRuleOutputTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/InterpretedRuleOutputTest.java @@ -14,10 +14,10 @@ import com.gs.dmn.runtime.Context; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class InterpretedRuleOutputTest { @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/serialization/AbstractUnmarshalMarshalTest.java b/dmn-core/src/test/java/com/gs/dmn/serialization/AbstractUnmarshalMarshalTest.java index 9a681966e..6400120d6 100644 --- a/dmn-core/src/test/java/com/gs/dmn/serialization/AbstractUnmarshalMarshalTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/serialization/AbstractUnmarshalMarshalTest.java @@ -22,7 +22,7 @@ import java.io.File; import java.io.FileInputStream; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public abstract class AbstractUnmarshalMarshalTest extends AbstractFileTransformerTest { protected void testRoundTrip(String inputFilePath) throws Exception { @@ -72,7 +72,7 @@ protected void validateXSDSchema(File outputDMNFile) { LOGGER.error("" + p); } } - assertTrue(outputDMNFile.getAbsolutePath(), validateOutputResult.isValid()); + assertTrue(validateOutputResult.isValid(), outputDMNFile.getAbsolutePath()); } protected abstract M getMarshaller(); diff --git a/dmn-core/src/test/java/com/gs/dmn/serialization/DMNSerializerTest.java b/dmn-core/src/test/java/com/gs/dmn/serialization/DMNSerializerTest.java index 79911c508..abd4ef1c4 100644 --- a/dmn-core/src/test/java/com/gs/dmn/serialization/DMNSerializerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/serialization/DMNSerializerTest.java @@ -16,12 +16,12 @@ import com.gs.dmn.QualifiedName; import com.gs.dmn.ast.*; import com.gs.dmn.serialization.xstream.XMLDMNSerializer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DMNSerializerTest extends AbstractTest { private final DMNSerializer dmnSerializer = new XMLDMNSerializer(LOGGER, false); diff --git a/dmn-core/src/test/java/com/gs/dmn/serialization/jackson/UnmarshalMarshalTest.java b/dmn-core/src/test/java/com/gs/dmn/serialization/jackson/UnmarshalMarshalTest.java index 11009a21e..522bc0716 100644 --- a/dmn-core/src/test/java/com/gs/dmn/serialization/jackson/UnmarshalMarshalTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/serialization/jackson/UnmarshalMarshalTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.serialization.jackson; import com.gs.dmn.serialization.AbstractJacksonUnmarshalMarshalTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class UnmarshalMarshalTest extends AbstractJacksonUnmarshalMarshalTest { @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/DMN11ToLatestDialectTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/DMN11ToLatestDialectTransformerTest.java index a6feb1d96..470da3102 100644 --- a/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/DMN11ToLatestDialectTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/DMN11ToLatestDialectTransformerTest.java @@ -2,7 +2,7 @@ import com.gs.dmn.serialization.DMNDialectTransformerTest; import com.gs.dmn.serialization.SimpleDMNDialectTransformer; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DMN11ToLatestDialectTransformerTest extends DMNDialectTransformerTest { @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/DMN12ToLatestDialectTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/DMN12ToLatestDialectTransformerTest.java index 57cd42cbd..5b8cdb7d7 100644 --- a/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/DMN12ToLatestDialectTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/DMN12ToLatestDialectTransformerTest.java @@ -2,7 +2,7 @@ import com.gs.dmn.serialization.DMNDialectTransformerTest; import com.gs.dmn.serialization.SimpleDMNDialectTransformer; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DMN12ToLatestDialectTransformerTest extends DMNDialectTransformerTest { @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/DMN13ToLatestDialectTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/DMN13ToLatestDialectTransformerTest.java index fc000f0a4..f10c4fe1b 100644 --- a/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/DMN13ToLatestDialectTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/DMN13ToLatestDialectTransformerTest.java @@ -2,7 +2,7 @@ import com.gs.dmn.serialization.DMNDialectTransformerTest; import com.gs.dmn.serialization.SimpleDMNDialectTransformer; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DMN13ToLatestDialectTransformerTest extends DMNDialectTransformerTest { @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_1/UnmarshalMarshalTest.java b/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_1/UnmarshalMarshalTest.java index c40a7e385..cb0196fc4 100644 --- a/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_1/UnmarshalMarshalTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_1/UnmarshalMarshalTest.java @@ -17,8 +17,8 @@ import com.gs.dmn.serialization.diff.XMLDifferenceEvaluator; import com.gs.dmn.serialization.xstream.DMNMarshallerFactory; import com.gs.dmn.serialization.xstream.extensions.MyTestRegister; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.xmlunit.diff.DifferenceEvaluator; import org.xmlunit.diff.DifferenceEvaluators; @@ -93,7 +93,7 @@ public void testSemanticNamespace() throws Exception { testRoundTrip("xstream/v1_1/semantic-namespace.dmn"); } - @Ignore("The current file cannot marshal back extension elements because they don't provide converters.") + @Disabled("The current file cannot marshal back extension elements because they don't provide converters.") @Test public void test20161014() throws Exception { testRoundTrip("xstream/v1_1/test20161014.dmn"); diff --git a/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_2/UnmarshalMarshalTest.java b/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_2/UnmarshalMarshalTest.java index 43dd003a4..a5322e0d9 100644 --- a/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_2/UnmarshalMarshalTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_2/UnmarshalMarshalTest.java @@ -21,7 +21,7 @@ import com.gs.dmn.serialization.diff.XMLDifferenceEvaluator; import com.gs.dmn.serialization.xstream.DMNMarshallerFactory; import com.gs.dmn.serialization.xstream.extensions.MyTestRegister; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xmlunit.diff.DifferenceEvaluator; import org.xmlunit.diff.DifferenceEvaluators; @@ -30,7 +30,7 @@ import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class UnmarshalMarshalTest extends AbstractXStreamUnmarshalMarshalTest { @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_3/UnmarshalMarshalTest.java b/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_3/UnmarshalMarshalTest.java index 5277430ec..128f0008f 100644 --- a/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_3/UnmarshalMarshalTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_3/UnmarshalMarshalTest.java @@ -14,7 +14,7 @@ import com.gs.dmn.serialization.AbstractXStreamUnmarshalMarshalTest; import com.gs.dmn.serialization.diff.XMLDifferenceEvaluator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xmlunit.diff.DifferenceEvaluator; import org.xmlunit.diff.DifferenceEvaluators; diff --git a/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_4/UnmarshalMarshalTest.java b/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_4/UnmarshalMarshalTest.java index 3f39651c4..c1185c6ec 100644 --- a/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_4/UnmarshalMarshalTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/serialization/xstream/v1_4/UnmarshalMarshalTest.java @@ -14,7 +14,7 @@ import com.gs.dmn.serialization.AbstractXStreamUnmarshalMarshalTest; import com.gs.dmn.serialization.diff.XMLDifferenceEvaluator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xmlunit.diff.DifferenceEvaluator; import org.xmlunit.diff.DifferenceEvaluators; diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/CL2TestCasesToJavaJUnitTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/CL2TestCasesToJavaJUnitTransformerTest.java index 0f10642da..7a87bfd9d 100644 --- a/dmn-core/src/test/java/com/gs/dmn/tck/CL2TestCasesToJavaJUnitTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/tck/CL2TestCasesToJavaJUnitTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.tck; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CL2TestCasesToJavaJUnitTransformerTest extends AbstractTCKTestCasesToJavaJUnitTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/CL2TestCasesToKotlinJUnitTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/CL2TestCasesToKotlinJUnitTransformerTest.java index b64918424..0c7a7f1b5 100644 --- a/dmn-core/src/test/java/com/gs/dmn/tck/CL2TestCasesToKotlinJUnitTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/tck/CL2TestCasesToKotlinJUnitTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.tck; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CL2TestCasesToKotlinJUnitTransformerTest extends AbstractTestCasesToKotlinJUnitTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/CL3TestCasesToJavaJUnitTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/CL3TestCasesToJavaJUnitTransformerTest.java index 3be0534a6..8f3eb2e12 100644 --- a/dmn-core/src/test/java/com/gs/dmn/tck/CL3TestCasesToJavaJUnitTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/tck/CL3TestCasesToJavaJUnitTransformerTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.tck; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CL3TestCasesToJavaJUnitTransformerTest extends AbstractTCKTestCasesToJavaJUnitTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/CL3TestCasesToPythonJUnitTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/CL3TestCasesToPythonJUnitTransformerTest.java index aaa313639..24428518b 100644 --- a/dmn-core/src/test/java/com/gs/dmn/tck/CL3TestCasesToPythonJUnitTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/tck/CL3TestCasesToPythonJUnitTransformerTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.tck; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CL3TestCasesToPythonJUnitTransformerTest extends AbstractTestCasesToPythonJUnitTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/ImportTestCasesToJavaJUnitTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/ImportTestCasesToJavaJUnitTransformerTest.java index 552aa9df8..1291d836d 100644 --- a/dmn-core/src/test/java/com/gs/dmn/tck/ImportTestCasesToJavaJUnitTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/tck/ImportTestCasesToJavaJUnitTransformerTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.tck; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ImportTestCasesToJavaJUnitTransformerTest extends AbstractTCKTestCasesToJavaJUnitTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/MockTCKValueTranslatorTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/MockTCKValueTranslatorTest.java index ca14d0808..51b6f1776 100644 --- a/dmn-core/src/test/java/com/gs/dmn/tck/MockTCKValueTranslatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/tck/MockTCKValueTranslatorTest.java @@ -28,7 +28,7 @@ import com.gs.dmn.transformation.InputParameters; import com.gs.dmn.transformation.basic.BasicDMNToNativeTransformer; import com.gs.dmn.transformation.lazy.NopLazyEvaluationDetector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.DatatypeFactory; import java.math.BigDecimal; @@ -46,7 +46,7 @@ import static com.gs.dmn.feel.analysis.semantics.type.NumberType.NUMBER; import static com.gs.dmn.feel.analysis.semantics.type.StringType.STRING; import static com.gs.dmn.feel.analysis.semantics.type.TimeType.TIME; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MockTCKValueTranslatorTest { static final DatatypeFactory DATATYPE_FACTORY; diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/ProtoToJavaJUnitTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/ProtoToJavaJUnitTransformerTest.java index f36090b1f..4e5835c27 100644 --- a/dmn-core/src/test/java/com/gs/dmn/tck/ProtoToJavaJUnitTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/tck/ProtoToJavaJUnitTransformerTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.tck; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ProtoToJavaJUnitTransformerTest extends AbstractTCKTestCasesToJavaJUnitTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/ProtoToKotlinJUnitTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/ProtoToKotlinJUnitTransformerTest.java index 85607949f..18173a27f 100644 --- a/dmn-core/src/test/java/com/gs/dmn/tck/ProtoToKotlinJUnitTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/tck/ProtoToKotlinJUnitTransformerTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.tck; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ProtoToKotlinJUnitTransformerTest extends AbstractTestCasesToKotlinJUnitTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/TCKValueTranslatorTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/TCKValueTranslatorTest.java index bf3d86a72..3a711d0ee 100644 --- a/dmn-core/src/test/java/com/gs/dmn/tck/TCKValueTranslatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/tck/TCKValueTranslatorTest.java @@ -14,13 +14,13 @@ import com.gs.dmn.transformation.InputParameters; import com.gs.dmn.transformation.basic.BasicDMNToNativeTransformer; import com.gs.dmn.transformation.lazy.NopLazyEvaluationDetector; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; import java.math.BigDecimal; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TCKValueTranslatorTest { private final StandardDMNDialectDefinition dialect = new StandardDMNDialectDefinition(); diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/ast/AnySimpleTypeTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/ast/AnySimpleTypeTest.java index f7b98861f..35c9a92bb 100644 --- a/dmn-core/src/test/java/com/gs/dmn/tck/ast/AnySimpleTypeTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/tck/ast/AnySimpleTypeTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.tck.ast; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.DatatypeConstants; import javax.xml.datatype.Duration; @@ -20,7 +20,7 @@ import java.math.BigDecimal; import static com.gs.dmn.tck.ast.AnySimpleType.DATATYPE_FACTORY; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class AnySimpleTypeTest { @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/ast/visitor/NopVisitorTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/ast/visitor/NopVisitorTest.java index 82ef07d50..c84d92181 100644 --- a/dmn-core/src/test/java/com/gs/dmn/tck/ast/visitor/NopVisitorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/tck/ast/visitor/NopVisitorTest.java @@ -16,12 +16,12 @@ import com.gs.dmn.tck.ast.TestCases; import com.gs.dmn.tck.serialization.TCKMarshaller; import com.gs.dmn.tck.serialization.xstream.TCKMarshallerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.FileReader; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class NopVisitorTest { private final NopVisitor visitor = new NopVisitor<>(new NopErrorHandler()); diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/ast/visitor/TraversalVisitorTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/ast/visitor/TraversalVisitorTest.java index 501957480..192b99c99 100644 --- a/dmn-core/src/test/java/com/gs/dmn/tck/ast/visitor/TraversalVisitorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/tck/ast/visitor/TraversalVisitorTest.java @@ -16,12 +16,12 @@ import com.gs.dmn.tck.ast.TestCases; import com.gs.dmn.tck.serialization.TCKMarshaller; import com.gs.dmn.tck.serialization.xstream.TCKMarshallerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.FileReader; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TraversalVisitorTest { private final TraversalVisitor visitor = new TraversalVisitor<>(new NopErrorHandler()); diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/serialization/xstream/v1/UnmarshalMarshalTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/serialization/xstream/v1/UnmarshalMarshalTest.java index 0e3595b47..90e83f81d 100644 --- a/dmn-core/src/test/java/com/gs/dmn/tck/serialization/xstream/v1/UnmarshalMarshalTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/tck/serialization/xstream/v1/UnmarshalMarshalTest.java @@ -16,8 +16,8 @@ import com.gs.dmn.tck.serialization.AbstractTCKUnmarshalMarshalTest; import com.gs.dmn.tck.serialization.TCKMarshaller; import com.gs.dmn.tck.serialization.xstream.TCKMarshallerFactory; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.io.File; @@ -25,7 +25,7 @@ public class UnmarshalMarshalTest extends AbstractTCKUnmarshalMarshalTest { private final TCKMarshaller marshaller = TCKMarshallerFactory.newDefaultMarshaller(); private final String rootOutputPath = "target/"; - @Ignore("Integration all TCK files") + @Disabled("Integration all TCK files") public void testTCKTests() throws Exception { testRoundTrip(STANDARD_FOLDER); } diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractFileTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractFileTransformerTest.java index c15e40054..a1c5670ad 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractFileTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractFileTransformerTest.java @@ -31,8 +31,8 @@ import static com.gs.dmn.serialization.DMNSerializer.isDMNFile; import static com.gs.dmn.tck.TCKSerializer.isTCKFile; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public abstract class AbstractFileTransformerTest extends AbstractTest { protected static final BuildLogger LOGGER = new Slf4jBuildLogger(LoggerFactory.getLogger(AbstractFileTransformerTest.class)); @@ -81,7 +81,7 @@ protected void compareXmlFile(File expectedOutputFile, File actualOutputFile, Di LOGGER.info("No diffs"); } String message = String.format("XMLs %s and %s are not similar", expectedOutputFile.getPath(), actualOutputFile.getPath()); - assertFalse(message, diff.hasDifferences()); + assertFalse(diff.hasDifferences(), message); } protected Diff makeDMNDiff(File expectedOutputFile, File actualOutputFile) { @@ -125,12 +125,12 @@ protected void compareJsonFile(File expectedOutputFile, File actualOutputFile) t protected void compareTextFile(File expectedOutputFile, File actualOutputFile) throws IOException { String expectedTypeContent = FileUtils.readFileToString(expectedOutputFile, "UTF-8").replace(" \r", "\r").replace("\r", ""); String actualTypeContent = FileUtils.readFileToString(actualOutputFile, "UTF-8").replace(" \r", "\r").replace("\r", ""); - assertEquals(expectedOutputFile.getCanonicalPath(), expectedTypeContent, actualTypeContent); + assertEquals(expectedTypeContent, actualTypeContent, expectedOutputFile.getCanonicalPath()); } protected void compareFileList(File expectedParent, List expectedChildren, File actualParent, List actualChildren) throws Exception { String message = String.format("Different number of children when comparing '%s' with '%s'", expectedParent.getCanonicalPath(), actualParent.getCanonicalPath()); - assertEquals(message, expectedChildren.size(), actualChildren.size()); + assertEquals(expectedChildren.size(), actualChildren.size(), message); expectedChildren.sort(new FileComparator()); actualChildren.sort(new FileComparator()); for (int i = 0; i < expectedChildren.size(); i++) { diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTransformerTest.java index 6244e4aaa..16d410096 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTransformerTest.java @@ -18,14 +18,14 @@ import com.gs.dmn.transformation.lazy.LazyEvaluationDetector; import com.gs.dmn.transformation.template.TemplateProvider; import com.gs.dmn.validation.DMNValidator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.nio.file.Path; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public abstract class AbstractTransformerTest extends AbstractFileTransformerTest { protected Path path(String path) { diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/AddMissingImportPrefixInDTTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/AddMissingImportPrefixInDTTransformerTest.java index 56f0da30f..cee4d1c67 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/AddMissingImportPrefixInDTTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/AddMissingImportPrefixInDTTransformerTest.java @@ -13,14 +13,14 @@ package com.gs.dmn.transformation; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class AddMissingImportPrefixInDTTransformerTest { private final AddMissingImportPrefixInDTTransformer transformer = new AddMissingImportPrefixInDTTransformer(); diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/AddMissingNamespaceInTestCasesTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/AddMissingNamespaceInTestCasesTransformerTest.java index c0e30c1df..02f1abb06 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/AddMissingNamespaceInTestCasesTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/AddMissingNamespaceInTestCasesTransformerTest.java @@ -14,7 +14,7 @@ import com.gs.dmn.runtime.Pair; import com.gs.dmn.tck.ast.TestCases; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.LinkedHashMap; diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/CL2TckDMNToJavaTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/CL2TckDMNToJavaTransformerTest.java index 3bb42d466..b4bbb4659 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/CL2TckDMNToJavaTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/CL2TckDMNToJavaTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.transformation; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CL2TckDMNToJavaTransformerTest extends AbstractTckDMNToJavaTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/CL2TckDMNToKotlinTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/CL2TckDMNToKotlinTransformerTest.java index 251d2fade..027e7a68d 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/CL2TckDMNToKotlinTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/CL2TckDMNToKotlinTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.transformation; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CL2TckDMNToKotlinTransformerTest extends AbstractTckDMNToKotlinTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/CL3DMNToLambdaTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/CL3DMNToLambdaTransformerTest.java index d3beddcd6..4263fb8da 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/CL3DMNToLambdaTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/CL3DMNToLambdaTransformerTest.java @@ -24,7 +24,7 @@ import com.gs.dmn.transformation.template.TreeTemplateProvider; import com.gs.dmn.validation.DMNValidator; import com.gs.dmn.validation.NopDMNValidator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToJavaTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToJavaTransformerTest.java index d77ff4600..897037fe3 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToJavaTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToJavaTransformerTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.transformation; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CL3TckDMNToJavaTransformerTest extends AbstractTckDMNToJavaTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToKotlinTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToKotlinTransformerTest.java index 38acc99b3..6b140b954 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToKotlinTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToKotlinTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.transformation; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CL3TckDMNToKotlinTransformerTest extends AbstractTckDMNToKotlinTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToPythonTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToPythonTransformerTest.java index 4ebe2b5f3..7815b4122 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToPythonTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/CL3TckDMNToPythonTransformerTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.transformation; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class CL3TckDMNToPythonTransformerTest extends AbstractTckDMNToPythonTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/DMNToJavaProtoTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/DMNToJavaProtoTransformerTest.java index b15167065..fb5888e50 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/DMNToJavaProtoTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/DMNToJavaProtoTransformerTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.transformation; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DMNToJavaProtoTransformerTest extends AbstractTckDMNToJavaTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/DMNToKotlinProtoTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/DMNToKotlinProtoTransformerTest.java index b1f922cac..53257e536 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/DMNToKotlinProtoTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/DMNToKotlinProtoTransformerTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.transformation; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DMNToKotlinProtoTransformerTest extends AbstractTckDMNToKotlinTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/ImportDMNToJavaTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/ImportDMNToJavaTransformerTest.java index 196552c35..ccfa73601 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/ImportDMNToJavaTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/ImportDMNToJavaTransformerTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.transformation; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ImportDMNToJavaTransformerTest extends AbstractTckDMNToJavaTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/InputParametersTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/InputParametersTest.java index 502bc2c45..fccacb7ac 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/InputParametersTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/InputParametersTest.java @@ -12,12 +12,12 @@ */ package com.gs.dmn.transformation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class InputParametersTest { @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/MixedItemDefinitionsVisitorTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/MixedItemDefinitionsVisitorTest.java index 1b3ea0830..153327f41 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/MixedItemDefinitionsVisitorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/MixedItemDefinitionsVisitorTest.java @@ -15,11 +15,11 @@ import com.gs.dmn.ast.TDMNElement; import com.gs.dmn.ast.TItemDefinition; import com.gs.dmn.error.NopErrorHandler; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.namespace.QName; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class MixedItemDefinitionsVisitorTest { private final MixedItemDefinitionsVisitor visitor = new MixedItemDefinitionsVisitor<>(new NopErrorHandler()); diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/OtherDMNToJavaTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/OtherDMNToJavaTransformerTest.java index d67f02f59..7556436df 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/OtherDMNToJavaTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/OtherDMNToJavaTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.transformation; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class OtherDMNToJavaTransformerTest extends AbstractTckDMNToJavaTransformerTest { @Override diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/SpecialVariableTransformerVisitorTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/SpecialVariableTransformerVisitorTest.java index e9095167f..db2caf4d1 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/SpecialVariableTransformerVisitorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/SpecialVariableTransformerVisitorTest.java @@ -1,11 +1,10 @@ package com.gs.dmn.transformation; import com.gs.dmn.ast.TUnaryTests; -import com.gs.dmn.transformation.SpecialVariableTransformerVisitor; import com.gs.dmn.error.NopErrorHandler; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SpecialVariableTransformerVisitorTest { private final SpecialVariableTransformerVisitor visitor = new SpecialVariableTransformerVisitor<>(new NopErrorHandler()); diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/ToQuotedNameTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/ToQuotedNameTransformerTest.java index daf475818..bb8099574 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/ToQuotedNameTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/ToQuotedNameTransformerTest.java @@ -15,7 +15,7 @@ import com.gs.dmn.feel.analysis.scanner.LexicalContext; import com.gs.dmn.runtime.Pair; import com.gs.dmn.tck.ast.TestCases; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.LinkedHashMap; diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/basic/BasicDMNToJavaTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/basic/BasicDMNToJavaTransformerTest.java index 38822288b..581d0c078 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/basic/BasicDMNToJavaTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/basic/BasicDMNToJavaTransformerTest.java @@ -22,16 +22,16 @@ import com.gs.dmn.tck.ast.TestCases; import com.gs.dmn.transformation.InputParameters; import com.gs.dmn.transformation.lazy.NopLazyEvaluationDetector; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; import java.io.File; import java.math.BigDecimal; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class BasicDMNToJavaTransformerTest extends AbstractTest { private final DMNDialectDefinition dialectDefinition = new StandardDMNDialectDefinition(); @@ -39,7 +39,7 @@ public class BasicDMNToJavaTransformerTest extends AbstractTest { private BasicDMNToJavaTransformer dmnTransformer; private String href; - @Before + @BeforeEach public void setUp() { String pathName = "dmn/input/1.1/0004-lending.dmn"; DMNModelRepository repository = readDMN(pathName); diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/basic/DecisionTableToJavaTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/basic/DecisionTableToJavaTransformerTest.java index a7fe56aa8..6a3e6a50d 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/basic/DecisionTableToJavaTransformerTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/basic/DecisionTableToJavaTransformerTest.java @@ -19,9 +19,9 @@ import com.gs.dmn.dialect.StandardDMNDialectDefinition; import com.gs.dmn.transformation.InputParameters; import com.gs.dmn.transformation.lazy.NopLazyEvaluationDetector; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DecisionTableToJavaTransformerTest extends AbstractTest { private final DMNDialectDefinition dialect = new StandardDMNDialectDefinition(); diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/basic/QualifiedNameTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/basic/QualifiedNameTest.java index 54747965f..27fdf0f35 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/basic/QualifiedNameTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/basic/QualifiedNameTest.java @@ -13,10 +13,10 @@ package com.gs.dmn.transformation.basic; import com.gs.dmn.QualifiedName; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class QualifiedNameTest { @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/formatter/GoogleJavaFormatterTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/formatter/GoogleJavaFormatterTest.java index 36f885e07..51891205f 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/formatter/GoogleJavaFormatterTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/formatter/GoogleJavaFormatterTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.transformation.formatter; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class GoogleJavaFormatterTest extends JavaFormatterTest { @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/formatter/JavaFormatterTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/formatter/JavaFormatterTest.java index fc9c59490..6e1f9d9a7 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/formatter/JavaFormatterTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/formatter/JavaFormatterTest.java @@ -18,7 +18,7 @@ import java.io.File; import java.io.IOException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public abstract class JavaFormatterTest extends AbstractTest { protected void doTest() throws IOException { @@ -32,7 +32,7 @@ protected void doTest(String fileName) throws IOException { JavaFormatter formatter = getFormatter(); String actualContent = formatter.formatSource(code).replace(" \r", "\r").replace("\r", ""); String expectedContent = readResource(getExpectedRelativePath() + fileName).replace(" \r", "\r").replace("\r", ""); - assertEquals("Error for " + fileName, expectedContent, actualContent); + assertEquals(expectedContent, actualContent, "Error for " + fileName); } private String readResource(String actualPath) throws IOException { diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/lazy/SparseDecisionDetectorTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/lazy/SparseDecisionDetectorTest.java index 62fdc0c01..720f5ef7f 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/lazy/SparseDecisionDetectorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/lazy/SparseDecisionDetectorTest.java @@ -21,8 +21,8 @@ import com.gs.dmn.serialization.DMNSerializer; import com.gs.dmn.serialization.xstream.XMLDMNSerializer; import com.gs.dmn.transformation.InputParameters; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.ArrayList; @@ -30,14 +30,14 @@ import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SparseDecisionDetectorTest extends AbstractTest { private SparseDecisionDetector detector; private DMNModelRepository dmnModelRepository; private final DMNSerializer dmnReader = new XMLDMNSerializer(LOGGER, false); - @Before + @BeforeEach public void setUp() { String pathName = "dmn/input/1.1/0004-lending.dmn"; this.dmnModelRepository = readDMN(pathName); diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/proto/FieldTypeTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/proto/FieldTypeTest.java index 0fab5a03e..b7d4666e1 100644 --- a/dmn-core/src/test/java/com/gs/dmn/transformation/proto/FieldTypeTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/transformation/proto/FieldTypeTest.java @@ -13,19 +13,24 @@ package com.gs.dmn.transformation.proto; import com.gs.dmn.runtime.DMNRuntimeException; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class FieldTypeTest { - @Test(expected = DMNRuntimeException.class) + @Test public void testConstructorWhenModifierIsNull() { - new FieldType(null, "ab"); + Assertions.assertThrows(DMNRuntimeException.class, () -> { + new FieldType(null, "ab"); + }); } - @Test(expected = DMNRuntimeException.class) + @Test public void testConstructorWhenTypeIsNull() { - new FieldType("optional", null); + Assertions.assertThrows(DMNRuntimeException.class, () -> { + new FieldType("optional", null); + }); } @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/AbstractValidatorTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/AbstractValidatorTest.java index 7cf7c23c8..a14ffe1fb 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/AbstractValidatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/AbstractValidatorTest.java @@ -23,7 +23,7 @@ import java.net.URI; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public abstract class AbstractValidatorTest extends AbstractTest { protected final DMNSerializer serializer = new XMLDMNSerializer(LOGGER, false); diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/DefaultDMNValidatorTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/DefaultDMNValidatorTest.java index 656ad02d7..0d9ebcd5b 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/DefaultDMNValidatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/DefaultDMNValidatorTest.java @@ -12,12 +12,12 @@ */ package com.gs.dmn.validation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultDMNValidatorTest extends AbstractValidatorTest { private final DMNValidator validator = new DefaultDMNValidator(); diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingIntervalValidatorTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingIntervalValidatorTest.java index a1b92e565..f5085bec1 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingIntervalValidatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingIntervalValidatorTest.java @@ -14,12 +14,12 @@ import com.gs.dmn.DMNModelRepository; import com.gs.dmn.dialect.StandardDMNDialectDefinition; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SweepMissingIntervalValidatorTest extends AbstractValidatorTest { private final SweepMissingIntervalValidator validator = new SweepMissingIntervalValidator(new StandardDMNDialectDefinition()); diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorTest.java index 14812df4a..9ce963211 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorTest.java @@ -14,12 +14,12 @@ import com.gs.dmn.DMNModelRepository; import com.gs.dmn.dialect.StandardDMNDialectDefinition; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SweepMissingRuleValidatorTest extends AbstractValidatorTest { private final SweepMissingRuleValidator validator = new SweepMissingRuleValidator(new StandardDMNDialectDefinition()); diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorWithMergeTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorWithMergeTest.java index a8cca9a10..32b731b56 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorWithMergeTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/SweepMissingRuleValidatorWithMergeTest.java @@ -14,12 +14,12 @@ import com.gs.dmn.DMNModelRepository; import com.gs.dmn.dialect.StandardDMNDialectDefinition; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SweepMissingRuleValidatorWithMergeTest extends AbstractValidatorTest { private final SweepMissingRuleValidator validator = new SweepMissingRuleValidator(new StandardDMNDialectDefinition(), true); diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/SweepRuleOverlapValidatorTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/SweepRuleOverlapValidatorTest.java index d6467f0c2..4266db4d6 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/SweepRuleOverlapValidatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/SweepRuleOverlapValidatorTest.java @@ -15,11 +15,11 @@ import com.gs.dmn.DMNModelRepository; import com.gs.dmn.dialect.StandardDMNDialectDefinition; import com.gs.dmn.validation.table.RuleGroup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.*; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class SweepRuleOverlapValidatorTest extends AbstractValidatorTest { private final SweepRuleOverlapValidator validator = new SweepRuleOverlapValidator(new StandardDMNDialectDefinition()); diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/TypeRefValidatorTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/TypeRefValidatorTest.java index 9eb425034..bfc167908 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/TypeRefValidatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/TypeRefValidatorTest.java @@ -13,12 +13,12 @@ */ package com.gs.dmn.validation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TypeRefValidatorTest extends AbstractValidatorTest { private final TypeRefValidator validator = new TypeRefValidator(); diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/UniqueNameValidatorTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/UniqueNameValidatorTest.java index 09956a7df..574aac728 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/UniqueNameValidatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/UniqueNameValidatorTest.java @@ -12,13 +12,13 @@ */ package com.gs.dmn.validation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class UniqueNameValidatorTest extends AbstractValidatorTest { private final UniqueNameValidator validator = new UniqueNameValidator(); diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/UniqueRequirementValidatorTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/UniqueRequirementValidatorTest.java index a3f8b59ac..56b7ea353 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/UniqueRequirementValidatorTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/UniqueRequirementValidatorTest.java @@ -12,13 +12,13 @@ */ package com.gs.dmn.validation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class UniqueRequirementValidatorTest extends AbstractValidatorTest { private final UniqueRequirementValidator validator = new UniqueRequirementValidator(); diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/table/BoundTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/table/BoundTest.java index 19e217243..218b21a36 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/table/BoundTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/table/BoundTest.java @@ -13,19 +13,22 @@ package com.gs.dmn.validation.table; import com.gs.dmn.runtime.DMNRuntimeException; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class BoundTest { - @Test(expected = DMNRuntimeException.class) + @Test public void testSameValueWhenNull() { - assertTrue(Bound.sameValue(null, null)); - assertTrue(Bound.sameValue(new Bound(null, true, false, 4), null)); - assertTrue(Bound.sameValue(null, new Bound(null, true, false, 4))); + Assertions.assertThrows(DMNRuntimeException.class, () -> { + assertTrue(Bound.sameValue(null, null)); + assertTrue(Bound.sameValue(new Bound(null, true, false, 4), null)); + assertTrue(Bound.sameValue(null, new Bound(null, true, false, 4))); + }); } @Test @@ -35,11 +38,13 @@ public void testSameValue() { assertFalse(Bound.sameValue(new Bound(null, true, false, 4), new Bound(null, true, false, 5))); } - @Test(expected = DMNRuntimeException.class) + @Test public void testSameEndpointWhenNull() { - assertTrue(Bound.sameEnd(null, null)); - assertTrue(Bound.sameEnd(new Bound(null, true, false, 4), null)); - assertTrue(Bound.sameEnd(null, new Bound(null, true, false, 4))); + Assertions.assertThrows(DMNRuntimeException.class, () -> { + assertTrue(Bound.sameEnd(null, null)); + assertTrue(Bound.sameEnd(new Bound(null, true, false, 4), null)); + assertTrue(Bound.sameEnd(null, new Bound(null, true, false, 4))); + }); } @Test @@ -49,11 +54,13 @@ public void testSameEnd() { assertFalse(Bound.sameEnd(new Bound(null, true, false, 4), new Bound(null, true, false, 5))); } - @Test(expected = DMNRuntimeException.class) + @Test public void testAreAdjacentWhenNull() { - assertTrue(Bound.areAdjacent(null, null)); - assertTrue(Bound.areAdjacent(new Bound(null, true, false, 4), null)); - assertTrue(Bound.areAdjacent(null, new Bound(null, true, false, 4))); + Assertions.assertThrows(DMNRuntimeException.class, () -> { + assertTrue(Bound.areAdjacent(null, null)); + assertTrue(Bound.areAdjacent(new Bound(null, true, false, 4), null)); + assertTrue(Bound.areAdjacent(null, new Bound(null, true, false, 4))); + }); } @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/table/IntervalTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/table/IntervalTest.java index e6ce8a235..74a9941ec 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/table/IntervalTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/table/IntervalTest.java @@ -13,24 +13,27 @@ package com.gs.dmn.validation.table; import com.gs.dmn.runtime.DMNRuntimeException; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class IntervalTest { private final Input numericInput = new Input("number"); private final Input booleanInput = new Input("boolean", EnumerationInterval.BOOLEAN_ALLOWED_VALUES); private final Input enumerationInput = new Input("string", Arrays.asList("E1", "E2", "E3")); - @Test(expected = DMNRuntimeException.class) + @Test public void testSameValueWhenNull() { - NumericInterval n1 = new NumericInterval(0, 0, numericInput); + Assertions.assertThrows(DMNRuntimeException.class, () -> { + NumericInterval n1 = new NumericInterval(0, 0, numericInput); - assertTrue(Interval.sameEndValues(null, null)); - assertTrue(Interval.sameEndValues(null, n1)); - assertTrue(Interval.sameEndValues(n1, null)); + assertTrue(Interval.sameEndValues(null, null)); + assertTrue(Interval.sameEndValues(null, n1)); + assertTrue(Interval.sameEndValues(n1, null)); + }); } @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/table/MissingRuleListTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/table/MissingRuleListTest.java index 016ff3ea8..da73b3179 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/table/MissingRuleListTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/table/MissingRuleListTest.java @@ -12,9 +12,9 @@ */ package com.gs.dmn.validation.table; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MissingRuleListTest { @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/table/RuleGroupTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/table/RuleGroupTest.java index ec8f2be5b..9f676b0fa 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/table/RuleGroupTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/table/RuleGroupTest.java @@ -12,12 +12,12 @@ */ package com.gs.dmn.validation.table; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class RuleGroupTest { @Test diff --git a/dmn-core/src/test/java/com/gs/dmn/validation/table/TableFactoryTest.java b/dmn-core/src/test/java/com/gs/dmn/validation/table/TableFactoryTest.java index f5067b5a9..28a8d01c1 100644 --- a/dmn-core/src/test/java/com/gs/dmn/validation/table/TableFactoryTest.java +++ b/dmn-core/src/test/java/com/gs/dmn/validation/table/TableFactoryTest.java @@ -20,14 +20,14 @@ import com.gs.dmn.el.synthesis.ELTranslator; import com.gs.dmn.transformation.InputParameters; import com.gs.dmn.validation.AbstractValidatorTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.URI; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TableFactoryTest extends AbstractValidatorTest { private final DMNDialectDefinition dmnDialectDefinition = new StandardDMNDialectDefinition(); diff --git a/dmn-jpa-it/src/test/java/com/gs/jpa/example_credit_decision/JPAExampleCreditDecisionTest.java b/dmn-jpa-it/src/test/java/com/gs/jpa/example_credit_decision/JPAExampleCreditDecisionTest.java index 5d143740f..a4a82efbd 100644 --- a/dmn-jpa-it/src/test/java/com/gs/jpa/example_credit_decision/JPAExampleCreditDecisionTest.java +++ b/dmn-jpa-it/src/test/java/com/gs/jpa/example_credit_decision/JPAExampleCreditDecisionTest.java @@ -14,8 +14,9 @@ import com.gs.dmn.generated.example_credit_decision.GenerateOutputData; import com.gs.dmn.generated.example_credit_decision.type.Applicant; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -26,20 +27,20 @@ public class JPAExampleCreditDecisionTest extends com.gs.dmn.runtime.MixedJavaTi protected static EntityManagerFactory emf; protected static EntityManager em; - @BeforeClass + @BeforeAll public static void init() { emf = Persistence.createEntityManagerFactory("example-pu-test"); em = emf.createEntityManager(); } - @AfterClass + @AfterAll public static void tearDown(){ em.clear(); em.close(); emf.close(); } - @org.junit.Test + @Test public void testCase001() { com.gs.dmn.runtime.ExecutionContext context = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data @@ -52,7 +53,7 @@ public void testCase001() { checkValues(new com.gs.dmn.generated.example_credit_decision.type.GenerateOutputDataImpl(number("27.5"), "Accept", number("-7.5")), generateOutputDataOutput); } - @org.junit.Test + @Test public void testCase002() { com.gs.dmn.runtime.ExecutionContext context = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data @@ -65,7 +66,7 @@ public void testCase002() { checkValues(new com.gs.dmn.generated.example_credit_decision.type.GenerateOutputDataImpl(number("-10"), "Reject", number("-25")), generateOutputDataOutput); } - @org.junit.Test + @Test public void testCase003() { com.gs.dmn.runtime.ExecutionContext context = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data diff --git a/dmn-jpa-it/src/test/java/com/gs/jpa/lazy_input_model/JPALazyInputModelTest.java b/dmn-jpa-it/src/test/java/com/gs/jpa/lazy_input_model/JPALazyInputModelTest.java index ebe993110..c7ab2aaff 100644 --- a/dmn-jpa-it/src/test/java/com/gs/jpa/lazy_input_model/JPALazyInputModelTest.java +++ b/dmn-jpa-it/src/test/java/com/gs/jpa/lazy_input_model/JPALazyInputModelTest.java @@ -14,8 +14,9 @@ import com.gs.dmn.generated.lazy_input_model.Decision; import com.gs.dmn.generated.lazy_input_model.type.Person; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -26,20 +27,20 @@ public class JPALazyInputModelTest extends com.gs.dmn.runtime.MixedJavaTimeDMNBa protected static EntityManagerFactory emf; protected static EntityManager em; - @BeforeClass + @BeforeAll public static void init() { emf = Persistence.createEntityManagerFactory("lazy-pu-test"); em = emf.createEntityManager(); } - @AfterClass + @AfterAll public static void tearDown(){ em.clear(); em.close(); emf.close(); } - @org.junit.Test + @Test public void testCase001() { com.gs.dmn.runtime.ExecutionContext context = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data @@ -51,7 +52,7 @@ public void testCase001() { checkValues(number("1"), score); } - @org.junit.Test + @Test public void testCase002() { com.gs.dmn.runtime.ExecutionContext context = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data @@ -63,7 +64,7 @@ public void testCase002() { checkValues(number("2"), score); } - @org.junit.Test + @Test public void testCase003() { com.gs.dmn.runtime.ExecutionContext context = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data @@ -75,7 +76,7 @@ public void testCase003() { checkValues(number("3"), score); } - @org.junit.Test + @Test public void testCase004() { com.gs.dmn.runtime.ExecutionContext context = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data @@ -87,7 +88,7 @@ public void testCase004() { checkValues(number("4"), score); } - @org.junit.Test + @Test public void testCase005() { com.gs.dmn.runtime.ExecutionContext context = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data diff --git a/dmn-maven-plugin/pom.xml b/dmn-maven-plugin/pom.xml index 1782fc2d9..47c0c9c37 100644 --- a/dmn-maven-plugin/pom.xml +++ b/dmn-maven-plugin/pom.xml @@ -123,6 +123,12 @@ + + org.junit.jupiter + junit-jupiter + 5.10.1 + test + org.codehaus.plexus diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/AbstractDMNMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/AbstractDMNMojoTest.java index 562e207e4..3ec521ebf 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/AbstractDMNMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/AbstractDMNMojoTest.java @@ -12,17 +12,20 @@ */ package com.gs.dmn.maven; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public abstract class AbstractDMNMojoTest extends AbstractMojoTest { protected abstract AbstractDMNMojo getMojo(); - @Test(expected = IllegalArgumentException.class) + @Test public void testExecuteWhenMissingInput() throws Exception { - getMojo().inputParameters = makeParams(); - getMojo().execute(); - assertTrue(true); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + getMojo().inputParameters = makeParams(); + getMojo().execute(); + assertTrue(true); + }); } } \ No newline at end of file diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToJavaMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToJavaMojoTest.java index c24a10439..5fdc79645 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToJavaMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToJavaMojoTest.java @@ -18,11 +18,11 @@ import com.gs.dmn.transformation.lazy.NopLazyEvaluationDetector; import com.gs.dmn.transformation.template.TreeTemplateProvider; import com.gs.dmn.validation.NopDMNValidator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DMNToJavaMojoTest extends AbstractDMNMojoTest { @Test diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToKotlinMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToKotlinMojoTest.java index ed46477db..474078ec3 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToKotlinMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToKotlinMojoTest.java @@ -18,11 +18,11 @@ import com.gs.dmn.transformation.lazy.NopLazyEvaluationDetector; import com.gs.dmn.transformation.template.TreeTemplateProvider; import com.gs.dmn.validation.NopDMNValidator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DMNToKotlinMojoTest extends AbstractDMNMojoTest { @Test diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToPythonMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToPythonMojoTest.java index 67b41e547..5c607f84a 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToPythonMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/DMNToPythonMojoTest.java @@ -18,11 +18,11 @@ import com.gs.dmn.transformation.lazy.NopLazyEvaluationDetector; import com.gs.dmn.transformation.template.TreeTemplateProvider; import com.gs.dmn.validation.NopDMNValidator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DMNToPythonMojoTest extends AbstractDMNMojoTest { @Test diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/RDFToDMNMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/RDFToDMNMojoTest.java index a0b19173a..f9f11463d 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/RDFToDMNMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/RDFToDMNMojoTest.java @@ -12,22 +12,25 @@ */ package com.gs.dmn.maven; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class RDFToDMNMojoTest extends AbstractMojoTest { private final RDFToDMNMojo mojo = new RDFToDMNMojo<>(); - @Test(expected = IllegalArgumentException.class) + @Test public void testExecuteWhenMissingInput() throws Exception { - mojo.inputParameters = makeParams(); - mojo.execute(); - assertTrue(true); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + mojo.inputParameters = makeParams(); + mojo.execute(); + assertTrue(true); + }); } @Test diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToJavaJUnitMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToJavaJUnitMojoTest.java index e9e0b0271..9eb509714 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToJavaJUnitMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToJavaJUnitMojoTest.java @@ -18,11 +18,11 @@ import com.gs.dmn.transformation.ToQuotedNameTransformer; import com.gs.dmn.transformation.template.TreeTemplateProvider; import com.gs.dmn.validation.NopDMNValidator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TCKToJavaJUnitMojoTest extends AbstractDMNMojoTest { @Test diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToKotlinJUnitMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToKotlinJUnitMojoTest.java index c910b1971..8d41db01f 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToKotlinJUnitMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToKotlinJUnitMojoTest.java @@ -18,11 +18,11 @@ import com.gs.dmn.transformation.ToQuotedNameTransformer; import com.gs.dmn.transformation.template.TreeTemplateProvider; import com.gs.dmn.validation.NopDMNValidator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TCKToKotlinJUnitMojoTest extends AbstractDMNMojoTest { @Test diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToPythonJUnitMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToPythonJUnitMojoTest.java index c631fa4cd..991b4f186 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToPythonJUnitMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TCKToPythonJUnitMojoTest.java @@ -18,11 +18,11 @@ import com.gs.dmn.transformation.ToQuotedNameTransformer; import com.gs.dmn.transformation.template.TreeTemplateProvider; import com.gs.dmn.validation.NopDMNValidator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TCKToPythonJUnitMojoTest extends AbstractDMNMojoTest { @Test diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToJavaJUnitMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToJavaJUnitMojoTest.java index 775697f14..0753153b5 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToJavaJUnitMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToJavaJUnitMojoTest.java @@ -17,11 +17,11 @@ import com.gs.dmn.signavio.testlab.TestLab; import com.gs.dmn.signavio.transformation.template.SignavioTreeTemplateProvider; import com.gs.dmn.transformation.NopDMNTransformer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestLabToJavaJUnitMojoTest extends AbstractDMNMojoTest { @Test diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToKotlinJUnitMojoTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToKotlinJUnitMojoTest.java index 80c69e45e..ac6d66b7c 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToKotlinJUnitMojoTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/TestLabToKotlinJUnitMojoTest.java @@ -17,11 +17,11 @@ import com.gs.dmn.signavio.testlab.TestLab; import com.gs.dmn.signavio.transformation.template.SignavioTreeTemplateProvider; import com.gs.dmn.transformation.NopDMNTransformer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestLabToKotlinJUnitMojoTest extends AbstractDMNMojoTest { @Test diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/configuration/AbstractMojoConfigurationTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/configuration/AbstractMojoConfigurationTest.java index 0b7710830..d1b6fec41 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/configuration/AbstractMojoConfigurationTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/configuration/AbstractMojoConfigurationTest.java @@ -16,7 +16,7 @@ import org.codehaus.plexus.component.configurator.ComponentConfigurationException; import org.codehaus.plexus.configuration.DefaultPlexusConfiguration; import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; public abstract class AbstractMojoConfigurationTest { private static final ObjectMapper mapper = new ObjectMapper(); @@ -44,6 +44,6 @@ protected OptionallyConfigurableMojoComponent parseConfiguration(PlexusConfigura protected void assertEquivalentConfiguration(OptionallyConfigurableMojoComponent component, String serialisedExpected) throws Exception { Object expected = mapper.readValue(serialisedExpected, Object.class); - Assert.assertEquals("Component configuration does not match expected values", expected, component.getConfiguration()); + Assertions.assertEquals(expected, component.getConfiguration(), "Component configuration does not match expected values"); } } diff --git a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/configuration/DMNTransformerComponentConfigurationTest.java b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/configuration/DMNTransformerComponentConfigurationTest.java index d87cd83c1..db1612162 100644 --- a/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/configuration/DMNTransformerComponentConfigurationTest.java +++ b/dmn-maven-plugin/src/test/java/com/gs/dmn/maven/configuration/DMNTransformerComponentConfigurationTest.java @@ -16,8 +16,8 @@ import org.codehaus.plexus.component.configurator.ComponentConfigurationException; import org.codehaus.plexus.configuration.DefaultPlexusConfiguration; import org.codehaus.plexus.configuration.PlexusConfiguration; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class DMNTransformerComponentConfigurationTest extends AbstractMojoConfigurationTest { private static final String ELEMENT_NAME = (new DMNTransformerComponent().getElementName()); @@ -46,16 +46,18 @@ public void testNullConfiguration() throws Exception { assertEquivalentConfiguration(component, "{ }"); } - @Test(expected = ComponentConfigurationException.class) + @Test public void testMissingComponentName() throws Exception { - PlexusConfiguration config = new DefaultPlexusConfiguration(OptionallyConfigurableMojoComponent.ELEMENT_CONFIGURATION) - .addChild("key1", "value1") - .addChild("key2", "value2"); + Assertions.assertThrows(ComponentConfigurationException.class, () -> { + PlexusConfiguration config = new DefaultPlexusConfiguration(OptionallyConfigurableMojoComponent.ELEMENT_CONFIGURATION) + .addChild("key1", "value1") + .addChild("key2", "value2"); - PlexusConfiguration configuration = generateComponentConfiguration(null, ELEMENT_NAME, config); - parseConfiguration(configuration, DMNTransformerComponent.class); + PlexusConfiguration configuration = generateComponentConfiguration(null, ELEMENT_NAME, config); + parseConfiguration(configuration, DMNTransformerComponent.class); - Assert.fail("Test is expected to fail; mandatory component name was not provided"); + Assertions.fail("Test is expected to fail; mandatory component name was not provided"); + }); } @Test diff --git a/dmn-runtime/pom.xml b/dmn-runtime/pom.xml index 96d1f22ae..a1ca97fa5 100644 --- a/dmn-runtime/pom.xml +++ b/dmn-runtime/pom.xml @@ -43,6 +43,12 @@ + + org.junit.jupiter + junit-jupiter + 5.10.1 + test + org.apache.commons @@ -116,8 +122,8 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api compile diff --git a/dmn-runtime/src/main/java/com/gs/dmn/runtime/Assert.java b/dmn-runtime/src/main/java/com/gs/dmn/runtime/Assert.java index 4ef0bc4ba..4807d2f45 100644 --- a/dmn-runtime/src/main/java/com/gs/dmn/runtime/Assert.java +++ b/dmn-runtime/src/main/java/com/gs/dmn/runtime/Assert.java @@ -14,6 +14,7 @@ import com.gs.dmn.feel.lib.type.BaseType; import com.gs.dmn.feel.lib.type.time.xml.BaseDefaultDurationType; +import org.junit.jupiter.api.Assertions; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; @@ -32,27 +33,27 @@ public static void assertEquals(Object expected, Object actual) { public static void assertEquals(String message, Object expected, Object actual) { if (expected == null) { - org.junit.Assert.assertEquals(message, expected, actual); + Assertions.assertEquals(expected, actual, message); } else if (isNumber(expected)) { BigDecimal expectedBD = (BigDecimal) normalizeNumber(expected); BigDecimal actualBD = (BigDecimal) normalizeNumber(actual); if (actual == null) { - org.junit.Assert.assertEquals(message, expected, actual); + Assertions.assertEquals(expected, actual, message); } else { boolean condition = expectedBD.subtract(actualBD).abs().compareTo(NUMBER_COMPARISON_PRECISION) < 0; - org.junit.Assert.assertTrue(String.format(message + ". Expected '%s' found '%s'", expectedBD, actualBD), condition); + Assertions.assertTrue(condition, String.format(message + ". Expected '%s' found '%s'", expectedBD, actualBD)); } } else if (isBoolean(expected)) { - org.junit.Assert.assertEquals(message, expected, actual); + Assertions.assertEquals(expected, actual, message); } else if (isString(expected)) { - org.junit.Assert.assertEquals(message, expected, actual); + Assertions.assertEquals(expected, actual, message); } else if (isDateTime(expected)) { - org.junit.Assert.assertEquals(message, normalizeDateTime(expected), normalizeDateTime(actual)); + Assertions.assertEquals(normalizeDateTime(expected), normalizeDateTime(actual), message); } else if (isList(expected)) { if (actual == null) { - org.junit.Assert.assertEquals(message, expected, actual); + Assertions.assertEquals(expected, actual, message); } else { - org.junit.Assert.assertEquals((message == null ? "" : message) + expected + " vs " + actual, ((List) expected).size(), ((List) actual).size()); + Assertions.assertEquals(((List) expected).size(), ((List) actual).size(), (message == null ? "" : message) + expected + " vs " + actual); for (int i = 0; i < ((List) expected).size(); i++) { assertEquals(message, ((List) expected).get(i), ((List) actual).get(i)); } @@ -91,7 +92,7 @@ public static void assertEquals(String message, Object expected, Object actual) } } } else { - org.junit.Assert.assertEquals(message, expected, actual); + Assertions.assertEquals(expected, actual, message); } } diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseFEELLibExceptionsTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseFEELLibExceptionsTest.java index 48c389cc6..bf84c8b21 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseFEELLibExceptionsTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseFEELLibExceptionsTest.java @@ -12,11 +12,11 @@ */ package com.gs.dmn.feel.lib; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public abstract class BaseFEELLibExceptionsTest { @Test diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseFEELLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseFEELLibTest.java index 333ffda5b..c0cbcec39 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseFEELLibTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseFEELLibTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.feel.lib; import com.gs.dmn.runtime.Context; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public abstract class BaseFEELLibTest extends FEELOperatorsTest { // diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseMixedJavaTimeFEELLibExceptionsTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseMixedJavaTimeFEELLibExceptionsTest.java index b042c2221..d22da9f37 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseMixedJavaTimeFEELLibExceptionsTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseMixedJavaTimeFEELLibExceptionsTest.java @@ -12,12 +12,12 @@ */ package com.gs.dmn.feel.lib; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.LocalDate; import java.time.ZonedDateTime; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public abstract class BaseMixedJavaTimeFEELLibExceptionsTest extends BaseStandardFEELLibExceptionsTest { @Override diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseStandardFEELLibExceptionsTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseStandardFEELLibExceptionsTest.java index 0b92610a0..72557874a 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseStandardFEELLibExceptionsTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseStandardFEELLibExceptionsTest.java @@ -12,13 +12,13 @@ */ package com.gs.dmn.feel.lib; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public abstract class BaseStandardFEELLibExceptionsTest extends BaseFEELLibExceptionsTest { @Test diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseStandardFEELLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseStandardFEELLibTest.java index 754a73742..328e23bd9 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseStandardFEELLibTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/BaseStandardFEELLibTest.java @@ -15,13 +15,13 @@ import com.gs.dmn.runtime.Context; import com.gs.dmn.runtime.LambdaExpression; import com.gs.dmn.runtime.Range; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public abstract class BaseStandardFEELLibTest extends BaseFEELLibTest { // diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/DefaultFEELLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/DefaultFEELLibTest.java index 994231271..82cf7a902 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/DefaultFEELLibTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/DefaultFEELLibTest.java @@ -12,13 +12,13 @@ */ package com.gs.dmn.feel.lib; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; import java.math.BigDecimal; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DefaultFEELLibTest extends BaseStandardFEELLibTest { @Override diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/DoubleMixedJavaTimeFEELLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/DoubleMixedJavaTimeFEELLibTest.java index 5e91eaf66..5ee77b24a 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/DoubleMixedJavaTimeFEELLibTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/DoubleMixedJavaTimeFEELLibTest.java @@ -12,14 +12,14 @@ */ package com.gs.dmn.feel.lib; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import java.time.LocalDate; import java.time.OffsetTime; import java.time.ZonedDateTime; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DoubleMixedJavaTimeFEELLibTest extends BaseStandardFEELLibTest { @Override diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/FEELOperatorsTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/FEELOperatorsTest.java index 08521d870..68a680d2b 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/FEELOperatorsTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/FEELOperatorsTest.java @@ -16,7 +16,7 @@ import com.gs.dmn.runtime.Assert; import com.gs.dmn.runtime.Context; import com.gs.dmn.runtime.Range; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; @@ -26,7 +26,7 @@ import java.util.Arrays; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public abstract class FEELOperatorsTest { protected abstract StandardFEELLib getLib(); diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/MixedJavaTimeFEELLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/MixedJavaTimeFEELLibTest.java index 964a5f94f..85d1b89df 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/MixedJavaTimeFEELLibTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/MixedJavaTimeFEELLibTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.feel.lib; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import java.math.BigDecimal; @@ -20,7 +20,7 @@ import java.time.OffsetTime; import java.time.ZonedDateTime; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class MixedJavaTimeFEELLibTest extends BaseStandardFEELLibTest { @Override diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/PureJavaTimeFEELLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/PureJavaTimeFEELLibTest.java index 485249cd1..4b97c4bb1 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/PureJavaTimeFEELLibTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/PureJavaTimeFEELLibTest.java @@ -12,14 +12,14 @@ */ package com.gs.dmn.feel.lib; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.time.LocalDate; import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class PureJavaTimeFEELLibTest extends BaseStandardFEELLibTest { @Override diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/StringEscapeUtilTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/StringEscapeUtilTest.java index 276572188..5ebf8a49c 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/StringEscapeUtilTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/StringEscapeUtilTest.java @@ -12,10 +12,10 @@ */ package com.gs.dmn.feel.lib; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class StringEscapeUtilTest { @Test diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/AbstractDefaultRangeLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/AbstractDefaultRangeLibTest.java index b34f0e409..87cfd76de 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/AbstractDefaultRangeLibTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/AbstractDefaultRangeLibTest.java @@ -14,9 +14,9 @@ import com.gs.dmn.feel.lib.StandardFEELLib; import com.gs.dmn.runtime.Range; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public abstract class AbstractDefaultRangeLibTest { protected abstract StandardFEELLib getLib(); diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/time/BaseDateTimeLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/time/BaseDateTimeLibTest.java index 5550cd325..0e8a5e812 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/time/BaseDateTimeLibTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/time/BaseDateTimeLibTest.java @@ -13,9 +13,10 @@ package com.gs.dmn.feel.lib.type.time; import com.gs.dmn.runtime.DMNRuntimeException; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class BaseDateTimeLibTest { BaseDateTimeLibStub dateTimeLib = new BaseDateTimeLibStub(); @@ -118,9 +119,11 @@ public void testMakeLocalDate() { assertEquals("-999999999-01-01", this.dateTimeLib.makeLocalDate("-999999999-01-01").format(BaseDateTimeLib.FEEL_DATE)); } - @Test(expected = DMNRuntimeException.class) + @Test public void testMakeLocalDateWhenSign() { - assertNotNull(this.dateTimeLib.makeLocalDate("+999999999-01-01")); + Assertions.assertThrows(DMNRuntimeException.class, () -> { + this.dateTimeLib.makeLocalDate("+999999999-01-01"); + }); } @Test diff --git a/dmn-runtime/src/test/java/com/gs/dmn/runtime/DefaultDMNBaseDecisionTest.java b/dmn-runtime/src/test/java/com/gs/dmn/runtime/DefaultDMNBaseDecisionTest.java index f7054a0f9..6db4de234 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/runtime/DefaultDMNBaseDecisionTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/runtime/DefaultDMNBaseDecisionTest.java @@ -14,9 +14,9 @@ import com.gs.dmn.runtime.annotation.DRGElement; import com.gs.dmn.runtime.annotation.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class DefaultDMNBaseDecisionTest { private final DefaultDMNBaseDecision baseDecision = new DefaultDMNBaseDecision(); diff --git a/dmn-runtime/src/test/java/com/gs/dmn/runtime/DoubleMixedJavaTimeDMNBaseDecisionTest.java b/dmn-runtime/src/test/java/com/gs/dmn/runtime/DoubleMixedJavaTimeDMNBaseDecisionTest.java index 0a151a285..0d7436c43 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/runtime/DoubleMixedJavaTimeDMNBaseDecisionTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/runtime/DoubleMixedJavaTimeDMNBaseDecisionTest.java @@ -14,9 +14,9 @@ import com.gs.dmn.runtime.annotation.DRGElement; import com.gs.dmn.runtime.annotation.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class DoubleMixedJavaTimeDMNBaseDecisionTest { private final DoubleMixedJavaTimeDMNBaseDecision baseDecision = new DoubleMixedJavaTimeDMNBaseDecision(); diff --git a/dmn-runtime/src/test/java/com/gs/dmn/runtime/MixedJavaTimeDMNBaseDecisionTest.java b/dmn-runtime/src/test/java/com/gs/dmn/runtime/MixedJavaTimeDMNBaseDecisionTest.java index fb22ad3a1..bf3ceb3cb 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/runtime/MixedJavaTimeDMNBaseDecisionTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/runtime/MixedJavaTimeDMNBaseDecisionTest.java @@ -14,9 +14,9 @@ import com.gs.dmn.runtime.annotation.DRGElement; import com.gs.dmn.runtime.annotation.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class MixedJavaTimeDMNBaseDecisionTest { private final MixedJavaTimeDMNBaseDecision baseDecision = new MixedJavaTimeDMNBaseDecision(); diff --git a/dmn-runtime/src/test/java/com/gs/dmn/runtime/PairComparatorTest.java b/dmn-runtime/src/test/java/com/gs/dmn/runtime/PairComparatorTest.java index 63235fe2d..ca1130634 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/runtime/PairComparatorTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/runtime/PairComparatorTest.java @@ -12,12 +12,12 @@ */ package com.gs.dmn.runtime; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class PairComparatorTest { @Test diff --git a/dmn-runtime/src/test/java/com/gs/dmn/runtime/PureJavaTimeDMNBaseDecisionTest.java b/dmn-runtime/src/test/java/com/gs/dmn/runtime/PureJavaTimeDMNBaseDecisionTest.java index 465381eda..23264c863 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/runtime/PureJavaTimeDMNBaseDecisionTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/runtime/PureJavaTimeDMNBaseDecisionTest.java @@ -14,9 +14,9 @@ import com.gs.dmn.runtime.annotation.DRGElement; import com.gs.dmn.runtime.annotation.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class PureJavaTimeDMNBaseDecisionTest { private final PureJavaTimeDMNBaseDecision baseDecision = new PureJavaTimeDMNBaseDecision(); diff --git a/dmn-runtime/src/test/java/com/gs/dmn/runtime/RuleOutputListTest.java b/dmn-runtime/src/test/java/com/gs/dmn/runtime/RuleOutputListTest.java index 610826c5b..a08c819b9 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/runtime/RuleOutputListTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/runtime/RuleOutputListTest.java @@ -13,13 +13,13 @@ package com.gs.dmn.runtime; import com.gs.dmn.runtime.annotation.HitPolicy; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class RuleOutputListTest { public static final DefaultSimpleOutput STRING_1 = new DefaultSimpleOutput("value1", 2); diff --git a/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/AnnotationSetTest.java b/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/AnnotationSetTest.java index ee2627522..550260e1d 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/AnnotationSetTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/AnnotationSetTest.java @@ -12,9 +12,9 @@ */ package com.gs.dmn.runtime.annotation; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class AnnotationSetTest { @Test diff --git a/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/AnnotationTest.java b/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/AnnotationTest.java index fd9b6747a..31d90af91 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/AnnotationTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/AnnotationTest.java @@ -12,10 +12,10 @@ */ package com.gs.dmn.runtime.annotation; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class AnnotationTest { private final Annotation annotation = new Annotation("Decision Name", 0, "text"); diff --git a/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/DRGElementKindTest.java b/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/DRGElementKindTest.java index 6a39eb4c7..320be648f 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/DRGElementKindTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/DRGElementKindTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.runtime.annotation; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DRGElementKindTest { @Test diff --git a/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/ExpressionKindTest.java b/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/ExpressionKindTest.java index c8a6f4513..0bb7512db 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/ExpressionKindTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/ExpressionKindTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.runtime.annotation; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ExpressionKindTest { diff --git a/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/HitPolicyTest.java b/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/HitPolicyTest.java index 9c21aee08..8204be424 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/HitPolicyTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/runtime/annotation/HitPolicyTest.java @@ -12,9 +12,9 @@ */ package com.gs.dmn.runtime.annotation; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HitPolicyTest { @Test diff --git a/dmn-runtime/src/test/java/com/gs/dmn/runtime/discovery/DecisionDiscoveryTest.java b/dmn-runtime/src/test/java/com/gs/dmn/runtime/discovery/DecisionDiscoveryTest.java index 93ea76bad..6676cc68c 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/runtime/discovery/DecisionDiscoveryTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/runtime/discovery/DecisionDiscoveryTest.java @@ -12,11 +12,11 @@ */ package com.gs.dmn.runtime.discovery; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Set; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DecisionDiscoveryTest { private final DecisionDiscovery decisionDiscovery = new DecisionDiscovery(); diff --git a/dmn-runtime/src/test/java/com/gs/dmn/runtime/listener/ArgumentsTest.java b/dmn-runtime/src/test/java/com/gs/dmn/runtime/listener/ArgumentsTest.java index bb5316434..325c9ed3e 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/runtime/listener/ArgumentsTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/runtime/listener/ArgumentsTest.java @@ -12,9 +12,9 @@ */ package com.gs.dmn.runtime.listener; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ArgumentsTest { diff --git a/dmn-runtime/src/test/java/com/gs/dmn/runtime/listener/CompositeListenerTest.java b/dmn-runtime/src/test/java/com/gs/dmn/runtime/listener/CompositeListenerTest.java index 032b0f563..94a00c728 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/runtime/listener/CompositeListenerTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/runtime/listener/CompositeListenerTest.java @@ -12,9 +12,9 @@ */ package com.gs.dmn.runtime.listener; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertTrue; public class CompositeListenerTest { private EventListener listener = new CompositeListener(); diff --git a/dmn-runtime/src/test/java/com/gs/dmn/runtime/metadata/MetadataValidatorTest.java b/dmn-runtime/src/test/java/com/gs/dmn/runtime/metadata/MetadataValidatorTest.java index e04785466..d1ec5599a 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/runtime/metadata/MetadataValidatorTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/runtime/metadata/MetadataValidatorTest.java @@ -12,15 +12,15 @@ */ package com.gs.dmn.runtime.metadata; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MetadataValidatorTest { private final MetadataValidator validator = new MetadataValidator(); @Test public void testMetadata() { - assertEquals("Invalid metadata", false, validator.validate("com.gs.dmn.runtime.metadata", this.getClass().getClassLoader())); + assertEquals(false, validator.validate("com.gs.dmn.runtime.metadata", this.getClass().getClassLoader()), "Invalid metadata"); } } diff --git a/dmn-runtime/src/test/java/com/gs/dmn/serialization/AbstractJsonSerializerTest.java b/dmn-runtime/src/test/java/com/gs/dmn/serialization/AbstractJsonSerializerTest.java index 87a27be6b..8d53d19ce 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/serialization/AbstractJsonSerializerTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/serialization/AbstractJsonSerializerTest.java @@ -16,13 +16,13 @@ import com.gs.dmn.runtime.Assert; import com.gs.dmn.runtime.DMNRuntimeException; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; import static com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public abstract class AbstractJsonSerializerTest { private final FEELLib lib = makeFEELLib(); @@ -138,7 +138,7 @@ public void testDuration() throws Exception { } private void checkSerialization(String literal, String expectedSerialization, String actualSerialization) { - assertEquals(literal, expectedSerialization, actualSerialization); + assertEquals(expectedSerialization, actualSerialization, literal); } protected abstract FEELLib makeFEELLib(); diff --git a/dmn-runtime/src/test/java/com/gs/dmn/serialization/DefaultSignavioJsonSerializerTest.java b/dmn-runtime/src/test/java/com/gs/dmn/serialization/DefaultSignavioJsonSerializerTest.java index 1df00ebee..cc44a323b 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/serialization/DefaultSignavioJsonSerializerTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/serialization/DefaultSignavioJsonSerializerTest.java @@ -23,7 +23,7 @@ import com.gs.dmn.serialization.data.Person; import com.gs.dmn.serialization.data.PersonImpl; import com.gs.dmn.signavio.feel.lib.DefaultSignavioLib; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; @@ -40,7 +40,7 @@ import static com.gs.dmn.serialization.DefaultStandardJsonSerializerTest.DATE_TIME_TEST_DATA; import static com.gs.dmn.serialization.DefaultStandardJsonSerializerTest.TIME_TEST_DATA; import static com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class DefaultSignavioJsonSerializerTest extends AbstractJsonSerializerTest { private final DefaultSignavioLib lib = (DefaultSignavioLib) makeFEELLib(); diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/BaseFEELLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/BaseFEELLibTest.java index db6407605..6b4cc4bf0 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/BaseFEELLibTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/BaseFEELLibTest.java @@ -13,11 +13,11 @@ package com.gs.dmn.signavio.feel.lib; import com.gs.dmn.runtime.Context; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public abstract class BaseFEELLibTest extends FEELOperatorsTest { // diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/BaseSignavioLibExceptionsTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/BaseSignavioLibExceptionsTest.java index df696b087..bcbd51380 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/BaseSignavioLibExceptionsTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/BaseSignavioLibExceptionsTest.java @@ -12,9 +12,9 @@ */ package com.gs.dmn.signavio.feel.lib; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public abstract class BaseSignavioLibExceptionsTest { @Test diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/BaseSignavioLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/BaseSignavioLibTest.java index e74a52db7..0a15cc9e3 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/BaseSignavioLibTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/BaseSignavioLibTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.signavio.feel.lib; import com.gs.dmn.runtime.Context; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public abstract class BaseSignavioLibTest extends BaseFEELLibTest { @Override diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/DefaultSignavioLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/DefaultSignavioLibTest.java index 2b9b7f48f..50e21eaea 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/DefaultSignavioLibTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/DefaultSignavioLibTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.feel.lib; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; @@ -20,8 +20,8 @@ import java.time.LocalDate; import java.util.Calendar; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class DefaultSignavioLibTest extends BaseSignavioLibTest { @Override diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/DoubleMixedJavaTimeSignavioLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/DoubleMixedJavaTimeSignavioLibTest.java index 1784bfba5..b18d405cd 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/DoubleMixedJavaTimeSignavioLibTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/DoubleMixedJavaTimeSignavioLibTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.feel.lib; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import java.time.LocalDate; @@ -20,8 +20,8 @@ import java.time.ZonedDateTime; import java.util.Calendar; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class DoubleMixedJavaTimeSignavioLibTest extends BaseSignavioLibTest { @Override diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/DoubleMixedSignavioLibExceptionsTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/DoubleMixedSignavioLibExceptionsTest.java index ab39c9bf0..b13a3dd76 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/DoubleMixedSignavioLibExceptionsTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/DoubleMixedSignavioLibExceptionsTest.java @@ -30,14 +30,14 @@ import com.gs.dmn.signavio.feel.lib.type.numeric.SignavioNumberLib; import com.gs.dmn.signavio.feel.lib.type.string.SignavioStringLib; import com.gs.dmn.signavio.feel.lib.type.time.SignavioDateTimeLib; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import java.time.LocalDate; import java.time.OffsetTime; import java.time.ZonedDateTime; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class DoubleMixedSignavioLibExceptionsTest extends BaseSignavioLibExceptionsTest { @Override diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/FEELOperatorsTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/FEELOperatorsTest.java index 1b64a3e6c..2987354ad 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/FEELOperatorsTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/FEELOperatorsTest.java @@ -16,7 +16,7 @@ import com.gs.dmn.runtime.Assert; import com.gs.dmn.runtime.Context; import com.gs.dmn.runtime.Range; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; @@ -29,7 +29,7 @@ import java.util.Arrays; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public abstract class FEELOperatorsTest { protected abstract SignavioLib getLib(); diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/MixedJavaTimeSignavioLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/MixedJavaTimeSignavioLibTest.java index f195e98cc..2bed7bf2c 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/MixedJavaTimeSignavioLibTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/MixedJavaTimeSignavioLibTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.feel.lib; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import java.math.BigDecimal; @@ -21,8 +21,8 @@ import java.time.ZonedDateTime; import java.util.Calendar; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class MixedJavaTimeSignavioLibTest extends BaseSignavioLibTest { @Override diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/MixedSignavioLibExceptionsTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/MixedSignavioLibExceptionsTest.java index cfa40c6db..ee89d21a5 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/MixedSignavioLibExceptionsTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/MixedSignavioLibExceptionsTest.java @@ -31,7 +31,7 @@ import com.gs.dmn.signavio.feel.lib.type.numeric.SignavioNumberLib; import com.gs.dmn.signavio.feel.lib.type.string.SignavioStringLib; import com.gs.dmn.signavio.feel.lib.type.time.SignavioDateTimeLib; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import java.math.BigDecimal; @@ -39,7 +39,7 @@ import java.time.OffsetTime; import java.time.ZonedDateTime; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class MixedSignavioLibExceptionsTest extends BaseSignavioLibExceptionsTest { @Override diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/PureJavaTimeSignavioLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/PureJavaTimeSignavioLibTest.java index 8ac5702a5..3e3e66f18 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/PureJavaTimeSignavioLibTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/PureJavaTimeSignavioLibTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.feel.lib; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.time.LocalDate; @@ -21,8 +21,8 @@ import java.time.temporal.TemporalAmount; import java.util.Calendar; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class PureJavaTimeSignavioLibTest extends BaseSignavioLibTest { @Override diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/PureSignavioLibExceptionsTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/PureSignavioLibExceptionsTest.java index e00040022..faeb6e978 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/PureSignavioLibExceptionsTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/PureSignavioLibExceptionsTest.java @@ -31,7 +31,7 @@ import com.gs.dmn.signavio.feel.lib.type.numeric.SignavioNumberLib; import com.gs.dmn.signavio.feel.lib.type.string.SignavioStringLib; import com.gs.dmn.signavio.feel.lib.type.time.SignavioDateTimeLib; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.time.LocalDate; @@ -39,7 +39,7 @@ import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAmount; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class PureSignavioLibExceptionsTest extends BaseSignavioLibExceptionsTest { @Override diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/runtime/DefaultSignavioBaseDecisionTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/runtime/DefaultSignavioBaseDecisionTest.java index 77e09f50d..c042cbc1a 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/runtime/DefaultSignavioBaseDecisionTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/runtime/DefaultSignavioBaseDecisionTest.java @@ -14,9 +14,9 @@ import com.gs.dmn.runtime.annotation.DRGElement; import com.gs.dmn.runtime.annotation.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class DefaultSignavioBaseDecisionTest { private final DefaultSignavioBaseDecision baseDecision = new DefaultSignavioBaseDecision(); diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/runtime/MixedJavaTimeSignavioBaseDecisionTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/runtime/MixedJavaTimeSignavioBaseDecisionTest.java index de89d3742..7c0fc9fe3 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/runtime/MixedJavaTimeSignavioBaseDecisionTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/runtime/MixedJavaTimeSignavioBaseDecisionTest.java @@ -14,9 +14,9 @@ import com.gs.dmn.runtime.annotation.DRGElement; import com.gs.dmn.runtime.annotation.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class MixedJavaTimeSignavioBaseDecisionTest { private final MixedJavaTimeSignavioBaseDecision baseDecision = new MixedJavaTimeSignavioBaseDecision(); diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/runtime/PureJavaTimeSignavioBaseDecisionTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/runtime/PureJavaTimeSignavioBaseDecisionTest.java index 47de03431..5174032c1 100644 --- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/runtime/PureJavaTimeSignavioBaseDecisionTest.java +++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/runtime/PureJavaTimeSignavioBaseDecisionTest.java @@ -14,9 +14,9 @@ import com.gs.dmn.runtime.annotation.DRGElement; import com.gs.dmn.runtime.annotation.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class PureJavaTimeSignavioBaseDecisionTest { private final PureJavaTimeSignavioBaseDecision baseDecision = new PureJavaTimeSignavioBaseDecision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/AbstractHandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/AbstractHandwrittenDecisionTest.java index 39754ab31..dc20c1ef7 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/AbstractHandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/AbstractHandwrittenDecisionTest.java @@ -19,7 +19,7 @@ import com.gs.dmn.runtime.external.DefaultExternalFunctionExecutor; import com.gs.dmn.runtime.listener.NopEventListener; import com.gs.dmn.serialization.JsonSerializer; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; public abstract class AbstractHandwrittenDecisionTest { protected AnnotationSet annotationSet; @@ -35,7 +35,7 @@ protected String toJson(Object object) { protected abstract void applyDecision(); - @Before + @BeforeEach public void setUp() { this.annotationSet = new AnnotationSet(); this.context = new ExecutionContext(annotationSet, new NopEventListener(), new DefaultExternalFunctionExecutor(), new DefaultCache()); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/cd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputCompoundDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/cd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputCompoundDecisionTest.java index c2e0d3735..2ba036e54 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/cd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputCompoundDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/cd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputCompoundDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.cd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenCompoundOutputCompoundDecisionTest extends AbstractHandwrittenDecisionTest { private final CompoundOutputCompoundDecision decision = new CompoundOutputCompoundDecision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/DMNMetadataTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/DMNMetadataTest.java index ea50cfe24..9aa595998 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/DMNMetadataTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/DMNMetadataTest.java @@ -14,15 +14,15 @@ import com.gs.dmn.runtime.metadata.*; import com.gs.dmn.serialization.JsonSerializer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class DMNMetadataTest { @Test diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/HandwrittenGenerateOutputDataTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/HandwrittenGenerateOutputDataTest.java index 42faac533..5d4a73f66 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/HandwrittenGenerateOutputDataTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/HandwrittenGenerateOutputDataTest.java @@ -18,12 +18,12 @@ import com.gs.dmn.runtime.Assert; import com.gs.dmn.runtime.annotation.Annotation; import com.gs.dmn.runtime.annotation.AnnotationSet; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenGenerateOutputDataTest extends AbstractHandwrittenDecisionTest { private final GenerateOutputData decision = new GenerateOutputData(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/PostorderTraceListenerTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/PostorderTraceListenerTest.java index 0bb330843..03a32250e 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/PostorderTraceListenerTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/PostorderTraceListenerTest.java @@ -21,7 +21,7 @@ import com.gs.dmn.runtime.external.DefaultExternalFunctionExecutor; import com.gs.dmn.runtime.listener.PostorderTraceEventListener; import com.gs.dmn.runtime.listener.node.DRGElementNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.math.BigDecimal; diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/TreeTraceListenerTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/TreeTraceListenerTest.java index c3b75b41c..75c33e30d 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/TreeTraceListenerTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/TreeTraceListenerTest.java @@ -21,7 +21,7 @@ import com.gs.dmn.runtime.external.DefaultExternalFunctionExecutor; import com.gs.dmn.runtime.listener.TreeTraceEventListener; import com.gs.dmn.runtime.listener.node.DRGElementNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.math.BigDecimal; diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/DMNMetadataTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/DMNMetadataTest.java index 46d27406e..ed32c4f5d 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/DMNMetadataTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/DMNMetadataTest.java @@ -14,15 +14,15 @@ import com.gs.dmn.runtime.metadata.*; import com.gs.dmn.serialization.JsonSerializer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class DMNMetadataTest { @Test diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/HandwrittenGenerateOutputDataTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/HandwrittenGenerateOutputDataTest.java index a5e963ba5..6b129bd8e 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/HandwrittenGenerateOutputDataTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/HandwrittenGenerateOutputDataTest.java @@ -16,7 +16,7 @@ import com.gs.dmn.generated.example_credit_decision_mixed.type.Applicant; import com.gs.dmn.generated.example_credit_decision_mixed.type.ApplicantImpl; import com.gs.dmn.runtime.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.List; diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/JsonSerializerTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/JsonSerializerTest.java index 1a82474d7..472248feb 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/JsonSerializerTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/JsonSerializerTest.java @@ -15,14 +15,14 @@ import com.gs.dmn.generated.example_credit_decision_mixed.type.Applicant; import com.gs.dmn.generated.example_credit_decision_mixed.type.ApplicantImpl; import com.gs.dmn.serialization.JsonSerializer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.StringWriter; import java.io.Writer; import java.util.Arrays; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class JsonSerializerTest { private final GenerateOutputData decision = new GenerateOutputData(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/ConversionForComplexTypesTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/ConversionForComplexTypesTest.java index 47ad3eee6..c5db5ae99 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/ConversionForComplexTypesTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/ConversionForComplexTypesTest.java @@ -15,12 +15,12 @@ import com.gs.dmn.generated.example_credit_decision_mixed_proto.proto.GenerateOutputDataRequest; import com.gs.dmn.generated.example_credit_decision_mixed_proto.type.Applicant; import com.gs.dmn.generated.example_credit_decision_mixed_proto.type.ApplicantImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class ConversionForComplexTypesTest { @Test @@ -33,7 +33,7 @@ public void testDefaultValues() { @Test public void testConvertMethodsWhenNull() { com.gs.dmn.generated.example_credit_decision_mixed_proto.proto.Applicant protoApplicant = Applicant.toProto((Applicant) null); - assertNotNull(null, protoApplicant); + assertNotNull(protoApplicant); assertEquals(0, protoApplicant.getAge(), 0.0001); } diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/HandwrittenGenerateOutputDataTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/HandwrittenGenerateOutputDataTest.java index 8352d0dd7..830bcd069 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/HandwrittenGenerateOutputDataTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/HandwrittenGenerateOutputDataTest.java @@ -16,7 +16,7 @@ import com.gs.dmn.generated.example_credit_decision_mixed_proto.proto.GenerateOutputDataResponse; import com.gs.dmn.runtime.Assert; import com.gs.dmn.runtime.ExecutionContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_tree/HandwrittenGenerateOutputDataTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_tree/HandwrittenGenerateOutputDataTest.java index 9f964b386..4d7d40185 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_tree/HandwrittenGenerateOutputDataTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_tree/HandwrittenGenerateOutputDataTest.java @@ -17,12 +17,12 @@ import com.gs.dmn.generated.example_credit_decision_mixed_tree.type.ApplicantImpl; import com.gs.dmn.runtime.Assert; import com.gs.dmn.runtime.annotation.Annotation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenGenerateOutputDataTest extends AbstractHandwrittenDecisionTest { private final GenerateOutputData decision = new GenerateOutputData(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/npe_validation_2/HandwrittenZipTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/npe_validation_2/HandwrittenZipTest.java index 8510610e2..379f45b05 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/npe_validation_2/HandwrittenZipTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/npe_validation_2/HandwrittenZipTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.npe_validation_2; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenZipTest extends AbstractHandwrittenDecisionTest { private final Zip decision = new Zip(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/null_safe_tests/HandwrittenAllTogetherTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/null_safe_tests/HandwrittenAllTogetherTest.java index f1a8ac9b9..2dee8f50f 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/null_safe_tests/HandwrittenAllTogetherTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/null_safe_tests/HandwrittenAllTogetherTest.java @@ -13,14 +13,14 @@ package com.gs.dmn.generated.null_safe_tests; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class HandwrittenAllTogetherTest extends AbstractHandwrittenDecisionTest { private final AllTogether decision = new AllTogether(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_boolean_literal_expression/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_boolean_literal_expression/HandwrittenDecisionTest.java index b435f6faa..0c9f74ffb 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_boolean_literal_expression/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_boolean_literal_expression/HandwrittenDecisionTest.java @@ -13,13 +13,13 @@ package com.gs.dmn.generated.sd_feel_boolean_literal_expression; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_complex_literal_expression/HandwrittenMonthlyTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_complex_literal_expression/HandwrittenMonthlyTest.java index 336c43b53..efb6477bd 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_complex_literal_expression/HandwrittenMonthlyTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_complex_literal_expression/HandwrittenMonthlyTest.java @@ -14,15 +14,15 @@ import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; import com.gs.dmn.generated.sd_feel_complex_literal_expression.type.LoanImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.math.MathContext; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class HandwrittenMonthlyTest extends AbstractHandwrittenDecisionTest { private final Monthly decision = new Monthly(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_date_literal_expression/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_date_literal_expression/HandwrittenDecisionTest.java index 2e8cb9ad9..201105b2f 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_date_literal_expression/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_date_literal_expression/HandwrittenDecisionTest.java @@ -13,13 +13,14 @@ package com.gs.dmn.generated.sd_feel_date_literal_expression; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); @@ -30,10 +31,12 @@ public void testApply() throws Exception { assertEquals("29", output.toString()); } - @Test(expected = NullPointerException.class) + @Test public void testApplyWhenNull() { - BigDecimal output = applyDecision(null, null, null, null, null); - assertEquals(29, output.intValue()); + Assertions.assertThrows(NullPointerException.class, () -> { + BigDecimal output = applyDecision(null, null, null, null, null); + assertEquals(29, output.intValue()); + }); } @Override diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_string_literal_expression/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_string_literal_expression/HandwrittenDecisionTest.java index 5b2cf528a..cb43acf48 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_string_literal_expression/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_feel_string_literal_expression/HandwrittenDecisionTest.java @@ -13,13 +13,13 @@ package com.gs.dmn.generated.sd_feel_string_literal_expression; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_output_order_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_output_order_hit_policy/HandwrittenDecisionTest.java index 927b4aa6f..abd2f960a 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_output_order_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_output_order_hit_policy/HandwrittenDecisionTest.java @@ -13,14 +13,14 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_compound_output_output_order_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_priority_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_priority_hit_policy/HandwrittenDecisionTest.java index c77cdcd4d..77886f45e 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_priority_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_priority_hit_policy/HandwrittenDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_compound_output_priority_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java index 5c65970f0..d1186dc03 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_feel_input_entries_single_output_first_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_unique_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_unique_hit_policy/HandwrittenDecisionTest.java index d36c4fd50..ec9e87f6f 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_unique_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_unique_hit_policy/HandwrittenDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_feel_input_entries_single_output_unique_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputDecisionTest.java index aac7c6d9f..c8d60d8c5 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenCompoundOutputDecisionTest extends AbstractHandwrittenDecisionTest { private final CompoundOutputDecision decision = new CompoundOutputDecision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java index 8874f4e1c..fbbb6dfea 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_sfeel_input_entries_single_output_first_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_count_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_count_hit_policy/HandwrittenDecisionTest.java index 57f62f105..55af77dde 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_count_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_count_hit_policy/HandwrittenDecisionTest.java @@ -13,13 +13,13 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_single_output_collect_count_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_hit_policy/HandwrittenDecisionTest.java index 579259a99..6260ac169 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_hit_policy/HandwrittenDecisionTest.java @@ -13,13 +13,13 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_single_output_collect_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_min_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_min_hit_policy/HandwrittenDecisionTest.java index 615ab8b34..23dbd59e5 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_min_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_min_hit_policy/HandwrittenDecisionTest.java @@ -13,13 +13,13 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_single_output_collect_min_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_sum_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_sum_hit_policy/HandwrittenDecisionTest.java index cf6691203..2042521b5 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_sum_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_sum_hit_policy/HandwrittenDecisionTest.java @@ -13,13 +13,13 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_single_output_collect_sum_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_priority_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_priority_hit_policy/HandwrittenDecisionTest.java index c6e652912..379919824 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_priority_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_priority_hit_policy/HandwrittenDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_single_output_priority_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_with_external_function/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_with_external_function/HandwrittenDecisionTest.java index ae61d4908..105900a9e 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_with_external_function/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_with_external_function/HandwrittenDecisionTest.java @@ -13,14 +13,14 @@ package com.gs.dmn.generated.sd_with_external_function; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_with_user_function/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_with_user_function/HandwrittenDecisionTest.java index 9fdc9c017..e42e5d78c 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_with_user_function/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/sd_with_user_function/HandwrittenDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.sd_with_user_function; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/type_interface_deserialization/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/type_interface_deserialization/HandwrittenDecisionTest.java index 36506fc9a..c2882ed09 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/type_interface_deserialization/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/generated/type_interface_deserialization/HandwrittenDecisionTest.java @@ -1,16 +1,18 @@ package com.gs.dmn.generated.type_interface_deserialization; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Assert; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final EsmaEquityOptionIndicator decision = new EsmaEquityOptionIndicator(); - @org.junit.Test + @Test public void testDeserializedDecisionInput() { com.gs.dmn.generated.type_interface_deserialization.type.MarginEquityOptionTradableProfiles marginEquityOptionTradableProfiles = new com.gs.dmn.generated.type_interface_deserialization.type.MarginEquityOptionTradableProfilesImpl(decision.asList(new com.gs.dmn.generated.type_interface_deserialization.type.MarginEquityOptionTradableProfileImpl(Boolean.TRUE, "abc"))); @@ -19,7 +21,7 @@ public void testDeserializedDecisionInput() { checkValues("Yes", esmaEquityOptionIndicator); } - @org.junit.Test + @Test public void testSerializedDecisionInput() throws Exception { com.gs.dmn.generated.type_interface_deserialization.type.MarginEquityOptionTradableProfiles marginEquityOptionTradableProfiles = new com.gs.dmn.generated.type_interface_deserialization.type.MarginEquityOptionTradableProfilesImpl(decision.asList(new com.gs.dmn.generated.type_interface_deserialization.type.MarginEquityOptionTradableProfileImpl(Boolean.TRUE, "abc"))); String serializedInput = com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.writeValueAsString(marginEquityOptionTradableProfiles); @@ -44,6 +46,6 @@ private String applyDecision(String marginEquityOptionTradableProfiles) { } private void checkValues(Object expected, Object actual) { - Assert.assertEquals(expected == null ? null : expected.toString(), actual == null ? null : actual.toString()); + assertEquals(expected == null ? null : expected.toString(), actual == null ? null : actual.toString()); } } diff --git a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/runtime/metadata/MetadataValidatorTest.java b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/runtime/metadata/MetadataValidatorTest.java index 16541041c..d6e3ef8ff 100644 --- a/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/runtime/metadata/MetadataValidatorTest.java +++ b/dmn-signavio-it/dmn-signavio-it-kotlin-translator/src/test/java/com/gs/dmn/runtime/metadata/MetadataValidatorTest.java @@ -12,15 +12,15 @@ */ package com.gs.dmn.runtime.metadata; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MetadataValidatorTest { private final MetadataValidator validator = new MetadataValidator(); @Test public void testMetadata() { - assertEquals("Invalid metadata", true, validator.validate("com.gs.dmn.generated.example_credit_decision", this.getClass().getClassLoader())); + assertTrue(validator.validate("com.gs.dmn.generated.example_credit_decision", this.getClass().getClassLoader()), "Invalid metadata"); } } diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/AbstractHandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/AbstractHandwrittenDecisionTest.java index 39754ab31..dc20c1ef7 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/AbstractHandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/AbstractHandwrittenDecisionTest.java @@ -19,7 +19,7 @@ import com.gs.dmn.runtime.external.DefaultExternalFunctionExecutor; import com.gs.dmn.runtime.listener.NopEventListener; import com.gs.dmn.serialization.JsonSerializer; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; public abstract class AbstractHandwrittenDecisionTest { protected AnnotationSet annotationSet; @@ -35,7 +35,7 @@ protected String toJson(Object object) { protected abstract void applyDecision(); - @Before + @BeforeEach public void setUp() { this.annotationSet = new AnnotationSet(); this.context = new ExecutionContext(annotationSet, new NopEventListener(), new DefaultExternalFunctionExecutor(), new DefaultCache()); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/cd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputCompoundDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/cd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputCompoundDecisionTest.java index c2e0d3735..2ba036e54 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/cd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputCompoundDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/cd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputCompoundDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.cd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenCompoundOutputCompoundDecisionTest extends AbstractHandwrittenDecisionTest { private final CompoundOutputCompoundDecision decision = new CompoundOutputCompoundDecision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/DMNMetadataTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/DMNMetadataTest.java index ea50cfe24..9aa595998 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/DMNMetadataTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/DMNMetadataTest.java @@ -14,15 +14,15 @@ import com.gs.dmn.runtime.metadata.*; import com.gs.dmn.serialization.JsonSerializer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class DMNMetadataTest { @Test diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/HandwrittenGenerateOutputDataTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/HandwrittenGenerateOutputDataTest.java index 42faac533..5d4a73f66 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/HandwrittenGenerateOutputDataTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/HandwrittenGenerateOutputDataTest.java @@ -18,12 +18,12 @@ import com.gs.dmn.runtime.Assert; import com.gs.dmn.runtime.annotation.Annotation; import com.gs.dmn.runtime.annotation.AnnotationSet; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenGenerateOutputDataTest extends AbstractHandwrittenDecisionTest { private final GenerateOutputData decision = new GenerateOutputData(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/PostorderTraceListenerTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/PostorderTraceListenerTest.java index 0bb330843..03a32250e 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/PostorderTraceListenerTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/PostorderTraceListenerTest.java @@ -21,7 +21,7 @@ import com.gs.dmn.runtime.external.DefaultExternalFunctionExecutor; import com.gs.dmn.runtime.listener.PostorderTraceEventListener; import com.gs.dmn.runtime.listener.node.DRGElementNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.math.BigDecimal; diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/TreeTraceListenerTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/TreeTraceListenerTest.java index c3b75b41c..75c33e30d 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/TreeTraceListenerTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision/TreeTraceListenerTest.java @@ -21,7 +21,7 @@ import com.gs.dmn.runtime.external.DefaultExternalFunctionExecutor; import com.gs.dmn.runtime.listener.TreeTraceEventListener; import com.gs.dmn.runtime.listener.node.DRGElementNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.math.BigDecimal; diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/DMNMetadataTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/DMNMetadataTest.java index 46d27406e..ed32c4f5d 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/DMNMetadataTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/DMNMetadataTest.java @@ -14,15 +14,15 @@ import com.gs.dmn.runtime.metadata.*; import com.gs.dmn.serialization.JsonSerializer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class DMNMetadataTest { @Test diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/HandwrittenGenerateOutputDataTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/HandwrittenGenerateOutputDataTest.java index a5e963ba5..6b129bd8e 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/HandwrittenGenerateOutputDataTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/HandwrittenGenerateOutputDataTest.java @@ -16,7 +16,7 @@ import com.gs.dmn.generated.example_credit_decision_mixed.type.Applicant; import com.gs.dmn.generated.example_credit_decision_mixed.type.ApplicantImpl; import com.gs.dmn.runtime.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.List; diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/JsonSerializerTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/JsonSerializerTest.java index 1a82474d7..472248feb 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/JsonSerializerTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed/JsonSerializerTest.java @@ -15,14 +15,14 @@ import com.gs.dmn.generated.example_credit_decision_mixed.type.Applicant; import com.gs.dmn.generated.example_credit_decision_mixed.type.ApplicantImpl; import com.gs.dmn.serialization.JsonSerializer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.StringWriter; import java.io.Writer; import java.util.Arrays; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class JsonSerializerTest { private final GenerateOutputData decision = new GenerateOutputData(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/ConversionForComplexTypesTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/ConversionForComplexTypesTest.java index 47ad3eee6..c5db5ae99 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/ConversionForComplexTypesTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/ConversionForComplexTypesTest.java @@ -15,12 +15,12 @@ import com.gs.dmn.generated.example_credit_decision_mixed_proto.proto.GenerateOutputDataRequest; import com.gs.dmn.generated.example_credit_decision_mixed_proto.type.Applicant; import com.gs.dmn.generated.example_credit_decision_mixed_proto.type.ApplicantImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class ConversionForComplexTypesTest { @Test @@ -33,7 +33,7 @@ public void testDefaultValues() { @Test public void testConvertMethodsWhenNull() { com.gs.dmn.generated.example_credit_decision_mixed_proto.proto.Applicant protoApplicant = Applicant.toProto((Applicant) null); - assertNotNull(null, protoApplicant); + assertNotNull(protoApplicant); assertEquals(0, protoApplicant.getAge(), 0.0001); } diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/HandwrittenGenerateOutputDataTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/HandwrittenGenerateOutputDataTest.java index bdf3bb8ab..71079b4d0 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/HandwrittenGenerateOutputDataTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_proto/HandwrittenGenerateOutputDataTest.java @@ -16,7 +16,7 @@ import com.gs.dmn.generated.example_credit_decision_mixed_proto.proto.GenerateOutputDataResponse; import com.gs.dmn.runtime.Assert; import com.gs.dmn.runtime.ExecutionContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_tree/HandwrittenGenerateOutputDataTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_tree/HandwrittenGenerateOutputDataTest.java index 9f964b386..4d7d40185 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_tree/HandwrittenGenerateOutputDataTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/example_credit_decision_mixed_tree/HandwrittenGenerateOutputDataTest.java @@ -17,12 +17,12 @@ import com.gs.dmn.generated.example_credit_decision_mixed_tree.type.ApplicantImpl; import com.gs.dmn.runtime.Assert; import com.gs.dmn.runtime.annotation.Annotation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenGenerateOutputDataTest extends AbstractHandwrittenDecisionTest { private final GenerateOutputData decision = new GenerateOutputData(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/external_functions/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/external_functions/HandwrittenDecisionTest.java index 8efd68b61..7f680164c 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/external_functions/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/external_functions/HandwrittenDecisionTest.java @@ -17,9 +17,9 @@ import com.gs.dmn.generated.external_functions.type.TransactionImpl; import com.gs.dmn.generated.external_functions.type.TransactionTaxMetaData; import com.gs.dmn.generated.external_functions.type.TransactionTaxMetaDataImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final FetchForexRate decision = new FetchForexRate(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/npe_validation_2/HandwrittenZipTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/npe_validation_2/HandwrittenZipTest.java index 8510610e2..379f45b05 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/npe_validation_2/HandwrittenZipTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/npe_validation_2/HandwrittenZipTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.npe_validation_2; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenZipTest extends AbstractHandwrittenDecisionTest { private final Zip decision = new Zip(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/null_safe_tests/HandwrittenAllTogetherTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/null_safe_tests/HandwrittenAllTogetherTest.java index f1a8ac9b9..2dee8f50f 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/null_safe_tests/HandwrittenAllTogetherTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/null_safe_tests/HandwrittenAllTogetherTest.java @@ -13,14 +13,14 @@ package com.gs.dmn.generated.null_safe_tests; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class HandwrittenAllTogetherTest extends AbstractHandwrittenDecisionTest { private final AllTogether decision = new AllTogether(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_boolean_literal_expression/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_boolean_literal_expression/HandwrittenDecisionTest.java index b435f6faa..0c9f74ffb 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_boolean_literal_expression/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_boolean_literal_expression/HandwrittenDecisionTest.java @@ -13,13 +13,13 @@ package com.gs.dmn.generated.sd_feel_boolean_literal_expression; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_complex_literal_expression/HandwrittenMonthlyTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_complex_literal_expression/HandwrittenMonthlyTest.java index 336c43b53..efb6477bd 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_complex_literal_expression/HandwrittenMonthlyTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_complex_literal_expression/HandwrittenMonthlyTest.java @@ -14,15 +14,15 @@ import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; import com.gs.dmn.generated.sd_feel_complex_literal_expression.type.LoanImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.math.MathContext; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class HandwrittenMonthlyTest extends AbstractHandwrittenDecisionTest { private final Monthly decision = new Monthly(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_date_literal_expression/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_date_literal_expression/HandwrittenDecisionTest.java index 2e8cb9ad9..bc79dec8e 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_date_literal_expression/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_date_literal_expression/HandwrittenDecisionTest.java @@ -13,13 +13,14 @@ package com.gs.dmn.generated.sd_feel_date_literal_expression; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); @@ -30,10 +31,14 @@ public void testApply() throws Exception { assertEquals("29", output.toString()); } - @Test(expected = NullPointerException.class) + @Test public void testApplyWhenNull() { - BigDecimal output = applyDecision(null, null, null, null, null); - assertEquals(29, output.intValue()); + Assertions.assertThrows(NullPointerException.class, () -> { + Assertions.assertThrows(NullPointerException.class, () -> { + BigDecimal output = applyDecision(null, null, null, null, null); + assertEquals(29, output.intValue()); + }); + }); } @Override diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_string_literal_expression/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_string_literal_expression/HandwrittenDecisionTest.java index 5b2cf528a..cb43acf48 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_string_literal_expression/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_feel_string_literal_expression/HandwrittenDecisionTest.java @@ -13,13 +13,13 @@ package com.gs.dmn.generated.sd_feel_string_literal_expression; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_output_order_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_output_order_hit_policy/HandwrittenDecisionTest.java index 927b4aa6f..abd2f960a 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_output_order_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_output_order_hit_policy/HandwrittenDecisionTest.java @@ -13,14 +13,14 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_compound_output_output_order_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_priority_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_priority_hit_policy/HandwrittenDecisionTest.java index c77cdcd4d..77886f45e 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_priority_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_compound_output_priority_hit_policy/HandwrittenDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_compound_output_priority_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java index 5c65970f0..d1186dc03 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_feel_input_entries_single_output_first_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_unique_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_unique_hit_policy/HandwrittenDecisionTest.java index d36c4fd50..ec9e87f6f 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_unique_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_feel_input_entries_single_output_unique_hit_policy/HandwrittenDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_feel_input_entries_single_output_unique_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputDecisionTest.java index aac7c6d9f..c8d60d8c5 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy/HandwrittenCompoundOutputDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_sfeel_input_entries_compound_output_first_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenCompoundOutputDecisionTest extends AbstractHandwrittenDecisionTest { private final CompoundOutputDecision decision = new CompoundOutputDecision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java index 8874f4e1c..fbbb6dfea 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_sfeel_input_entries_single_output_first_hit_policy/HandwrittenDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_sfeel_input_entries_single_output_first_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_count_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_count_hit_policy/HandwrittenDecisionTest.java index 57f62f105..55af77dde 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_count_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_count_hit_policy/HandwrittenDecisionTest.java @@ -13,13 +13,13 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_single_output_collect_count_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_hit_policy/HandwrittenDecisionTest.java index 579259a99..6260ac169 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_hit_policy/HandwrittenDecisionTest.java @@ -13,13 +13,13 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_single_output_collect_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_min_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_min_hit_policy/HandwrittenDecisionTest.java index 615ab8b34..23dbd59e5 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_min_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_min_hit_policy/HandwrittenDecisionTest.java @@ -13,13 +13,13 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_single_output_collect_min_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_sum_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_sum_hit_policy/HandwrittenDecisionTest.java index cf6691203..2042521b5 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_sum_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_collect_sum_hit_policy/HandwrittenDecisionTest.java @@ -13,13 +13,13 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_single_output_collect_sum_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_priority_hit_policy/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_priority_hit_policy/HandwrittenDecisionTest.java index c6e652912..379919824 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_priority_hit_policy/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_primitive_type_inputs_single_output_priority_hit_policy/HandwrittenDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.sd_primitive_type_inputs_single_output_priority_hit_policy; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_with_external_function/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_with_external_function/HandwrittenDecisionTest.java index ae61d4908..105900a9e 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_with_external_function/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_with_external_function/HandwrittenDecisionTest.java @@ -13,14 +13,14 @@ package com.gs.dmn.generated.sd_with_external_function; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_with_user_function/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_with_user_function/HandwrittenDecisionTest.java index 9fdc9c017..e42e5d78c 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_with_user_function/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/sd_with_user_function/HandwrittenDecisionTest.java @@ -13,12 +13,12 @@ package com.gs.dmn.generated.sd_with_user_function; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final Decision decision = new Decision(); diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/type_interface_deserialization/HandwrittenDecisionTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/type_interface_deserialization/HandwrittenDecisionTest.java index 36506fc9a..ec3cb6bb2 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/type_interface_deserialization/HandwrittenDecisionTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/generated/type_interface_deserialization/HandwrittenDecisionTest.java @@ -1,7 +1,8 @@ package com.gs.dmn.generated.type_interface_deserialization; import com.gs.dmn.generated.AbstractHandwrittenDecisionTest; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.LinkedHashMap; import java.util.Map; @@ -10,7 +11,7 @@ public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final EsmaEquityOptionIndicator decision = new EsmaEquityOptionIndicator(); - @org.junit.Test + @Test public void testDeserializedDecisionInput() { com.gs.dmn.generated.type_interface_deserialization.type.MarginEquityOptionTradableProfiles marginEquityOptionTradableProfiles = new com.gs.dmn.generated.type_interface_deserialization.type.MarginEquityOptionTradableProfilesImpl(decision.asList(new com.gs.dmn.generated.type_interface_deserialization.type.MarginEquityOptionTradableProfileImpl(Boolean.TRUE, "abc"))); @@ -19,7 +20,7 @@ public void testDeserializedDecisionInput() { checkValues("Yes", esmaEquityOptionIndicator); } - @org.junit.Test + @Test public void testSerializedDecisionInput() throws Exception { com.gs.dmn.generated.type_interface_deserialization.type.MarginEquityOptionTradableProfiles marginEquityOptionTradableProfiles = new com.gs.dmn.generated.type_interface_deserialization.type.MarginEquityOptionTradableProfilesImpl(decision.asList(new com.gs.dmn.generated.type_interface_deserialization.type.MarginEquityOptionTradableProfileImpl(Boolean.TRUE, "abc"))); String serializedInput = com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.writeValueAsString(marginEquityOptionTradableProfiles); @@ -44,6 +45,6 @@ private String applyDecision(String marginEquityOptionTradableProfiles) { } private void checkValues(Object expected, Object actual) { - Assert.assertEquals(expected == null ? null : expected.toString(), actual == null ? null : actual.toString()); + Assertions.assertEquals(expected == null ? null : expected.toString(), actual == null ? null : actual.toString()); } } diff --git a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/runtime/metadata/MetadataValidatorTest.java b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/runtime/metadata/MetadataValidatorTest.java index 16541041c..d6e3ef8ff 100644 --- a/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/runtime/metadata/MetadataValidatorTest.java +++ b/dmn-signavio-it/dmn-signavio-it-translator/src/test/java/com/gs/dmn/runtime/metadata/MetadataValidatorTest.java @@ -12,15 +12,15 @@ */ package com.gs.dmn.runtime.metadata; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MetadataValidatorTest { private final MetadataValidator validator = new MetadataValidator(); @Test public void testMetadata() { - assertEquals("Invalid metadata", true, validator.validate("com.gs.dmn.generated.example_credit_decision", this.getClass().getClassLoader())); + assertTrue(validator.validate("com.gs.dmn.generated.example_credit_decision", this.getClass().getClassLoader()), "Invalid metadata"); } } diff --git a/dmn-signavio/pom.xml b/dmn-signavio/pom.xml index 0d241cce2..ddfe31c06 100644 --- a/dmn-signavio/pom.xml +++ b/dmn-signavio/pom.xml @@ -60,6 +60,12 @@ ${jdom.version} test + + org.junit.jupiter + junit-jupiter + 5.10.1 + test + org.skyscreamer diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/AbstractSignavioFEELProcessorTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/AbstractSignavioFEELProcessorTest.java index bbbbd7646..8077212ee 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/AbstractSignavioFEELProcessorTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/AbstractSignavioFEELProcessorTest.java @@ -19,7 +19,7 @@ import com.gs.dmn.signavio.SignavioDMNModelRepository; import com.gs.dmn.signavio.feel.lib.SignavioLib; import com.gs.dmn.signavio.testlab.TestLab; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/MixedSignavioFEELProcessorTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/MixedSignavioFEELProcessorTest.java index a2e84418a..e22e1af67 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/MixedSignavioFEELProcessorTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/MixedSignavioFEELProcessorTest.java @@ -16,7 +16,7 @@ import com.gs.dmn.feel.EnvironmentEntry; import com.gs.dmn.signavio.dialect.MixedJavaTimeSignavioDMNDialectDefinition; import com.gs.dmn.signavio.testlab.TestLab; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.xml.datatype.Duration; import java.math.BigDecimal; diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/semantics/analysis/NamedSignavioBuiltinFunctionsResolutionTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/semantics/analysis/NamedSignavioBuiltinFunctionsResolutionTest.java index 3da4bd923..4893d6d1a 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/semantics/analysis/NamedSignavioBuiltinFunctionsResolutionTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/semantics/analysis/NamedSignavioBuiltinFunctionsResolutionTest.java @@ -1,6 +1,6 @@ package com.gs.dmn.signavio.feel.semantics.analysis; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class NamedSignavioBuiltinFunctionsResolutionTest extends AbstractSignavioBuiltinFunctionsResolutionTest { @Test diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/semantics/analysis/PositionalSignavioBuiltinFunctionsResolutionTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/semantics/analysis/PositionalSignavioBuiltinFunctionsResolutionTest.java index 8912d32e3..e93bc94b4 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/semantics/analysis/PositionalSignavioBuiltinFunctionsResolutionTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/feel/semantics/analysis/PositionalSignavioBuiltinFunctionsResolutionTest.java @@ -1,6 +1,6 @@ package com.gs.dmn.signavio.feel.semantics.analysis; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PositionalSignavioBuiltinFunctionsResolutionTest extends AbstractSignavioBuiltinFunctionsResolutionTest { @Test diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/AbstractRDFToDMNTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/AbstractRDFToDMNTransformerTest.java index c1e2b409e..df0b25e98 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/AbstractRDFToDMNTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/AbstractRDFToDMNTransformerTest.java @@ -37,7 +37,7 @@ import static com.gs.dmn.signavio.rdf2dmn.RDFToDMNTransformer.RDF_FILE_EXTENSION; import static com.gs.dmn.signavio.rdf2dmn.RDFToDMNTransformer.isRDFFile; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public abstract class AbstractRDFToDMNTransformerTest extends AbstractSignavioFileTransformerTest { private static final BuildLogger LOGGER = new Slf4jBuildLogger(LoggerFactory.getLogger(AbstractRDFToDMNTransformerTest.class)); @@ -62,7 +62,7 @@ protected void doTest(String diagramName) throws Exception { private void doTestFolder(String inputPath, String outputPath, String expectedPath) throws Exception { File inputFolder = new File(resource(inputPath)); File[] files = inputFolder.listFiles(); - assertNotNull("Not empty folder", files); + assertNotNull(files, "Not empty folder"); for (File child : files) { if (isRDFFile(child)) { String fileName = child.getName(); diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/ComplexDecisionRDFToDMNTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/ComplexDecisionRDFToDMNTransformerTest.java index aeb564d7b..8d3271285 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/ComplexDecisionRDFToDMNTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/ComplexDecisionRDFToDMNTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.rdf2dmn; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/DecisionTableRDFToDMNTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/DecisionTableRDFToDMNTransformerTest.java index fa10b0191..16252d414 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/DecisionTableRDFToDMNTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/DecisionTableRDFToDMNTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.rdf2dmn; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/LiteralExpressionRDFToDMNTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/LiteralExpressionRDFToDMNTransformerTest.java index 2a218af16..c8912587e 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/LiteralExpressionRDFToDMNTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/LiteralExpressionRDFToDMNTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.rdf2dmn; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/MethodsRDF2DMNTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/MethodsRDF2DMNTransformerTest.java index e6e6f96ff..243da57f8 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/MethodsRDF2DMNTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/rdf2dmn/MethodsRDF2DMNTransformerTest.java @@ -15,11 +15,11 @@ import com.gs.dmn.AbstractTest; import com.gs.dmn.signavio.SignavioTestConstants; import com.gs.dmn.transformation.InputParameters; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class MethodsRDF2DMNTransformerTest extends AbstractTest { private final RDFToDMNTransformer transformer = new RDFToDMNTransformer(new InputParameters(makeInputParametersMap()), null); diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/runtime/interpreter/AbstractSignavioDMNInterpreterTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/runtime/interpreter/AbstractSignavioDMNInterpreterTest.java index b7caa5303..55126f62f 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/runtime/interpreter/AbstractSignavioDMNInterpreterTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/runtime/interpreter/AbstractSignavioDMNInterpreterTest.java @@ -41,7 +41,7 @@ import java.util.Map; import static com.gs.dmn.signavio.SignavioTestConstants.SIG_EXT_NAMESPACE; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public abstract class AbstractSignavioDMNInterpreterTest extends AbstractTest { private static final BuildLogger LOGGER = new Slf4jBuildLogger(LoggerFactory.getLogger(AbstractSignavioDMNInterpreterTest.class)); @@ -67,7 +67,7 @@ protected void doTest(String decisionName, String diagramName, Map { + doTest("simple-decision-with-bkm.dmn"); + }); } @Test diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/serialization/xstream/SignavioDMN12ToLatestDialectTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/serialization/xstream/SignavioDMN12ToLatestDialectTransformerTest.java index 4c983da03..f8d6a12a8 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/serialization/xstream/SignavioDMN12ToLatestDialectTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/serialization/xstream/SignavioDMN12ToLatestDialectTransformerTest.java @@ -17,7 +17,8 @@ import com.gs.dmn.serialization.xstream.DMN12ToLatestDialectTransformerTest; import com.gs.dmn.serialization.xstream.DMNMarshallerFactory; import com.gs.dmn.signavio.SignavioTestConstants; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Collections; @@ -28,9 +29,11 @@ public void testTransform() throws Exception { doTest("Example credit decision.dmn"); } - @Test(expected = DMNRuntimeException.class) + @Test public void testTransformWithBKM() throws Exception { - doTest("simple-decision-with-bkm.dmn"); + Assertions.assertThrows(DMNRuntimeException.class, () -> { + doTest("simple-decision-with-bkm.dmn"); + }); } @Test diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/serialization/xstream/SignavioDMN13ToLatestDialectTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/serialization/xstream/SignavioDMN13ToLatestDialectTransformerTest.java index 9dd0daf94..b6ebc8263 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/serialization/xstream/SignavioDMN13ToLatestDialectTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/serialization/xstream/SignavioDMN13ToLatestDialectTransformerTest.java @@ -17,7 +17,8 @@ import com.gs.dmn.serialization.xstream.DMN13ToLatestDialectTransformerTest; import com.gs.dmn.serialization.xstream.DMNMarshallerFactory; import com.gs.dmn.signavio.SignavioTestConstants; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Collections; @@ -28,9 +29,11 @@ public void testTransform() throws Exception { doTest("Example credit decision.dmn"); } - @Test(expected = DMNRuntimeException.class) + @Test public void testTransformWithBKM() throws Exception { - doTest("simple-decision-with-bkm.dmn"); + Assertions.assertThrows(DMNRuntimeException.class, () -> { + doTest("simple-decision-with-bkm.dmn"); + }); } @Test diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/ExportedTestLabToJavaJUnitTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/ExportedTestLabToJavaJUnitTransformerTest.java index b44415e5c..7743a291d 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/ExportedTestLabToJavaJUnitTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/ExportedTestLabToJavaJUnitTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.testlab; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ExportedTestLabToJavaJUnitTransformerTest extends AbstractTestLabToJavaJUnitTransformerTest { @Override diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/FromRDFTestLabToJavaJUnitTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/FromRDFTestLabToJavaJUnitTransformerTest.java index f980c2c3d..99865c428 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/FromRDFTestLabToJavaJUnitTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/FromRDFTestLabToJavaJUnitTransformerTest.java @@ -12,9 +12,7 @@ */ package com.gs.dmn.signavio.testlab; -import org.junit.Test; - -import java.net.URI; +import org.junit.jupiter.api.Test; public class FromRDFTestLabToJavaJUnitTransformerTest extends AbstractTestLabToJavaJUnitTransformerTest { @Override diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabSerializerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabSerializerTest.java index 553b2e4db..3c7614c3f 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabSerializerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabSerializerTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.signavio.testlab; import com.gs.dmn.AbstractTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.net.URI; @@ -21,8 +21,8 @@ import java.util.List; import java.util.stream.Collectors; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TestLabSerializerTest extends AbstractTest { private final TestLabSerializer serializer = new TestLabSerializer(); diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabToJavaProtoTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabToJavaProtoTransformerTest.java index 7e8fc3f68..9541a1eb9 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabToJavaProtoTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabToJavaProtoTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.testlab; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabToJavaSingletonDecisionsTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabToJavaSingletonDecisionsTransformerTest.java index 4da97ebb5..4fc0999d7 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabToJavaSingletonDecisionsTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabToJavaSingletonDecisionsTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.testlab; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabToKotlinProtoTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabToKotlinProtoTransformerTest.java index d42d9838f..a650cca17 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabToKotlinProtoTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabToKotlinProtoTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.testlab; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabValidatorTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabValidatorTest.java index 6913b068e..7050a654c 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabValidatorTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/TestLabValidatorTest.java @@ -13,18 +13,23 @@ package com.gs.dmn.signavio.testlab; import com.gs.dmn.runtime.DMNRuntimeException; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class TestLabValidatorTest { private final TestLabValidator validator = new TestLabValidator(); - @Test(expected = DMNRuntimeException.class) + @Test public void testValidateWhenNull() { - validator.validate(null); + Assertions.assertThrows(DMNRuntimeException.class, () -> { + validator.validate(null); + }); } - @Test(expected = DMNRuntimeException.class) + @Test public void testValidateWhenEmpty() { - validator.validate(new TestLab()); + Assertions.assertThrows(DMNRuntimeException.class, () -> { + validator.validate(new TestLab()); + }); } } \ No newline at end of file diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/expression/ExpressionTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/expression/ExpressionTest.java index c6c5d4a22..7b4ba29d5 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/expression/ExpressionTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/expression/ExpressionTest.java @@ -12,13 +12,13 @@ */ package com.gs.dmn.signavio.testlab.expression; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ExpressionTest { @Test diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/visitor/NopTestLabVisitorTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/visitor/NopTestLabVisitorTest.java index b7eaa45ae..8aa848796 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/visitor/NopTestLabVisitorTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/testlab/visitor/NopTestLabVisitorTest.java @@ -5,10 +5,9 @@ import com.gs.dmn.signavio.testlab.TestCase; import com.gs.dmn.signavio.testlab.TestLab; import com.gs.dmn.signavio.testlab.expression.*; -import com.gs.dmn.signavio.testlab.visitor.NopTestLabVisitor; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class NopTestLabVisitorTest { private final NopTestLabVisitor visitor = new NopTestLabVisitor<>(); diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/AbstractMergeInputDataTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/AbstractMergeInputDataTransformerTest.java index 0b73963c0..c4efd9495 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/AbstractMergeInputDataTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/AbstractMergeInputDataTransformerTest.java @@ -19,7 +19,7 @@ import com.gs.dmn.signavio.SignavioTestConstants; import com.gs.dmn.signavio.testlab.InputParameterDefinition; import com.gs.dmn.signavio.testlab.TestLab; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.ArrayList; @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; public abstract class AbstractMergeInputDataTransformerTest extends AbstractSignavioFileTransformerTest { protected final AbstractMergeInputDataTransformer transformer = getTransformer(); diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/CorrectPathsInDecisionsTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/CorrectPathsInDecisionsTransformerTest.java index 10436e0f3..d2f935054 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/CorrectPathsInDecisionsTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/CorrectPathsInDecisionsTransformerTest.java @@ -24,7 +24,7 @@ import com.gs.dmn.signavio.testlab.TestLab; import com.gs.dmn.signavio.transformation.config.Correction; import com.gs.dmn.signavio.transformation.config.DecisionTableCorrection; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; @@ -34,7 +34,7 @@ import java.util.List; import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class CorrectPathsInDecisionsTransformerTest extends AbstractSignavioFileTransformerTest { private static final ObjectMapper MAPPER = new ObjectMapper(); diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/ExportedComplexDMNToJavaTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/ExportedComplexDMNToJavaTransformerTest.java index 59e37bdea..651b4dcf2 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/ExportedComplexDMNToJavaTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/ExportedComplexDMNToJavaTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.transformation; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ExportedComplexDMNToJavaTransformerTest extends AbstractSignavioDMNToJavaTest { @Override diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/ExportedDecisionTableDMNToJavaTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/ExportedDecisionTableDMNToJavaTransformerTest.java index fdd780a8a..2fad21327 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/ExportedDecisionTableDMNToJavaTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/ExportedDecisionTableDMNToJavaTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.transformation; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ExportedDecisionTableDMNToJavaTransformerTest extends AbstractSignavioDMNToJavaTest { @Override diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/ExportedLiteralDMNToJavaTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/ExportedLiteralDMNToJavaTransformerTest.java index 17d86902c..382e73cf3 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/ExportedLiteralDMNToJavaTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/ExportedLiteralDMNToJavaTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.transformation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/FromRDFComplexDMNToJavaTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/FromRDFComplexDMNToJavaTransformerTest.java index 65a49fd95..59764f67b 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/FromRDFComplexDMNToJavaTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/FromRDFComplexDMNToJavaTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.transformation; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class FromRDFComplexDMNToJavaTransformerTest extends AbstractSignavioDMNToJavaTest { @Override diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/FromRDFDecisionTableDMNToJavaTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/FromRDFDecisionTableDMNToJavaTransformerTest.java index 3c92143bf..3e632596f 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/FromRDFDecisionTableDMNToJavaTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/FromRDFDecisionTableDMNToJavaTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.transformation; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class FromRDFDecisionTableDMNToJavaTransformerTest extends AbstractSignavioDMNToJavaTest { @Override diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/FromRDFLiteralDMNToJavaTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/FromRDFLiteralDMNToJavaTransformerTest.java index 3cec54ca4..19d0a1825 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/FromRDFLiteralDMNToJavaTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/FromRDFLiteralDMNToJavaTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.transformation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/GenerateMissingItemDefinitionsTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/GenerateMissingItemDefinitionsTransformerTest.java index 21acca0a7..1c3a7f6f8 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/GenerateMissingItemDefinitionsTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/GenerateMissingItemDefinitionsTransformerTest.java @@ -20,8 +20,8 @@ import com.gs.dmn.signavio.SignavioDMNModelRepository; import com.gs.dmn.signavio.testlab.TestLab; import com.gs.dmn.transformation.DMNTransformer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; import java.net.URI; @@ -64,14 +64,16 @@ public void testTransformerForExistingEquivalentDefinition() throws Exception { "creditIssueType", "assessApplicantAge", "priorIssue", "makeCreditDecision", "assessIssueRisk"), Collections.emptyList()); } - @Test(expected = DMNRuntimeException.class) + @Test public void testTransformerForExistingConflictingDefinition() throws Exception { - executeTransformation( - signavioResource("dmn/complex/input/credit-decision-missing-definitions-other.dmn"), - signavioResource("dmn/dmn2java/configuration/credit-decision-existing-conflicting-definition-config.json") - ); - - Assert.fail("Test is expected to fail; attempted to replace existing conflicting definition"); + Assertions.assertThrows(DMNRuntimeException.class, () -> { + executeTransformation( + signavioResource("dmn/complex/input/credit-decision-missing-definitions-other.dmn"), + signavioResource("dmn/dmn2java/configuration/credit-decision-existing-conflicting-definition-config.json") + ); + + Assertions.fail("Test is expected to fail; attempted to replace existing conflicting definition"); + }); } @Test @@ -86,14 +88,16 @@ public void testTransformerForDuplicateEquivalentNewDefinitions() throws Excepti "currentRiskAppetite", "processPriorIssues"), Collections.emptyList()); } - @Test(expected = DMNRuntimeException.class) + @Test public void testTransformerForDuplicateConflictingNewDefinitions() throws Exception { - executeTransformation( - signavioResource("dmn/complex/input/credit-decision-missing-definitions-other.dmn"), - signavioResource("dmn/dmn2java/configuration/credit-decision-duplicate-conflicting-definition-config.json") - ); - - Assert.fail("Test is expected to fail; attempted to insert duplicate, conflicting new definitions"); + Assertions.assertThrows(DMNRuntimeException.class, () -> { + executeTransformation( + signavioResource("dmn/complex/input/credit-decision-missing-definitions-other.dmn"), + signavioResource("dmn/dmn2java/configuration/credit-decision-duplicate-conflicting-definition-config.json") + ); + + Assertions.fail("Test is expected to fail; attempted to insert duplicate, conflicting new definitions"); + }); } @Test @@ -106,15 +110,15 @@ public void testSupportForAllTypeRefSyntax() throws Exception { List expectedNewDefinitions = Arrays.asList("assessIssue", "lendingThreshold", "currentRiskAppetite", "processPriorIssues"); List newDefinitions = identifyNewDefinitions(transformResult.getBeforeTransform(), transformResult.getAfterTransform()); - Assert.assertEquals("Unexpected new definition count", expectedNewDefinitions.size(), newDefinitions.size()); + Assertions.assertEquals(expectedNewDefinitions.size(), newDefinitions.size(), "Unexpected new definition count"); for (String definitionName : newDefinitions) { - Assert.assertTrue("Unexpected new definition", expectedNewDefinitions.contains(definitionName)); + Assertions.assertTrue(expectedNewDefinitions.contains(definitionName), "Unexpected new definition"); TItemDefinition definition = transformResult.getAfterTransform() .stream().filter(x -> x.getName().equals(definitionName)).findFirst() .orElseThrow(() -> new DMNRuntimeException("Cannot locate new definition")); - Assert.assertEquals("Definition type reference is not correct", "feel.number", QualifiedName.toName(definition.getTypeRef())); + Assertions.assertEquals("feel.number", QualifiedName.toName(definition.getTypeRef()), "Definition type reference is not correct"); } } @@ -151,12 +155,12 @@ private List identifyNewDefinitions(List baseRepository private void assertExpectedTransformResult(RepositoryTransformResult transformResult, List expectedNewDefinitions, List expectedRemovedDefinitions) { List newDefinitions = identifyNewDefinitions(transformResult.getBeforeTransform(), transformResult.getAfterTransform()); - Assert.assertTrue("Missing expected new definition", newDefinitions.containsAll(expectedNewDefinitions)); - Assert.assertEquals("Incorrect number of new definitions", expectedNewDefinitions.size(), newDefinitions.size()); + Assertions.assertTrue(newDefinitions.containsAll(expectedNewDefinitions), "Missing expected new definition"); + Assertions.assertEquals(expectedNewDefinitions.size(), newDefinitions.size(), "Incorrect number of new definitions"); List removedDefinitions = identifyNewDefinitions(transformResult.getAfterTransform(), transformResult.getBeforeTransform()); - Assert.assertTrue("Expected removed definition is still present", removedDefinitions.containsAll(expectedRemovedDefinitions)); - Assert.assertEquals("Incorrect number of removed definitions", expectedRemovedDefinitions.size(), removedDefinitions.size()); + Assertions.assertTrue(removedDefinitions.containsAll(expectedRemovedDefinitions), "Expected removed definition is still present"); + Assertions.assertEquals(expectedRemovedDefinitions.size(), removedDefinitions.size(), "Incorrect number of removed definitions"); } private static class RepositoryTransformResult { diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/InferMissingItemDefinitionsTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/InferMissingItemDefinitionsTransformerTest.java index cbcf23ffa..6621bad0f 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/InferMissingItemDefinitionsTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/InferMissingItemDefinitionsTransformerTest.java @@ -21,8 +21,8 @@ import com.gs.dmn.signavio.dialect.SignavioDMNDialectDefinition; import com.gs.dmn.signavio.testlab.TestLab; import com.gs.dmn.transformation.DMNTransformer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; import java.math.BigDecimal; @@ -31,8 +31,8 @@ import java.util.stream.Collectors; import static com.gs.dmn.signavio.transformation.InferMissingItemDefinitionsTransformer.DMN_DIALECT_NAME; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; public class InferMissingItemDefinitionsTransformerTest extends AbstractSignavioFileTransformerTest { @Test @@ -161,7 +161,7 @@ private List identifyNewDefinitions(List baseR private void assertExpectedTransformResult(RepositoryTransformResult transformResult, List> expectedNewDefinitions, List expectedRemovedDefinitions) { List newDefinitions = identifyNewDefinitions(transformResult.getBeforeTransform(), transformResult.getAfterTransform()); - assertEquals("Incorrect number of new definitions", expectedNewDefinitions.size(), newDefinitions.size()); + assertEquals(expectedNewDefinitions.size(), newDefinitions.size(), "Incorrect number of new definitions"); for (int i=0; i expectedPair = expectedNewDefinitions.get(i); TItemDefinition actualItemDefinition = newDefinitions.get(i); @@ -170,8 +170,8 @@ private void assertExpectedTransformResult(RepositoryTransformResult transformRe } List removedDefinitions = identifyNewDefinitions(transformResult.getAfterTransform(), transformResult.getBeforeTransform()); - Assert.assertTrue("Expected removed definition is still present", removedDefinitions.containsAll(expectedRemovedDefinitions)); - assertEquals("Incorrect number of removed definitions", expectedRemovedDefinitions.size(), removedDefinitions.size()); + Assertions.assertTrue(removedDefinitions.containsAll(expectedRemovedDefinitions), "Expected removed definition is still present"); + assertEquals(expectedRemovedDefinitions.size(), removedDefinitions.size(), "Incorrect number of removed definitions"); } private String toType(TItemDefinition itemDefinition) { diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/MergeInputDataByLabelAndDiagramIdTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/MergeInputDataByLabelAndDiagramIdTransformerTest.java index 6fb9d1f3b..b3b313eed 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/MergeInputDataByLabelAndDiagramIdTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/MergeInputDataByLabelAndDiagramIdTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.transformation; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MergeInputDataByLabelAndDiagramIdTransformerTest extends AbstractMergeInputDataTransformerTest { @Override diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/MergeInputDataTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/MergeInputDataTransformerTest.java index 32b3de61a..a89d2c5ec 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/MergeInputDataTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/MergeInputDataTransformerTest.java @@ -12,7 +12,7 @@ */ package com.gs.dmn.signavio.transformation; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class MergeInputDataTransformerTest extends AbstractMergeInputDataTransformerTest { @Override diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/NormalizeDateTimeLiteralsTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/NormalizeDateTimeLiteralsTransformerTest.java index 28ae1e3fb..c993cecc9 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/NormalizeDateTimeLiteralsTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/NormalizeDateTimeLiteralsTransformerTest.java @@ -17,12 +17,12 @@ import com.gs.dmn.error.NopErrorHandler; import com.gs.dmn.log.NopBuildLogger; import com.gs.dmn.signavio.SignavioDMNModelRepository; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class NormalizeDateTimeLiteralsTransformerTest extends AbstractSignavioFileTransformerTest { private final NormalizeDateTimeLiteralsVisitor visitor = new NormalizeDateTimeLiteralsVisitor(new NopErrorHandler(), new NopBuildLogger()); diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/RuleDescriptionTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/RuleDescriptionTransformerTest.java index 090746524..fea4c1023 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/RuleDescriptionTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/RuleDescriptionTransformerTest.java @@ -15,9 +15,9 @@ import com.gs.dmn.ast.TDecisionRule; import com.gs.dmn.error.NopErrorHandler; import com.gs.dmn.log.NopBuildLogger; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class RuleDescriptionTransformerTest extends AbstractSignavioFileTransformerTest { private final RuleDescriptionVisitor visitor = new RuleDescriptionVisitor(new NopErrorHandler(), new NopBuildLogger()); diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SignavioToJavaProtoTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SignavioToJavaProtoTransformerTest.java index b81e66db6..94161fe4e 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SignavioToJavaProtoTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SignavioToJavaProtoTransformerTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.signavio.transformation; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SignavioToJavaProtoTransformerTest extends AbstractSignavioDMNToJavaTest { @Override diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SignavioToJavaSingletonDecisionsTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SignavioToJavaSingletonDecisionsTransformerTest.java index cc3900b4f..c9d0eed86 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SignavioToJavaSingletonDecisionsTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SignavioToJavaSingletonDecisionsTransformerTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.signavio.transformation; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SignavioToJavaSingletonDecisionsTransformerTest extends AbstractSignavioDMNToJavaTest { @Override diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SignavioToKotlinProtoTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SignavioToKotlinProtoTransformerTest.java index e20f3697b..87f1b2694 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SignavioToKotlinProtoTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SignavioToKotlinProtoTransformerTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.signavio.transformation; import com.gs.dmn.runtime.Pair; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class SignavioToKotlinProtoTransformerTest extends AbstractSignavioDMNToKotlinTest { @Override diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SimplifyTypesForMIDTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SimplifyTypesForMIDTransformerTest.java index e0785feeb..99a7f71d6 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SimplifyTypesForMIDTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/SimplifyTypesForMIDTransformerTest.java @@ -18,7 +18,7 @@ import com.gs.dmn.signavio.SignavioTestConstants; import com.gs.dmn.signavio.testlab.TestLab; import com.gs.dmn.transformation.DMNTransformer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/TypeRefValidatorTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/TypeRefValidatorTest.java index 37ab47270..4c55a8011 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/TypeRefValidatorTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/TypeRefValidatorTest.java @@ -16,14 +16,14 @@ import com.gs.dmn.signavio.SignavioDMNModelRepository; import com.gs.dmn.validation.DMNValidator; import com.gs.dmn.validation.TypeRefValidator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.net.URI; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TypeRefValidatorTest extends AbstractSignavioFileTransformerTest { @Test diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/UniqueInformationRequirementTransformerTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/UniqueInformationRequirementTransformerTest.java index 1e96aee8c..75bed3448 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/UniqueInformationRequirementTransformerTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/transformation/UniqueInformationRequirementTransformerTest.java @@ -17,13 +17,13 @@ import com.gs.dmn.signavio.SignavioDMNModelRepository; import com.gs.dmn.signavio.testlab.TestLab; import com.gs.dmn.transformation.DMNTransformer; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class UniqueInformationRequirementTransformerTest extends AbstractSignavioFileTransformerTest { private final DMNTransformer transformer = new UniqueInformationRequirementTransformer(LOGGER); diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/validation/LabelDuplicationDRGElementValidatorTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/validation/LabelDuplicationDRGElementValidatorTest.java index 06ff91424..203537e17 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/validation/LabelDuplicationDRGElementValidatorTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/validation/LabelDuplicationDRGElementValidatorTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.signavio.validation; import com.gs.dmn.validation.DMNValidator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/validation/RuleDescriptionValidatorTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/validation/RuleDescriptionValidatorTest.java index dac0dc5d6..0621633fb 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/validation/RuleDescriptionValidatorTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/validation/RuleDescriptionValidatorTest.java @@ -14,13 +14,13 @@ import com.gs.dmn.DMNModelRepository; import com.gs.dmn.ast.TDecision; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class RuleDescriptionValidatorTest extends AbstractSignavioValidatorTest { private final DMNModelRepository repository = new DMNModelRepository(); diff --git a/dmn-signavio/src/test/java/com/gs/dmn/signavio/validation/SignavioDMNValidatorTest.java b/dmn-signavio/src/test/java/com/gs/dmn/signavio/validation/SignavioDMNValidatorTest.java index 4ecc798cf..7b47e8f61 100644 --- a/dmn-signavio/src/test/java/com/gs/dmn/signavio/validation/SignavioDMNValidatorTest.java +++ b/dmn-signavio/src/test/java/com/gs/dmn/signavio/validation/SignavioDMNValidatorTest.java @@ -13,7 +13,7 @@ package com.gs.dmn.signavio.validation; import com.gs.dmn.validation.DMNValidator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/proto/cl3_0004_lending_proto_cache/ConversionForComplexTypesTest.java b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/proto/cl3_0004_lending_proto_cache/ConversionForComplexTypesTest.java index b3244abf1..348a38d05 100644 --- a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/proto/cl3_0004_lending_proto_cache/ConversionForComplexTypesTest.java +++ b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/proto/cl3_0004_lending_proto_cache/ConversionForComplexTypesTest.java @@ -16,10 +16,9 @@ import com.gs.dmn.generated.proto.cl3_0004_lending_proto_cache.proto.Monthly; import com.gs.dmn.generated.proto.cl3_0004_lending_proto_cache.type.TApplicantData; import com.gs.dmn.generated.proto.cl3_0004_lending_proto_cache.type.TApplicantDataImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.*; public class ConversionForComplexTypesTest { @Test @@ -33,7 +32,7 @@ public void testDefaultValues() { @Test public void testConvertMethodsWhenNull() { com.gs.dmn.generated.proto.cl3_0004_lending_proto_cache.proto.TApplicantData protoApplicantData = TApplicantData.toProto((TApplicantData) null); - assertNotNull(null, protoApplicantData); + assertNotNull(protoApplicantData); assertEquals(0, protoApplicantData.getAge(), 0.0001); } @@ -44,7 +43,7 @@ public void testConvertMethodsWhenMissingProperties() { assertNotNull(protoApplicantData); assertEquals(0, protoApplicantData.getAge(), 0.001); assertEquals("", protoApplicantData.getEmploymentStatus()); - assertEquals(false, protoApplicantData.getExistingCustomer()); + assertFalse(protoApplicantData.getExistingCustomer()); Monthly protoMonthly = protoApplicantData.getMonthly(); assertNotNull(protoMonthly); assertEquals(0, protoMonthly.getIncome(), 0.001); diff --git a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/proto/date_time_proto/DateTimeProtoHandwrittenTest.java b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/proto/date_time_proto/DateTimeProtoHandwrittenTest.java index 08dd165e0..e1ce25fe3 100644 --- a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/proto/date_time_proto/DateTimeProtoHandwrittenTest.java +++ b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/proto/date_time_proto/DateTimeProtoHandwrittenTest.java @@ -1,11 +1,13 @@ package com.gs.dmn.generated.proto.date_time_proto; +import org.junit.jupiter.api.Test; + public class DateTimeProtoHandwrittenTest extends com.gs.dmn.runtime.DefaultDMNBaseDecision { private final Date dateDecision = new Date(); private final Time timeDecision = new Time(); private final DateTime dateTimeDecision = new DateTime(); - @org.junit.Test + @Test public void testCase1() { com.gs.dmn.runtime.ExecutionContext context_ = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data @@ -22,7 +24,7 @@ public void testCase1() { checkValues("2020-09-10", dateDecision.applyProto(dateRequest_, context_).getDate()); } - @org.junit.Test + @Test public void testCase2() { com.gs.dmn.runtime.ExecutionContext context_ = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data @@ -39,7 +41,7 @@ public void testCase2() { checkValues("12:10:10", timeDecision.applyProto(timeRequest_, context_).getTime()); } - @org.junit.Test + @Test public void testCase3() { com.gs.dmn.runtime.ExecutionContext context_ = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data diff --git a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/AbstractHandwrittenDecisionTest.java b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/AbstractHandwrittenDecisionTest.java index 4af36ae1d..e76583ea0 100644 --- a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/AbstractHandwrittenDecisionTest.java +++ b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/AbstractHandwrittenDecisionTest.java @@ -20,10 +20,10 @@ import com.gs.dmn.runtime.external.ExternalFunctionExecutor; import com.gs.dmn.runtime.listener.EventListener; import com.gs.dmn.runtime.listener.NopEventListener; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public abstract class AbstractHandwrittenDecisionTest { protected AnnotationSet annotationSet; @@ -39,10 +39,10 @@ public void testPerformance() { long before = System.currentTimeMillis(); applyDecision(); long after = System.currentTimeMillis(); - assertTrue("Takes longer than 500ms", after - before < 500); + assertTrue(after - before < 500, "Takes longer than 500ms"); } - @Before + @BeforeEach public void setUp() { this.annotationSet = new AnnotationSet(); this.eventListener = new NopEventListener(); diff --git a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/TestEqualsAndHashCode.java b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/TestEqualsAndHashCode.java index 43d28e708..0b87c71ef 100644 --- a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/TestEqualsAndHashCode.java +++ b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/TestEqualsAndHashCode.java @@ -14,12 +14,12 @@ import com.gs.dmn.generated.tck.cl2_0009_invocation_arithmetic.type.TLoan; import com.gs.dmn.generated.tck.cl2_0009_invocation_arithmetic.type.TLoanImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class TestEqualsAndHashCode { @Test diff --git a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java index 976e8b8d5..e7b3af6b6 100644 --- a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java +++ b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java @@ -14,12 +14,12 @@ import com.gs.dmn.generated.tck.AbstractHandwrittenDecisionTest; import com.gs.dmn.generated.tck.cl2_0009_invocation_arithmetic.type.TLoanImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.math.RoundingMode; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenMonthlyPaymentTest extends AbstractHandwrittenDecisionTest { private final MonthlyPayment decision = new MonthlyPayment(); diff --git a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java index 2e8c0b760..97cdf4509 100644 --- a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java +++ b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java @@ -14,13 +14,13 @@ import com.gs.dmn.generated.tck.AbstractHandwrittenDecisionTest; import com.gs.dmn.runtime.ExecutionContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final TotalVacationDays decision = new TotalVacationDays(); diff --git a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java index 3a455a305..1d2aa5d8f 100644 --- a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java +++ b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java @@ -18,7 +18,7 @@ import com.gs.dmn.runtime.external.DefaultExternalFunctionExecutor; import com.gs.dmn.runtime.listener.PostorderTraceEventListener; import com.gs.dmn.runtime.listener.node.DRGElementNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.math.BigDecimal; @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class PostorderTraceListenerTest extends AbstractTraceListenerTest { private final TotalVacationDays decision = new TotalVacationDays(); diff --git a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java index 66453f3d9..feb2601b9 100644 --- a/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java +++ b/dmn-tck-it/dmn-tck-it-kotlin-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java @@ -18,7 +18,7 @@ import com.gs.dmn.runtime.external.DefaultExternalFunctionExecutor; import com.gs.dmn.runtime.listener.TreeTraceEventListener; import com.gs.dmn.runtime.listener.node.DRGElementNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.math.BigDecimal; @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TreeTraceListenerTest extends AbstractTraceListenerTest { private final TotalVacationDays decision = new TotalVacationDays(); diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/AbstractHandwrittenDecisionTest.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/AbstractHandwrittenDecisionTest.java index b6b92e738..a0d9c60c1 100644 --- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/AbstractHandwrittenDecisionTest.java +++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/AbstractHandwrittenDecisionTest.java @@ -20,10 +20,10 @@ import com.gs.dmn.runtime.external.ExternalFunctionExecutor; import com.gs.dmn.runtime.listener.EventListener; import com.gs.dmn.runtime.listener.NopEventListener; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; public abstract class AbstractHandwrittenDecisionTest { protected AnnotationSet annotationSet; @@ -39,10 +39,10 @@ public void testPerformance() { long before = System.currentTimeMillis(); applyDecision(); long after = System.currentTimeMillis(); - assertTrue("Takes longer than 500ms", after - before < 500); + assertTrue( after - before < 500, "Takes longer than 500ms"); } - @Before + @BeforeEach public void setUp() { this.annotationSet = new AnnotationSet(); this.eventListener = new NopEventListener(); diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/proto/cl3_0004_lending_proto_cache/ConversionForComplexTypesTest.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/proto/cl3_0004_lending_proto_cache/ConversionForComplexTypesTest.java index b3244abf1..348a38d05 100644 --- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/proto/cl3_0004_lending_proto_cache/ConversionForComplexTypesTest.java +++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/proto/cl3_0004_lending_proto_cache/ConversionForComplexTypesTest.java @@ -16,10 +16,9 @@ import com.gs.dmn.generated.proto.cl3_0004_lending_proto_cache.proto.Monthly; import com.gs.dmn.generated.proto.cl3_0004_lending_proto_cache.type.TApplicantData; import com.gs.dmn.generated.proto.cl3_0004_lending_proto_cache.type.TApplicantDataImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.*; public class ConversionForComplexTypesTest { @Test @@ -33,7 +32,7 @@ public void testDefaultValues() { @Test public void testConvertMethodsWhenNull() { com.gs.dmn.generated.proto.cl3_0004_lending_proto_cache.proto.TApplicantData protoApplicantData = TApplicantData.toProto((TApplicantData) null); - assertNotNull(null, protoApplicantData); + assertNotNull(protoApplicantData); assertEquals(0, protoApplicantData.getAge(), 0.0001); } @@ -44,7 +43,7 @@ public void testConvertMethodsWhenMissingProperties() { assertNotNull(protoApplicantData); assertEquals(0, protoApplicantData.getAge(), 0.001); assertEquals("", protoApplicantData.getEmploymentStatus()); - assertEquals(false, protoApplicantData.getExistingCustomer()); + assertFalse(protoApplicantData.getExistingCustomer()); Monthly protoMonthly = protoApplicantData.getMonthly(); assertNotNull(protoMonthly); assertEquals(0, protoMonthly.getIncome(), 0.001); diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/proto/date_time_proto/DateTimeProtoHandwrittenTest.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/proto/date_time_proto/DateTimeProtoHandwrittenTest.java index 08dd165e0..e1ce25fe3 100644 --- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/proto/date_time_proto/DateTimeProtoHandwrittenTest.java +++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/proto/date_time_proto/DateTimeProtoHandwrittenTest.java @@ -1,11 +1,13 @@ package com.gs.dmn.generated.proto.date_time_proto; +import org.junit.jupiter.api.Test; + public class DateTimeProtoHandwrittenTest extends com.gs.dmn.runtime.DefaultDMNBaseDecision { private final Date dateDecision = new Date(); private final Time timeDecision = new Time(); private final DateTime dateTimeDecision = new DateTime(); - @org.junit.Test + @Test public void testCase1() { com.gs.dmn.runtime.ExecutionContext context_ = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data @@ -22,7 +24,7 @@ public void testCase1() { checkValues("2020-09-10", dateDecision.applyProto(dateRequest_, context_).getDate()); } - @org.junit.Test + @Test public void testCase2() { com.gs.dmn.runtime.ExecutionContext context_ = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data @@ -39,7 +41,7 @@ public void testCase2() { checkValues("12:10:10", timeDecision.applyProto(timeRequest_, context_).getTime()); } - @org.junit.Test + @Test public void testCase3() { com.gs.dmn.runtime.ExecutionContext context_ = new com.gs.dmn.runtime.ExecutionContext(); // Initialize input data diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/TestEqualsAndHashCode.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/TestEqualsAndHashCode.java index 43d28e708..0b87c71ef 100644 --- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/TestEqualsAndHashCode.java +++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/TestEqualsAndHashCode.java @@ -14,12 +14,12 @@ import com.gs.dmn.generated.tck.cl2_0009_invocation_arithmetic.type.TLoan; import com.gs.dmn.generated.tck.cl2_0009_invocation_arithmetic.type.TLoanImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; public class TestEqualsAndHashCode { @Test diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java index ee943b4fe..5174a987c 100644 --- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java +++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java @@ -14,12 +14,12 @@ import com.gs.dmn.AbstractHandwrittenDecisionTest; import com.gs.dmn.generated.tck.cl2_0009_invocation_arithmetic.type.TLoanImpl; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.math.RoundingMode; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenMonthlyPaymentTest extends AbstractHandwrittenDecisionTest { private final MonthlyPayment decision = new MonthlyPayment(); diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0004_lending_singleton/Test0004LendingSingleton.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0004_lending_singleton/Test0004LendingSingleton.java index 048d3d175..c2699f8ca 100644 --- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0004_lending_singleton/Test0004LendingSingleton.java +++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0004_lending_singleton/Test0004LendingSingleton.java @@ -1,8 +1,5 @@ package com.gs.dmn.generated.tck.cl3_0004_lending_singleton; -import java.util.*; -import java.util.stream.Collectors; - public class Test0004LendingSingleton extends AbstractTest0004Lending { @Override protected Routing makeRouting() { diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java index 448cc68fe..2bb32e1b3 100644 --- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java +++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java @@ -14,13 +14,13 @@ import com.gs.dmn.AbstractHandwrittenDecisionTest; import com.gs.dmn.runtime.ExecutionContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.LinkedHashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest { private final TotalVacationDays decision = new TotalVacationDays(); diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java index 3a455a305..1d2aa5d8f 100644 --- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java +++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java @@ -18,7 +18,7 @@ import com.gs.dmn.runtime.external.DefaultExternalFunctionExecutor; import com.gs.dmn.runtime.listener.PostorderTraceEventListener; import com.gs.dmn.runtime.listener.node.DRGElementNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.math.BigDecimal; @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class PostorderTraceListenerTest extends AbstractTraceListenerTest { private final TotalVacationDays decision = new TotalVacationDays(); diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java index 66453f3d9..feb2601b9 100644 --- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java +++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java @@ -18,7 +18,7 @@ import com.gs.dmn.runtime.external.DefaultExternalFunctionExecutor; import com.gs.dmn.runtime.listener.TreeTraceEventListener; import com.gs.dmn.runtime.listener.node.DRGElementNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.math.BigDecimal; @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TreeTraceListenerTest extends AbstractTraceListenerTest { private final TotalVacationDays decision = new TotalVacationDays(); diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/VacationDaysLambdaTest.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/VacationDaysLambdaTest.java index f9b60f54c..ab1ea32c1 100644 --- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/VacationDaysLambdaTest.java +++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/VacationDaysLambdaTest.java @@ -14,7 +14,7 @@ import com.gs.dmn.runtime.ExecutionContext; import com.gs.dmn.runtime.Executor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.LinkedHashMap; diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/pom.xml b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/pom.xml index 6318ac1c0..cf461140c 100644 --- a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/pom.xml +++ b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/pom.xml @@ -70,9 +70,15 @@ - junit - junit - 4.13.2 + org.junit.jupiter + junit-jupiter-api + 5.10.1 + test + + + org.junit.vintage + junit-vintage-engine + 5.10.1 test diff --git a/pom.xml b/pom.xml index acbfacaa5..f913477d8 100644 --- a/pom.xml +++ b/pom.xml @@ -98,6 +98,8 @@ 1.61.0 3.25.2 + 5.10.1 + 0.8.8 java jacoco @@ -416,10 +418,17 @@ specific language governing permissions and limitations under the License.]]>2.11.0 + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + - junit - junit - 4.13.2 + org.junit.vintage + junit-vintage-engine + ${junit.version} test @@ -476,10 +485,16 @@ specific language governing permissions and limitations under the License.]]> - junit - junit + org.junit.jupiter + junit-jupiter-api test + + org.junit.vintage + junit-vintage-engine + test + + @@ -491,6 +506,12 @@ specific language governing permissions and limitations under the License.]]>0.15 + + com.mycila + license-maven-plugin + 4.1 + + org.apache.maven.plugins maven-dependency-plugin @@ -503,17 +524,28 @@ specific language governing permissions and limitations under the License.]]> org.openrewrite.maven rewrite-maven-plugin - 5.16.0 + 5.20.0 - org.openrewrite.java.migrate.UpgradeToJava17 + + org.openrewrite.java.testing.junit5.JUnit4to5Migration + + + **/target/** + docs/** + org.openrewrite.recipe rewrite-migrate-java - 2.4.2 + 2.7.0 + + + org.openrewrite.recipe + rewrite-testing-frameworks + 2.3.0 @@ -697,6 +729,11 @@ specific language governing permissions and limitations under the License.]]> + + com.mycila + license-maven-plugin + + org.apache.rat apache-rat-plugin