From 06951a951e48e661df941decfbeef92ab065b8ba Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Mon, 2 Dec 2024 10:58:20 -0500 Subject: [PATCH 1/4] [incubator-kie-drools-6158] Remove remaining binaries from test resources on main (#6171) - Create TestJar.jar on the fly # Conflicts: # .rat-excludes --- .rat-excludes | 330 ++++++++++++++++++ efesto/efesto-core/efesto-common-api/pom.xml | 23 ++ .../custom-resources/IndexFile.testb_json | 15 + .../common/api/utils/MemoryFileUtilsTest.java | 2 +- .../src/test/resources/TestJar.jar | Bin 340 -> 0 bytes efesto/efesto-core/efesto-common-core/pom.xml | 24 +- .../custom-resources/IndexFile.testb_json | 15 + .../common/core/utils/JSONUtilsTest.java | 2 +- .../src/test/resources/TestJar.jar | Bin 340 -> 0 bytes .../efesto-runtime-manager-core/pom.xml | 24 +- .../custom-resources/IndexFile.testb_json | 20 ++ .../utils/GeneratedResourceUtilsTest.java | 2 +- .../src/test/resources/TestJar.jar | Bin 347 -> 0 bytes 13 files changed, 452 insertions(+), 5 deletions(-) create mode 100644 .rat-excludes create mode 100644 efesto/efesto-core/efesto-common-api/src/test/custom-resources/IndexFile.testb_json delete mode 100644 efesto/efesto-core/efesto-common-api/src/test/resources/TestJar.jar create mode 100644 efesto/efesto-core/efesto-common-core/src/test/custom-resources/IndexFile.testb_json delete mode 100644 efesto/efesto-core/efesto-common-core/src/test/resources/TestJar.jar create mode 100644 efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/custom-resources/IndexFile.testb_json delete mode 100644 efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/resources/TestJar.jar diff --git a/.rat-excludes b/.rat-excludes new file mode 100644 index 00000000000..16ea79745bb --- /dev/null +++ b/.rat-excludes @@ -0,0 +1,330 @@ +# .git-blame-ignore-revs +.git-blame-ignore-revs +# .rat-excludes +.rat-excludes +# DISCLAIMER-WIP +DISCLAIMER-WIP +# drools-decisiontables/src/main/java/org/drools/decisiontable/parser/csv/CsvLineParser.java +CsvLineParser.java +# drools-decisiontables/src/test/resources/data/ComplexWorkbook.drl.csv +ComplexWorkbook.drl.csv +# drools-decisiontables/src/test/resources/data/TestCsv.drl.csv +TestCsv.drl.csv +# drools-decisiontables/src/test/resources/org/drools/decisiontable/DeclaresWorkbook.drl.csv +DeclaresWorkbook.drl.csv +# drools-decisiontables/src/test/resources/org/drools/decisiontable/changeSetTestCSV.drl.csv +changeSetTestCSV.drl.csv +# drools-decisiontables/src/test/resources/org/drools/decisiontable/changeSetTestCSV2.drl.csv +changeSetTestCSV2.drl.csv +# drools-decisiontables/src/test/resources/org/drools/decisiontable/columnReplaceTest.drl.csv +columnReplaceTest.drl.csv +# drools-decisiontables/src/test/resources/org/drools/decisiontable/emptyAction.drl.csv +emptyAction.drl.csv +# drools-decisiontables/src/test/resources/org/drools/decisiontable/scannerChangeSetTestCSV.drl.csv +scannerChangeSetTestCSV.drl.csv +# drools-decisiontables/src/test/resources/org/drools/decisiontable/unicode.drl.csv +unicode.drl.csv +# drools-decisiontables/src/test/resources/org/drools/decisiontable/integrationtests/csv/kmoduleCSVTest.dtable.drl.csv +kmoduleCSVTest.dtable.drl.csv +# drools-docs/supplemental-ui/css/search.css +search.css +# drools-docs/supplemental-ui/js/search-ui.js +search-ui.js +# drools-docs/supplemental-ui/js/vendor/lunr-2.3.9.min.js +lunr-2.3.9.min.js +# drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/JavaLexer.g4 +JavaLexer.g4 +# drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/JavaParser.g4 +JavaParser.g4 +# drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints.dslr +expander_multiple_constraints.dslr +# drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints_flush.dslr +expander_multiple_constraints_flush.dslr +# drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_spread_lines.dslr +expander_spread_lines.dslr +# drools-drlonyaml-parent/drools-drlonyaml-cli-tests/src/test/resources/batch_drl_files/.gitignore +.gitignore +# drools-drlonyaml-parent/drools-drlonyaml-cli-tests/src/test/resources/expected/test1.yml +test1.yml +# drools-drlonyaml-parent/drools-drlonyaml-cli-tests/src/test/resources/expected/test2.drl.txt +test2.drl.txt +# drools-drlonyaml-parent/drools-drlonyaml-cli-tests/src/test/resources/given/test1.drl.txt +test1.drl.txt +# drools-drlonyaml-parent/drools-drlonyaml-todrl/src/main/resources/drl.ftl +drl.ftl +# drools-examples/src/main/resources/org/drools/examples/sudoku/Sample.sdo +Sample.sdo +# drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/src/test/resources/org/drools/impact/analysis/graph/graphviz/simple.dot +simple.dot +# drools-model/drools-mvel-parser/src/main/javacc/mvel.jj +mvel.jj +# drools-quarkus-extension/drools-quarkus-integration-test-hotreload/src/main/resources/org/drools/hotreload/adult.txt +adult.txt +# drools-scenario-simulation/drools-scenario-simulation-backend/src/test/resources/folderToTest/testFile.txt +testFile.txt +# drools-test-coverage/test-suite/src/test/resources/org/drools/testcoverage/functional/agenda-group.drl.csv +agenda-group.drl.csv +# drools-test-coverage/test-suite/src/test/resources/org/drools/testcoverage/functional/emptyAction.drl.csv +emptyAction.drl.csv +# drools-test-coverage/test-suite/src/test/resources/org/drools/testcoverage/functional/sample.drl.csv +sample.drl.csv +# drools-test-coverage/test-suite/src/test/resources/org/drools/testcoverage/functional/sample_dates.drl.csv +sample_dates.drl.csv +# drools-test-coverage/test-suite/src/test/resources/org/drools/testcoverage/functional/sequential.drl.csv +sequential.drl.csv +# drools-test-coverage/test-suite/src/test/resources/org/drools/testcoverage/functional/unicode.drl.csv +unicode.drl.csv +# drools-test-coverage/test-suite/src/test/resources/org/drools/testcoverage/functional/decisiontable/PhoneNumberCategory.drl.csv +PhoneNumberCategory.drl.csv +# drools-test-coverage/test-suite/src/test/resources/org/drools/testcoverage/functional/oopath/oopath.drl.csv +oopath.drl.csv +# efesto/documentation/sdt/CompositeKnowledgeBuilderImpl_build.sdt +CompositeKnowledgeBuilderImpl_build.sdt +# efesto/documentation/sdt/PMMLAssemblerService_addResourceAfterRules_withoutConfigurations.sdt +PMMLAssemblerService_addResourceAfterRules_withoutConfigurations.sdt +# efesto/documentation/sdt/PMMLAssemblerService_addResourcesAfterRules_withConfigurations.sdt +PMMLAssemblerService_addResourcesAfterRules_withConfigurations.sdt +# efesto/efesto-core/efesto-common-api/src/test/custom-resources/IndexFile.testb_json +IndexFile.testb_json +# efesto/efesto-core/efesto-common-api/src/test/resources/IndexFile.test_json +IndexFile.test_json +# efesto/efesto-core/efesto-common-api/src/test/resources/TestingEmptyFile.txt +TestingEmptyFile.txt +# efesto/efesto-core/efesto-common-core/src/test/custom-resources/IndexFile.testb_json +IndexFile.testb_json +# efesto/efesto-core/efesto-common-core/src/test/resources/IndexFile.test_json +IndexFile.test_json +# efesto/efesto-core/efesto-common-core/src/test/resources/TestingEmptyFile.txt +TestingEmptyFile.txt +# efesto/efesto-core/efesto-compilation-manager/efesto-compilation-manager-core/src/test/resources/IndexFile.test_json +IndexFile.test_json +# efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/custom-resources/IndexFile.testb_json +IndexFile.testb_json +# efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/resources/IndexFile.test_json +IndexFile.test_json +# kie-archetypes/kie-drools-dmn-archetype/src/test/resources/projects/integrationtestDefaults/goal.txt +goal.txt +# kie-archetypes/kie-drools-exec-model-archetype/src/test/resources/projects/integrationtestDefaults/goal.txt +goal.txt +# kie-archetypes/kie-drools-exec-model-ruleunit-archetype/src/test/resources/projects/integrationtestDefaults/goal.txt +goal.txt +# kie-archetypes/kie-drools-yaml-archetype/src/test/resources/projects/integrationtestDefaults/goal.txt +goal.txt +# kie-dmn/kie-dmn-backend/src/test/resources/DC.xsd +DC.xsd +# kie-dmn/kie-dmn-backend/src/test/resources/DI.xsd +DI.xsd +# kie-dmn/kie-dmn-backend/src/test/resources/DMN11.xsd +DMN11.xsd +# kie-dmn/kie-dmn-backend/src/test/resources/DMN12.xsd +DMN12.xsd +# kie-dmn/kie-dmn-backend/src/test/resources/DMN13.xsd +DMN13.xsd +# kie-dmn/kie-dmn-backend/src/test/resources/DMN14.xsd +DMN14.xsd +# kie-dmn/kie-dmn-backend/src/test/resources/DMN15.xsd +DMN15.xsd +# kie-dmn/kie-dmn-backend/src/test/resources/DMNDI12.xsd +DMNDI12.xsd +# kie-dmn/kie-dmn-backend/src/test/resources/DMNDI13.xsd +DMNDI13.xsd +# kie-dmn/kie-dmn-backend/src/test/resources/DMNDI15.xsd +DMNDI15.xsd +# kie-dmn/kie-dmn-core/src/test/filtered-resources/org/kie/dmn/core/drools-model +drools-model +# kie-dmn/kie-dmn-feel/src/main/resources/dmn.xsd +dmn.xsd +# kie-dmn/kie-dmn-trisotech/src/test/resources/DC.xsd +DC.xsd +# kie-dmn/kie-dmn-trisotech/src/test/resources/DI.xsd +DI.xsd +# kie-dmn/kie-dmn-trisotech/src/test/resources/DMN13.xsd +DMN13.xsd +# kie-dmn/kie-dmn-trisotech/src/test/resources/DMNDI13.xsd +DMNDI13.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20151101/dmn.xsd +dmn.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20180521/DC.xsd +DC.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20180521/DI.xsd +DI.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20180521/DMN12.xsd +DMN12.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20180521/DMNDI12.xsd +DMNDI12.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20191111/DC.xsd +DC.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20191111/DI.xsd +DI.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20191111/DMN13.xsd +DMN13.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20191111/DMNDI13.xsd +DMNDI13.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20211108/DC.xsd +DC.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20211108/DI.xsd +DI.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20211108/DMN14.xsd +DMN14.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20211108/DMNDI13.xsd +DMNDI13.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20230324/DC.xsd +DC.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20230324/DI.xsd +DI.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20230324/DMN15.xsd +DMN15.xsd +# kie-dmn/kie-dmn-validation/src/main/resources/org/kie/dmn/validation/org/omg/spec/DMN/20230324/DMNDI15.xsd +DMNDI15.xsd +# kie-drl/kie-drl-implementations/kie-drl-kiesession-local/kie-drl-kiesession-local-runtime/src/test/resources/IndexFile.drl_json +IndexFile.drl_json +# kie-drl/kie-drl-implementations/kie-drl-map-input/kie-drl-map-input-runtime/src/test/resources/IndexFile.drl_json +IndexFile.drl_json +# kie-drl/kie-drl-runtime-common/src/test/resources/IndexFile.drl_json +IndexFile.drl_json +# kie-drl/kie-drl-tests/src/test/resources/IndexFile.drl_json +IndexFile.drl_json +# kie-pmml-trusty/kie-pmml-commons/src/test/resources/IndexFile.pmml_json +IndexFile.pmml_json +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLApplyFactoryTest_01.txt +KiePMMLApplyFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLApplyFactoryTest_02.txt +KiePMMLApplyFactoryTest_02.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLApplyFactoryTest_03.txt +KiePMMLApplyFactoryTest_03.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLCompoundPredicateFactoryTest_01.txt +KiePMMLCompoundPredicateFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLConstantFactoryTest_01.txt +KiePMMLConstantFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLDefineFunctionFactoryTest_01.txt +KiePMMLDefineFunctionFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLDerivedFieldFactoryTest_01.txt +KiePMMLDerivedFieldFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLDerivedFieldFactoryTest_02.txt +KiePMMLDerivedFieldFactoryTest_02.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLDerivedFieldFactoryTest_03.txt +KiePMMLDerivedFieldFactoryTest_03.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLDiscretizeBinFactoryTest_01.txt +KiePMMLDiscretizeBinFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLDiscretizeFactoryTest_01.txt +KiePMMLDiscretizeFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLFalsePredicateFactoryTest_01.txt +KiePMMLFalsePredicateFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLFieldColumnPairFactoryTest_01.txt +KiePMMLFieldColumnPairFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLFieldRefFactoryTest_01.txt +KiePMMLFieldRefFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLInlineTableFactoryTest_01.txt +KiePMMLInlineTableFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLIntervalFactoryTest_01.txt +KiePMMLIntervalFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLLocalTransformationsFactoryTest_01.txt +KiePMMLLocalTransformationsFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLMapValuesFactoryTest_01.txt +KiePMMLMapValuesFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLMiningFieldFactoryTest_01.txt +KiePMMLMiningFieldFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLMiningFieldFactoryTest_02.txt +KiePMMLMiningFieldFactoryTest_02.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLMiningFieldFactoryTest_03.txt +KiePMMLMiningFieldFactoryTest_03.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLModelFactoryUtilsTest_01.txt +KiePMMLModelFactoryUtilsTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLModelFactoryUtilsTest_02.txt +KiePMMLModelFactoryUtilsTest_02.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLModelFactoryUtilsTest_03.txt +KiePMMLModelFactoryUtilsTest_03.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLModelFactoryUtilsTest_04.txt +KiePMMLModelFactoryUtilsTest_04.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLModelFactoryUtilsTest_05.txt +KiePMMLModelFactoryUtilsTest_05.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLModelFactoryUtilsTest_06.txt +KiePMMLModelFactoryUtilsTest_06.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLModelFactoryUtilsTest_07.txt +KiePMMLModelFactoryUtilsTest_07.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLModelFactoryUtilsTest_08.txt +KiePMMLModelFactoryUtilsTest_08.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLModelFactoryUtilsTest_09.txt +KiePMMLModelFactoryUtilsTest_09.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLModelFactoryUtilsTest_10.txt +KiePMMLModelFactoryUtilsTest_10.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLModelFactoryUtilsTest_11.txt +KiePMMLModelFactoryUtilsTest_11.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLModelFactoryUtilsTest_12.txt +KiePMMLModelFactoryUtilsTest_12.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLModelFactoryUtilsTest_13.txt +KiePMMLModelFactoryUtilsTest_13.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLModelFactoryUtilsTest_14.txt +KiePMMLModelFactoryUtilsTest_14.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLNormContinuousFactoryTest_01.txt +KiePMMLNormContinuousFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLNormContinuousFactoryTest_02.txt +KiePMMLNormContinuousFactoryTest_02.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLNormDiscreteFactoryTest_01.txt +KiePMMLNormDiscreteFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLParameterFieldFactoryTest_01.txt +KiePMMLParameterFieldFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLRowFactoryTest_01.txt +KiePMMLRowFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLRowFactoryTest_02.txt +KiePMMLRowFactoryTest_02.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLSimplePredicateFactoryTest_01.txt +KiePMMLSimplePredicateFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLSimpleSetPredicateFactoryTest_01.txt +KiePMMLSimpleSetPredicateFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLTargetFactoryTest_01.txt +KiePMMLTargetFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLTargetValueFactoryTest_01.txt +KiePMMLTargetValueFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLTextIndexFactoryTest_01.txt +KiePMMLTextIndexFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLTextIndexNormalizationFactoryTest_01.txt +KiePMMLTextIndexNormalizationFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLTransformationDictionaryFactoryTest_01.txt +KiePMMLTransformationDictionaryFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/KiePMMLTruePredicateFactoryTest_01.txt +KiePMMLTruePredicateFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/TargetFieldFactoryTest_01.txt +TargetFieldFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-commons/src/test/resources/TargetValueFactoryTest_01.txt +TargetValueFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-evaluator/kie-pmml-evaluator-core/src/test/resources/IndexFile.pmml_json +IndexFile.pmml_json +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-clustering/kie-pmml-models-clustering-compiler/src/test/resources/KiePMMLClusteringModelFactoryTest_01.txt +KiePMMLClusteringModelFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-mining/kie-pmml-models-mining-compiler/src/test/resources/KiePMMLSegmentFactoryTest_01.txt +KiePMMLSegmentFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/resources/KiePMMLClassificationTableFactoryTest_01.txt +KiePMMLClassificationTableFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/resources/KiePMMLClassificationTableFactoryTest_02.txt +KiePMMLClassificationTableFactoryTest_02.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/resources/KiePMMLRegressionModelFactoryTest_01.txt +KiePMMLRegressionModelFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/resources/KiePMMLRegressionTableFactoryTest_01.txt +KiePMMLRegressionTableFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/resources/KiePMMLRegressionTableFactoryTest_02.txt +KiePMMLRegressionTableFactoryTest_02.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/resources/KiePMMLRegressionTableFactoryTest_03.txt +KiePMMLRegressionTableFactoryTest_03.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/resources/KiePMMLRegressionTableFactoryTest_04.txt +KiePMMLRegressionTableFactoryTest_04.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/resources/KiePMMLRegressionTableFactoryTest_05.txt +KiePMMLRegressionTableFactoryTest_05.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/resources/KiePMMLRegressionTableFactoryTest_06.txt +KiePMMLRegressionTableFactoryTest_06.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-regression/kie-pmml-models-regression-compiler/src/test/resources/KiePMMLRegressionTableFactoryTest_07.txt +KiePMMLRegressionTableFactoryTest_07.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/src/test/resources/KiePMMLAttributeFactoryTest_01.txt +KiePMMLAttributeFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/src/test/resources/KiePMMLCharacteristicFactoryTest_01.txt +KiePMMLCharacteristicFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/src/test/resources/KiePMMLCharacteristicsFactoryTest_01.txt +KiePMMLCharacteristicsFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/src/test/resources/KiePMMLComplexPartialScoreFactoryTest_01.txt +KiePMMLComplexPartialScoreFactoryTest_01.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/src/test/resources/KiePMMLComplexPartialScoreFactoryTest_02.txt +KiePMMLComplexPartialScoreFactoryTest_02.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-scorecard/kie-pmml-models-scorecard-compiler/src/test/resources/KiePMMLComplexPartialScoreFactoryTest_03.txt +KiePMMLComplexPartialScoreFactoryTest_03.txt +# kie-pmml-trusty/kie-pmml-models/kie-pmml-models-tree/kie-pmml-models-tree-compiler/src/test/resources/KiePMMLNodeFactoryTest_01.txt +KiePMMLNodeFactoryTest_01.txt diff --git a/efesto/efesto-core/efesto-common-api/pom.xml b/efesto/efesto-core/efesto-common-api/pom.xml index ae1b879663d..31e007ae743 100644 --- a/efesto/efesto-core/efesto-common-api/pom.xml +++ b/efesto/efesto-core/efesto-common-api/pom.xml @@ -55,5 +55,28 @@ + + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-test-resources + + run + + + + + + + + + + + + + \ No newline at end of file diff --git a/efesto/efesto-core/efesto-common-api/src/test/custom-resources/IndexFile.testb_json b/efesto/efesto-core/efesto-common-api/src/test/custom-resources/IndexFile.testb_json new file mode 100644 index 00000000000..511b17790ad --- /dev/null +++ b/efesto/efesto-core/efesto-common-api/src/test/custom-resources/IndexFile.testb_json @@ -0,0 +1,15 @@ +[ + { + "step-type": "executable", + "modelLocalUriId": { + "model": "foo", + "basePath": "/this/is/fri", + "fullPath": "/foo/this/is/fri" + }, + "fullClassNames": ["full.class.Name"] + }, + { + "step-type": "class", + "fullClassName": "full.class.Name" + } +] diff --git a/efesto/efesto-core/efesto-common-api/src/test/java/org/kie/efesto/common/api/utils/MemoryFileUtilsTest.java b/efesto/efesto-core/efesto-common-api/src/test/java/org/kie/efesto/common/api/utils/MemoryFileUtilsTest.java index f4a54f83f00..38531d4bcb5 100644 --- a/efesto/efesto-core/efesto-common-api/src/test/java/org/kie/efesto/common/api/utils/MemoryFileUtilsTest.java +++ b/efesto/efesto-core/efesto-common-api/src/test/java/org/kie/efesto/common/api/utils/MemoryFileUtilsTest.java @@ -128,7 +128,7 @@ private static URL getResourceUrl() { private static URL getJarUrl() throws MalformedURLException { URL retrieved = Thread.currentThread().getContextClassLoader().getResource("TestJar.jar"); - assertThat(retrieved).isNotNull(); + assertThat(retrieved).as("Run `mvn test` to build TestJar.jar").isNotNull(); String newString = "jar:" + retrieved + "!/IndexFile.testb_json"; return new URL(newString); } diff --git a/efesto/efesto-core/efesto-common-api/src/test/resources/TestJar.jar b/efesto/efesto-core/efesto-common-api/src/test/resources/TestJar.jar deleted file mode 100644 index 6baf61d20b92ed8a28ca9567854632e63da222b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 340 zcmWIWW@Zs#U|`^22v3s=ZF8H7tKxEUB(&h24j028_WhTMk?1X{oU=_=T~ZTITQ3XdLzSjAlC){XJZ z3|i6g|89(w=+c7id%o{2_guQA?#NZCngxaO@01TZGV7*1Yv2`r6INZI`|+maliOG3 z-{M%ibGxeM>zHGUZ!K7^-R9S0RI*q9@r{-Lh04U%fBY(pC`gS zwR$pII|5es - + + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-test-resources + + run + + + + + + + + + + + + + \ No newline at end of file diff --git a/efesto/efesto-core/efesto-common-core/src/test/custom-resources/IndexFile.testb_json b/efesto/efesto-core/efesto-common-core/src/test/custom-resources/IndexFile.testb_json new file mode 100644 index 00000000000..511b17790ad --- /dev/null +++ b/efesto/efesto-core/efesto-common-core/src/test/custom-resources/IndexFile.testb_json @@ -0,0 +1,15 @@ +[ + { + "step-type": "executable", + "modelLocalUriId": { + "model": "foo", + "basePath": "/this/is/fri", + "fullPath": "/foo/this/is/fri" + }, + "fullClassNames": ["full.class.Name"] + }, + { + "step-type": "class", + "fullClassName": "full.class.Name" + } +] diff --git a/efesto/efesto-core/efesto-common-core/src/test/java/org/kie/efesto/common/core/utils/JSONUtilsTest.java b/efesto/efesto-core/efesto-common-core/src/test/java/org/kie/efesto/common/core/utils/JSONUtilsTest.java index 9be10a73828..57b801160b4 100644 --- a/efesto/efesto-core/efesto-common-core/src/test/java/org/kie/efesto/common/core/utils/JSONUtilsTest.java +++ b/efesto/efesto-core/efesto-common-core/src/test/java/org/kie/efesto/common/core/utils/JSONUtilsTest.java @@ -201,7 +201,7 @@ void getModelLocalUriIdObject() throws JsonProcessingException { private ClassLoader addJarToClassLoader() { ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader(); URL jarUrl = Thread.currentThread().getContextClassLoader().getResource("TestJar.jar"); - assertThat(jarUrl).isNotNull(); + assertThat(jarUrl).as("Run `mvn test` to build TestJar.jar").isNotNull(); URL fileUrl = Thread.currentThread().getContextClassLoader().getResource("IndexFile.testb_json"); assertThat(fileUrl).isNull(); URL[] urls = {jarUrl}; diff --git a/efesto/efesto-core/efesto-common-core/src/test/resources/TestJar.jar b/efesto/efesto-core/efesto-common-core/src/test/resources/TestJar.jar deleted file mode 100644 index 6baf61d20b92ed8a28ca9567854632e63da222b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 340 zcmWIWW@Zs#U|`^22v3s=ZF8H7tKxEUB(&h24j028_WhTMk?1X{oU=_=T~ZTITQ3XdLzSjAlC){XJZ z3|i6g|89(w=+c7id%o{2_guQA?#NZCngxaO@01TZGV7*1Yv2`r6INZI`|+maliOG3 z-{M%ibGxeM>zHGUZ!K7^-R9S0RI*q9@r{-Lh04U%fBY(pC`gS zwR$pII|5es - + + + + org.apache.maven.plugins + maven-antrun-plugin + + + process-test-resources + + run + + + + + + + + + + + + + \ No newline at end of file diff --git a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/custom-resources/IndexFile.testb_json b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/custom-resources/IndexFile.testb_json new file mode 100644 index 00000000000..33cf7f17490 --- /dev/null +++ b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/custom-resources/IndexFile.testb_json @@ -0,0 +1,20 @@ +[ + { + "step-type": "executable", + "modelLocalUriId": { + "model": "testb", + "basePath": "/testmod", + "fullPath": "/testb/testmod" + }, + "fullClassNames": [""] + }, + { + "step-type": "redirect", + "modelLocalUriId": { + "model": "testb", + "basePath": "/redirecttestmod", + "fullPath": "/testb/redirecttestmod" + }, + "target": "other" + } +] \ No newline at end of file diff --git a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/java/org/kie/efesto/runtimemanager/core/utils/GeneratedResourceUtilsTest.java b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/java/org/kie/efesto/runtimemanager/core/utils/GeneratedResourceUtilsTest.java index e0ea0b2853a..371df15d416 100644 --- a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/java/org/kie/efesto/runtimemanager/core/utils/GeneratedResourceUtilsTest.java +++ b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/java/org/kie/efesto/runtimemanager/core/utils/GeneratedResourceUtilsTest.java @@ -75,7 +75,7 @@ void getGeneratedRedirectResourceFromJar() { private ClassLoader addJarToClassLoader() { ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader(); URL jarUrl = Thread.currentThread().getContextClassLoader().getResource("TestJar.jar"); - assertThat(jarUrl).isNotNull(); + assertThat(jarUrl).as("Run `mvn test` to build TestJar.jar").isNotNull(); URL fileUrl = Thread.currentThread().getContextClassLoader().getResource("IndexFile.testb_json"); assertThat(fileUrl).isNull(); URL[] urls = {jarUrl}; diff --git a/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/resources/TestJar.jar b/efesto/efesto-core/efesto-runtime-manager/efesto-runtime-manager-core/src/test/resources/TestJar.jar deleted file mode 100644 index 1778634bdd6c522888d62b1d4b2cf96d64284970..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 347 zcmWIWW@Zs#U|`^2I94bX`f1lizPUhN3nK%A2!jlRXI@HbgQQX3`+U; zwv0czTH@dJr=R!4+x;jJpKtI}+v28f_y^9uMI!tG-i%Cg%(y%&0rWNl1JK_LTN*(u b>|SSucpc5#0p6@^AU%vg7zLzXgE$NT!R2@p From a27fb09100f1af23571fde28fb160adc5f86babc Mon Sep 17 00:00:00 2001 From: Yeser Amer Date: Thu, 28 Nov 2024 14:16:54 +0100 Subject: [PATCH 2/4] [incubator-kie-issues#1627] Change log level from error to debug inside ImportDMNResolverUtil (#6172) * change log level * change log level * change log level --- .../org/kie/dmn/core/compiler/ImportDMNResolverUtil.java | 6 +++++- .../kie/dmn/core/compiler/ImportDMNResolverUtilTest.java | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/ImportDMNResolverUtil.java b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/ImportDMNResolverUtil.java index 8f44c678158..388a47c6088 100644 --- a/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/ImportDMNResolverUtil.java +++ b/kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/ImportDMNResolverUtil.java @@ -52,6 +52,10 @@ public static Either resolveImportDMN(Import importElement, Colle "Importing a DMN model with namespace={} name={} locationURI={}, modelName={}", importerDMNName, importerDMNNamespace, importNamespace, importName, importLocationURI, importModelName); + if (dmns.isEmpty()) { + return Either.ofLeft("Impossible to resolve an import against an empty DMN collection"); + } + List matchingDMNList = dmns.stream() .filter(m -> idExtractor.apply(m).getNamespaceURI().equals(importNamespace)) .toList(); @@ -64,7 +68,7 @@ public static Either resolveImportDMN(Import importElement, Colle importerDMNName, importerDMNNamespace, importNamespace, importName, importLocationURI, importModelName); return Either.ofRight(located); } else { - LOGGER.debug("DMN Model with name={} and namespace={} can't import a DMN with namespace={}, name={}, modelName={}, " + + LOGGER.error("DMN Model with name={} and namespace={} can't import a DMN with namespace={}, name={}, modelName={}, " + "located within namespace only {} but does not match for the actual modelName", importerDMNName, importerDMNNamespace, importNamespace, importName, importModelName, idExtractor.apply(located)); return Either.ofLeft(String.format( diff --git a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/ImportDMNResolverUtilTest.java b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/ImportDMNResolverUtilTest.java index 6368dee3cc9..2b7554d1d8d 100644 --- a/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/ImportDMNResolverUtilTest.java +++ b/kie-dmn/kie-dmn-core/src/test/java/org/kie/dmn/core/compiler/ImportDMNResolverUtilTest.java @@ -19,6 +19,7 @@ package org.kie.dmn.core.compiler; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -156,7 +157,6 @@ void locateInNSnoModelNameWithAlias2() { @Test void locateInNSAliasedBadScenario() { - // this is a BAD scenario are in namespace `nsA` there are 2 models with the same name. final Import i = makeImport("nsA", "aliased", "mA"); final List available = Arrays.asList(new QName("nsA", "mA"), new QName("nsA", "mA"), @@ -165,6 +165,13 @@ void locateInNSAliasedBadScenario() { assertThat(result.isLeft()).isTrue(); } + @Test + void emptyDMNCollection() { + final Import i = makeImport("nsA", "aliased", "mA"); + final Either result = ImportDMNResolverUtil.resolveImportDMN(i, Collections.emptyList(), Function.identity()); + assertThat(result.isLeft()).isTrue(); + } + private Import makeImport(final String namespace, final String name, final String modelName) { final Import i = new TImport(); i.setNamespace(namespace); From ebf19614810a2c1fdb2bc76a22dc45a87bc53e50 Mon Sep 17 00:00:00 2001 From: Paolo Bizzarri Date: Thu, 28 Nov 2024 16:29:54 +0100 Subject: [PATCH 3/4] [incubator-kie-drools-6136] Migrate drools test coverage to JUnit5 - #7 (#6175) * More tests migrated * Migrated tests to Junit5 * Migrated drools-core * Migrated alphanetwork compiler --- drools-alphanetwork-compiler/pom.xml | 6 +- .../ancompiler/AlphaNetworkCompilerTest.java | 139 +++++++++-------- .../ancompiler/AlphaNetworkInitTest.java | 38 +++-- .../org/drools/ancompiler/BaseModelTest.java | 63 ++++---- .../ancompiler/LargeAlphaNetworkTest.java | 14 +- .../ancompiler/MixedConstraintsTest.java | 18 +-- .../MultipleIndexableConstraintsTest.java | 14 +- .../drools/ancompiler/RangeIndexANCTest.java | 39 ++--- drools-core/pom.xml | 6 +- .../core/base/ClassTypeResolverTest.java | 2 +- .../org/drools/core/base/ValueTypeTest.java | 2 +- .../base/accumulators/VarianceNaNTest.java | 2 +- .../evaluators/TimeIntervalParserTest.java | 2 +- .../common/ClassAwareObjectStoreTest.java | 142 ++++++++++-------- .../core/common/DroolsObjectIOTest.java | 2 +- .../core/impl/KnowledgeBaseImplTest.java | 2 +- .../ByteArrayResourceSerializationTest.java | 2 +- .../impl/ByteArrayResourceToStringTest.java | 47 +++--- .../core/io/impl/ReaderResourceTest.java | 2 +- .../org/drools/core/reteoo/BaseNodeTest.java | 2 +- .../org/drools/core/reteoo/BetaNodeTest.java | 2 +- .../reteoo/DefaultFactHandleFactoryTest.java | 2 +- .../drools/core/reteoo/FactHandleTest.java | 2 +- .../drools/core/reteoo/MockLeftTupleSink.java | 2 - .../drools/core/reteoo/NodeTypeEnumTest.java | 2 +- .../drools/core/reteoo/ObjectSourceTest.java | 2 +- .../core/reteoo/ObjectTypeConfTest.java | 3 +- .../core/reteoo/TupleIterationTest.java | 6 +- .../drools/core/reteoo/TupleSourceTest.java | 2 +- .../reteoo/builder/ReteooRuleBuilderTest.java | 6 +- .../core/time/TemporalDistanceTest.java | 2 +- .../impl/CompositeMaxDurationTimerTest.java | 2 +- .../core/time/impl/CronExpressionTest.java | 7 +- .../drools/core/time/impl/CronJobTest.java | 3 +- .../core/time/impl/JDKTimerServiceTest.java | 2 +- .../time/impl/PseudoClockSchedulerTest.java | 14 +- .../drools/core/time/impl/Quartz601Test.java | 2 +- .../time/impl/SerializationTestSupport.java | 2 +- .../util/BinaryHeapPriorityQueueTest.java | 3 +- .../drools/core/util/BinaryHeapQueueTest.java | 7 +- .../org/drools/core/util/ClassUtilsTest.java | 2 +- .../util/IndexedHashtableIteratorTest.java | 2 +- .../org/drools/core/util/IoUtilsTest.java | 2 +- .../drools/core/util/KeyStoreHelperTest.java | 6 +- .../drools/core/util/KieFunctionsTest.java | 2 +- .../drools/core/util/LeftTupleRBTreeTest.java | 2 +- .../org/drools/core/util/LinkedListTest.java | 7 +- .../org/drools/core/util/MethodUtilsTest.java | 2 +- .../drools/core/util/RightTupleListTest.java | 3 +- .../drools/core/util/ScalablePoolTest.java | 2 +- .../drools/core/util/index/IndexUtilTest.java | 2 +- .../core/util/index/RangeIndexTest.java | 2 +- 52 files changed, 328 insertions(+), 323 deletions(-) diff --git a/drools-alphanetwork-compiler/pom.xml b/drools-alphanetwork-compiler/pom.xml index 3f1d6a7da7c..c3fe0de189e 100644 --- a/drools-alphanetwork-compiler/pom.xml +++ b/drools-alphanetwork-compiler/pom.xml @@ -82,10 +82,10 @@ test - org.kie - kie-test-util + org.junit.jupiter + junit-jupiter test - + org.assertj assertj-core diff --git a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/AlphaNetworkCompilerTest.java b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/AlphaNetworkCompilerTest.java index 4491f39eace..bee51fcf15f 100644 --- a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/AlphaNetworkCompilerTest.java +++ b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/AlphaNetworkCompilerTest.java @@ -27,7 +27,8 @@ import org.drools.core.reteoo.CompositeObjectSinkAdapter; import org.drools.core.reteoo.ObjectSinkPropagator; import org.drools.core.reteoo.ObjectTypeNode; -import org.junit.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.kie.api.KieServices; import org.kie.api.builder.ReleaseId; import org.kie.api.builder.model.KieModuleModel; @@ -39,9 +40,6 @@ public class AlphaNetworkCompilerTest extends BaseModelTest { - public AlphaNetworkCompilerTest(RUN_TYPE testRunType ) { - super( testRunType ); - } public class Message implements Serializable { private final String value; @@ -55,8 +53,9 @@ public String getValue() { } } - @Test - public void testNonHashedAlphaNode() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testNonHashedAlphaNode(RUN_TYPE testRunType) { String str = "import " + Person.class.getCanonicalName() + ";" + "global java.util.List resultsM;\n" + @@ -75,7 +74,7 @@ public void testNonHashedAlphaNode() { final List resultsM = new ArrayList<>(); final List resultsL = new ArrayList<>(); - KieSession ksession = getKieSession( str ); + KieSession ksession = getKieSession(testRunType, str); ksession.setGlobal("resultsM", resultsM); ksession.setGlobal("resultsL", resultsL); @@ -95,8 +94,9 @@ public void testNonHashedAlphaNode() { assertThat(resultsL.iterator().next()).isEqualTo(luca); } - @Test - public void testNormalizationForAlphaIndexing() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testNormalizationForAlphaIndexing(RUN_TYPE testRunType) { final String str = "package org.drools.test;\n" + "import " + Person.class.getCanonicalName() + ";\n" + @@ -113,7 +113,7 @@ public void testNormalizationForAlphaIndexing() { "then\n" + "end\n"; - final KieSession ksession = getKieSession(str); + final KieSession ksession = getKieSession(testRunType, str); ObjectTypeNode otn = ((NamedEntryPoint) ksession.getEntryPoint("DEFAULT")).getEntryPointNode().getObjectTypeNodes().entrySet() .stream() @@ -122,7 +122,7 @@ public void testNormalizationForAlphaIndexing() { .findFirst() .get(); ObjectSinkPropagator objectSinkPropagator = otn.getObjectSinkPropagator(); - if(this.testRunType.isAlphaNetworkCompiler()) { + if(testRunType.isAlphaNetworkCompiler()) { objectSinkPropagator = ((CompiledNetwork)objectSinkPropagator).getOriginalSinkPropagator(); } CompositeObjectSinkAdapter sinkAdaptor = (CompositeObjectSinkAdapter) objectSinkPropagator; @@ -135,8 +135,9 @@ public void testNormalizationForAlphaIndexing() { assertThat(ksession.fireAllRules()).isEqualTo(1); } - @Test - public void testNodeHashingWithMultipleConditions() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testNodeHashingWithMultipleConditions(RUN_TYPE testRunType) { String str = "import " + Person.class.getCanonicalName() + ";" + "global java.util.List results;\n" + @@ -156,7 +157,7 @@ public void testNodeHashingWithMultipleConditions() { final List results = new ArrayList<>(); - KieSession ksession = getKieSession( str ); + KieSession ksession = getKieSession(testRunType, str); ksession.setGlobal("results", results); @@ -175,8 +176,9 @@ public void testNodeHashingWithMultipleConditions() { } - @Test - public void testHashedInteger() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testHashedInteger(RUN_TYPE testRunType) { String str = "import " + Person.class.getCanonicalName() + ";" + "global java.util.List resultsM;\n" + @@ -195,7 +197,7 @@ public void testHashedInteger() { final List resultsM = new ArrayList<>(); final List resultsL = new ArrayList<>(); - KieSession ksession = getKieSession( str ); + KieSession ksession = getKieSession(testRunType, str); ksession.setGlobal("resultsM", resultsM); ksession.setGlobal("resultsL", resultsL); @@ -215,8 +217,9 @@ public void testHashedInteger() { assertThat(resultsL.iterator().next()).isEqualTo(luca); } - @Test - public void testAlphaConstraint() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testAlphaConstraint(RUN_TYPE testRunType) { String str = "rule \"Bind\"\n" + "when\n" + @@ -224,7 +227,7 @@ public void testAlphaConstraint() { "then\n" + "end"; - KieSession ksession = getKieSession(str); + KieSession ksession = getKieSession(testRunType, str); ksession.insert("Luca"); ksession.insert("Asdrubale"); @@ -232,8 +235,9 @@ public void testAlphaConstraint() { assertThat(ksession.fireAllRules()).isEqualTo(1); } - @Test - public void testAlphaConstraintsSwitchString() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testAlphaConstraintsSwitchString(RUN_TYPE testRunType) { String str = "import " + Person.class.getCanonicalName() + ";" + "rule \"Bind1\"\n" + @@ -252,7 +256,7 @@ public void testAlphaConstraintsSwitchString() { "then\n" + "end\n"; - KieSession ksession = getKieSession(str); + KieSession ksession = getKieSession(testRunType, str); ksession.insert(new Person("Luca")); ksession.insert(new Person("Asdrubale")); @@ -263,8 +267,9 @@ public void testAlphaConstraintsSwitchString() { /* This generates the switch but not the inlining */ - @Test - public void testAlphaConstraintsSwitchBigDecimal() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testAlphaConstraintsSwitchBigDecimal(RUN_TYPE testRunType) { String str = "import " + Person.class.getCanonicalName() + ";" + "import " + BigDecimal.class.getCanonicalName() + ";" + @@ -284,7 +289,7 @@ public void testAlphaConstraintsSwitchBigDecimal() { "then\n" + "end\n"; - KieSession ksession = getKieSession(str); + KieSession ksession = getKieSession(testRunType, str); ksession.insert(new Person("Luca", new BigDecimal(0))); ksession.insert(new Person("Asdrubale", new BigDecimal(10))); @@ -292,8 +297,9 @@ public void testAlphaConstraintsSwitchBigDecimal() { assertThat(ksession.fireAllRules()).isEqualTo(1); } - @Test - public void testAlphaConstraintsSwitchPerson() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testAlphaConstraintsSwitchPerson(RUN_TYPE testRunType) { String str = "import " + Person.class.getCanonicalName() + ";" + "rule \"Bind1\"\n" + @@ -312,7 +318,7 @@ public void testAlphaConstraintsSwitchPerson() { "then\n" + "end\n"; - KieSession ksession = getKieSession(str); + KieSession ksession = getKieSession(testRunType, str); ksession.insert(new Person("Luca")); ksession.insert(new Person("Asdrubale")); @@ -320,8 +326,9 @@ public void testAlphaConstraintsSwitchPerson() { assertThat(ksession.fireAllRules()).isEqualTo(1); } - @Test - public void testAlphaConstraintsSwitchIntegers() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testAlphaConstraintsSwitchIntegers(RUN_TYPE testRunType) { String str = "rule \"Bind1\"\n" + "when\n" + @@ -339,7 +346,7 @@ public void testAlphaConstraintsSwitchIntegers() { "then\n" + "end\n"; - KieSession ksession = getKieSession(str); + KieSession ksession = getKieSession(testRunType, str); ksession.insert("Luca"); ksession.insert("Asdrubale"); @@ -347,8 +354,9 @@ public void testAlphaConstraintsSwitchIntegers() { assertThat(ksession.fireAllRules()).isEqualTo(1); } - @Test - public void testEnum() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testEnum(RUN_TYPE testRunType) { String str = "import " + EnumFact1.class.getCanonicalName() + ";\n" + "import " + ChildFactWithEnum1.class.getCanonicalName() + ";\n" + @@ -365,14 +373,15 @@ public void testEnum() { "then\n" + "end\n"; - KieSession ksession = getKieSession(str); + KieSession ksession = getKieSession(testRunType, str); ksession.insert(new ChildFactWithEnum1(1, 3, EnumFact1.FIRST)); ksession.insert(new ChildFactWithEnum1(1, 3, EnumFact1.SECOND)); assertThat(ksession.fireAllRules()).isEqualTo(2); } - @Test - public void testAlphaConstraintWithModification() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testAlphaConstraintWithModification(RUN_TYPE testRunType) { String str = "global java.util.List results;\n" + "rule \"Bind\"\n" + @@ -382,7 +391,7 @@ public void testAlphaConstraintWithModification() { " results.add($s + \" is greater than 4 and smaller than 10\");\n" + "end"; - KieSession ksession = getKieSession(str); + KieSession ksession = getKieSession(testRunType, str); ksession.insert("Luca"); ksession.insert("Asdrubale"); @@ -396,8 +405,9 @@ public void testAlphaConstraintWithModification() { assertThat(results.iterator().next()).isEqualTo("Asdrubale is greater than 4 and smaller than 10"); } - @Test - public void testModify() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testModify(RUN_TYPE testRunType) { String str = "import " + Person.class.getCanonicalName() + ";" + "rule \"Modify\"\n" + @@ -407,7 +417,7 @@ public void testModify() { " modify($p) { setName($p.getName() + \"30\"); }" + "end"; - KieSession ksession = getKieSession(str); + KieSession ksession = getKieSession(testRunType, str); final Person luca = new Person("Luca", 30); ksession.insert(luca); @@ -418,8 +428,9 @@ public void testModify() { assertThat(luca.getName()).isEqualTo("Luca30"); } - @Test - public void testModify2() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testModify2(RUN_TYPE testRunType) { String str = "import " + Person.class.getCanonicalName() + ";" + "global java.util.List results;\n" + @@ -430,7 +441,7 @@ public void testModify2() { " modify($p) { setAge($p.getAge() + 1); }" + "end"; - KieSession ksession = getKieSession(str); + KieSession ksession = getKieSession(testRunType, str); final Person luca = new Person("Luca", 30); ksession.insert(luca); @@ -444,8 +455,9 @@ public void testModify2() { assertThat(luca.getAge() == 40).isTrue(); } - @Test - public void testAlphaConstraintNagate() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testAlphaConstraintNagate(RUN_TYPE testRunType) { final String str = "import " + Person.class.getCanonicalName() + ";\n" + "rule R1 when\n" + @@ -453,14 +465,15 @@ public void testAlphaConstraintNagate() { "then\n" + "end"; - try (KieSession ksession = getKieSession(str)) { + try (KieSession ksession = getKieSession(testRunType, str)) { ksession.insert(new Person("Mario", 45)); assertThat(ksession.fireAllRules()).isEqualTo(0); } } - @Test - public void testKJarUpgradeWithDeclaredType() throws Exception { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testKJarUpgradeWithDeclaredType(RUN_TYPE testRunType) throws Exception { String drl1 = "package org.drools.incremental\n" + "declare Message value : String end\n" + "rule Init when then insert(new Message( \"Hello World\" )); end\n" + @@ -495,30 +508,30 @@ public void testKJarUpgradeWithDeclaredType() throws Exception { ReleaseId releaseId1 = ks.newReleaseId( "org.kie", "test-upgrade", "1.0.0" ); KieModuleModel kieModuleModel = ks.newKieModuleModel(); - if(this.testRunType.isAlphaNetworkCompiler()) { + if(testRunType.isAlphaNetworkCompiler()) { kieModuleModel.setConfigurationProperty("drools.alphaNetworkCompiler", AlphaNetworkCompilerOption.INMEMORY.toString()); } - createAndDeployJar( ks, kieModuleModel, releaseId1, drl1, drl2_1 ); + createAndDeployJar(testRunType, ks, kieModuleModel, releaseId1, drl1, drl2_1); KieContainer kc = ks.newKieContainer( releaseId1 ); // Create a session and fire rules KieSession ksession = kc.newKieSession(); - if(this.testRunType.isAlphaNetworkCompiler()) { + if(testRunType.isAlphaNetworkCompiler()) { this.assertReteIsAlphaNetworkCompiled(ksession); } assertThat(ksession.fireAllRules()).isEqualTo(2); // Create a new jar for version 1.1.0 ReleaseId releaseId2 = ks.newReleaseId( "org.kie", "test-upgrade", "1.1.0" ); - createAndDeployJar( ks, kieModuleModel, releaseId2, drl1, drl2_2 ); + createAndDeployJar(testRunType, ks, kieModuleModel, releaseId2, drl1, drl2_2 ); // try to update the container to version 1.1.0 kc.updateToVersion( releaseId2 ); // try with a new session KieSession ksession2 = kc.newKieSession(); - if(this.testRunType.isAlphaNetworkCompiler()) { + if(testRunType.isAlphaNetworkCompiler()) { this.assertReteIsAlphaNetworkCompiled(ksession2); } @@ -526,12 +539,12 @@ public void testKJarUpgradeWithDeclaredType() throws Exception { // Create a new jar for version 1.2.0 ReleaseId releaseId3 = ks.newReleaseId( "org.kie", "test-upgrade", "1.2.0" ); - createAndDeployJar( ks, kieModuleModel, releaseId3, drl1, drl2_3 ); + createAndDeployJar(testRunType, ks, kieModuleModel, releaseId3, drl1, drl2_3); // try to update the container to version 1.2.0 kc.updateToVersion( releaseId3 ); KieSession kieSession3 = kc.newKieSession(); - if(this.testRunType.isAlphaNetworkCompiler()) { + if(testRunType.isAlphaNetworkCompiler()) { this.assertReteIsAlphaNetworkCompiled(kieSession3); } @@ -542,8 +555,9 @@ public void testKJarUpgradeWithDeclaredType() throws Exception { assertThat(list.get(0)).isEqualTo("Hello World"); } - @Test - public void testNodeHashingWith2LevelConditionsCheckFirstCondition() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testNodeHashingWith2LevelConditionsCheckFirstCondition(RUN_TYPE testRunType) { // DROOLS-7137 String str = "import " + Person.class.getCanonicalName() + ";" + @@ -566,7 +580,7 @@ public void testNodeHashingWith2LevelConditionsCheckFirstCondition() { final List results = new ArrayList<>(); - KieSession ksession = getKieSession(str); + KieSession ksession = getKieSession(testRunType, str); ksession.setGlobal("results", results); @@ -584,8 +598,9 @@ public void testNodeHashingWith2LevelConditionsCheckFirstCondition() { assertThat(results).containsExactlyInAnyOrder(luca20, luca18); } - @Test - public void testNodeHashingWith2LevelConditionsCheckFirstConditionWithLong() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testNodeHashingWith2LevelConditionsCheckFirstConditionWithLong(RUN_TYPE testRunType) { // DROOLS-7137 String str = "import " + Person.class.getCanonicalName() + ";" + @@ -608,7 +623,7 @@ public void testNodeHashingWith2LevelConditionsCheckFirstConditionWithLong() { final List results = new ArrayList<>(); - KieSession ksession = getKieSession(str); + KieSession ksession = getKieSession(testRunType, str); ksession.setGlobal("results", results); diff --git a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/AlphaNetworkInitTest.java b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/AlphaNetworkInitTest.java index 385b150935c..7ecce9c0510 100644 --- a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/AlphaNetworkInitTest.java +++ b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/AlphaNetworkInitTest.java @@ -20,41 +20,37 @@ import java.util.ArrayList; import java.util.List; +import java.util.stream.Stream; -import org.junit.Test; -import org.junit.runners.Parameterized; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.kie.api.runtime.KieSession; import static org.assertj.core.api.Assertions.assertThat; public class AlphaNetworkInitTest extends BaseModelTest { - public AlphaNetworkInitTest(RUN_TYPE testRunType) { - super(testRunType); - } - // ANC is assembled manually - final static Object[] STANDARD = { - RUN_TYPE.STANDARD_FROM_DRL, - }; - - @Parameterized.Parameters(name = "{0}") - public static Object[] params() { - return STANDARD; + public static Stream parameters() { + return Stream.of(RUN_TYPE.STANDARD_FROM_DRL); } - @Test // DROOLS-6336 - public void testGenerateAndSetInMemoryANC() { + // DROOLS-6336 + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testGenerateAndSetInMemoryANC(RUN_TYPE testRunType) { final List results = new ArrayList<>(); - KieSession kSession = setupKieSession(); + KieSession kSession = setupKieSession(testRunType); KieBaseUpdaterANC.generateAndSetInMemoryANC(kSession.getKieBase()); assertResult(results, kSession); } - @Test // DROOLS-6336 - public void testGenerateAndSetInMemoryANCCalledTwice() { + // DROOLS-6336 + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testGenerateAndSetInMemoryANCCalledTwice(RUN_TYPE testRunType) { final List results = new ArrayList<>(); - KieSession kSession = setupKieSession(); + KieSession kSession = setupKieSession(testRunType); KieBaseUpdaterANC.generateAndSetInMemoryANC(kSession.getKieBase()); KieBaseUpdaterANC.generateAndSetInMemoryANC(kSession.getKieBase()); assertResult(results, kSession); @@ -69,7 +65,7 @@ private void assertResult(List results, KieSession ksession) { assertThat(results).containsExactly(jamesBond); } - private KieSession setupKieSession() { + private KieSession setupKieSession(RUN_TYPE testRunType) { String str = "import " + Person.class.getCanonicalName() + ";" + "global java.util.List results;\n" + @@ -80,7 +76,7 @@ private KieSession setupKieSession() { " results.add($p);\n" + "end"; - KieSession ksession = getKieSession(str); + KieSession ksession = getKieSession(testRunType, str); return ksession; } } diff --git a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/BaseModelTest.java b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/BaseModelTest.java index a12810095f0..7407ad43947 100644 --- a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/BaseModelTest.java +++ b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/BaseModelTest.java @@ -21,6 +21,7 @@ import java.util.List; import java.util.UUID; import java.util.stream.Collectors; +import java.util.stream.Stream; import org.drools.compiler.kie.builder.impl.DrlProject; import org.drools.compiler.kie.builder.impl.InternalKieModule; @@ -28,9 +29,6 @@ import org.drools.core.reteoo.Rete; import org.drools.kiesession.rulebase.InternalKnowledgeBase; import org.drools.model.codegen.ExecutableModelProject; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; import org.kie.api.KieServices; import org.kie.api.builder.KieBuilder; import org.kie.api.builder.KieFileSystem; @@ -46,7 +44,6 @@ import static org.assertj.core.api.Assertions.fail; // Copied from org.drools.modelcompiler.BaseModelTest. To be removed after https://issues.redhat.com/browse/DROOLS-5485 -@RunWith(Parameterized.class) public abstract class BaseModelTest { public enum RUN_TYPE { PATTERN_DSL( false ), @@ -66,61 +63,59 @@ public boolean isAlphaNetworkCompiler() { } - final static Object[] WITH_ALPHA_NETWORK = { + final static RUN_TYPE[] WITH_ALPHA_NETWORK = { RUN_TYPE.STANDARD_FROM_DRL, RUN_TYPE.PATTERN_DSL, RUN_TYPE.STANDARD_WITH_ALPHA_NETWORK, RUN_TYPE.PATTERN_WITH_ALPHA_NETWORK, }; - @Parameters(name = "{0}") public static Object[] params() { return WITH_ALPHA_NETWORK; } - - protected final RUN_TYPE testRunType; - - public BaseModelTest(RUN_TYPE testRunType ) { - this.testRunType = testRunType; + + public static Stream parameters() { + return Stream.of(WITH_ALPHA_NETWORK); } - protected KieSession getKieSession(String... rules) { + + protected KieSession getKieSession(RUN_TYPE testRunType, String... rules) { KieModuleModel model = testRunType.isAlphaNetworkCompiler() ? getKieModuleModelWithAlphaNetworkCompiler() : null; - return getKieSession(model, rules); + return getKieSession(testRunType, model, rules); } - protected KieSession getKieSession(KieModuleModel model, String... stringRules) { - return getKieContainer( model, stringRules ).newKieSession(); + protected KieSession getKieSession(RUN_TYPE testRunType, KieModuleModel model, String... stringRules) { + return getKieContainer(testRunType, model, stringRules ).newKieSession(); } - protected KieContainer getKieContainer( String... stringRules ) { + protected KieContainer getKieContainer(RUN_TYPE testRunType, String... stringRules ) { KieModuleModel model = testRunType.isAlphaNetworkCompiler() ? getKieModuleModelWithAlphaNetworkCompiler() : null; - return getKieContainer( model, toKieFiles( stringRules ) ); + return getKieContainer(testRunType, model, toKieFiles( stringRules ) ); } - protected KieContainer getKieContainer( KieModuleModel model, String... stringRules ) { - return getKieContainer( model, toKieFiles( stringRules ) ); + protected KieContainer getKieContainer(RUN_TYPE testRunType, KieModuleModel model, String... stringRules ) { + return getKieContainer(testRunType, model, toKieFiles( stringRules ) ); } - protected KieContainer getKieContainer( KieModuleModel model, KieFile... stringRules ) { + protected KieContainer getKieContainer(RUN_TYPE testRunType, KieModuleModel model, KieFile... stringRules ) { KieServices ks = KieServices.get(); ReleaseId releaseId = ks.newReleaseId( "org.kie", "kjar-test-" + UUID.randomUUID(), "1.0" ); - KieBuilder kieBuilder = createKieBuilder( ks, model, releaseId, stringRules ); + KieBuilder kieBuilder = createKieBuilder(testRunType, ks, model, releaseId, stringRules ); return ks.newKieContainer( releaseId ); } - protected KieBuilder createKieBuilder( String... stringRules ) { + protected KieBuilder createKieBuilder(RUN_TYPE testRunType, String... stringRules ) { KieServices ks = KieServices.get(); ReleaseId releaseId = ks.newReleaseId( "org.kie", "kjar-test-" + UUID.randomUUID(), "1.0" ); - return createKieBuilder( ks, null, releaseId, false, toKieFiles( stringRules ) ); + return createKieBuilder(testRunType, ks, null, releaseId, false, toKieFiles( stringRules ) ); } - protected KieBuilder createKieBuilder( KieServices ks, KieModuleModel model, ReleaseId releaseId, KieFile... stringRules ) { - return createKieBuilder( ks, model, releaseId, true, stringRules ); + protected KieBuilder createKieBuilder(RUN_TYPE testRunType, KieServices ks, KieModuleModel model, ReleaseId releaseId, KieFile... stringRules ) { + return createKieBuilder(testRunType, ks, model, releaseId, true, stringRules ); } - protected KieBuilder createKieBuilder( KieServices ks, KieModuleModel model, ReleaseId releaseId, boolean failIfBuildError, KieFile... stringRules ) { + protected KieBuilder createKieBuilder(RUN_TYPE testRunType, KieServices ks, KieModuleModel model, ReleaseId releaseId, boolean failIfBuildError, KieFile... stringRules ) { ks.getRepository().removeKieModule( releaseId ); KieFileSystem kfs = ks.newKieFileSystem(); @@ -159,20 +154,20 @@ public static List getObjectsIntoList(KieSession ksession, Class clazz return ksession.getInstancesOf(clazz).stream().collect(Collectors.toList()); } - protected void createAndDeployJar( KieServices ks, ReleaseId releaseId, String... drls ) { - createAndDeployJar( ks, null, releaseId, drls ); + protected void createAndDeployJar(RUN_TYPE testRunType, KieServices ks, ReleaseId releaseId, String... drls ) { + createAndDeployJar(testRunType, ks, null, releaseId, drls ); } - protected void createAndDeployJar( KieServices ks, ReleaseId releaseId, KieFile... ruleFiles ) { - createAndDeployJar( ks, null, releaseId, ruleFiles ); + protected void createAndDeployJar(RUN_TYPE testRunType, KieServices ks, ReleaseId releaseId, KieFile... ruleFiles ) { + createAndDeployJar(testRunType, ks, null, releaseId, ruleFiles ); } - protected void createAndDeployJar( KieServices ks, KieModuleModel model, ReleaseId releaseId, String... drls ) { - createAndDeployJar( ks, model, releaseId, toKieFiles( drls ) ); + protected void createAndDeployJar(RUN_TYPE testRunType, KieServices ks, KieModuleModel model, ReleaseId releaseId, String... drls ) { + createAndDeployJar(testRunType, ks, model, releaseId, toKieFiles( drls ) ); } - protected void createAndDeployJar( KieServices ks, KieModuleModel model, ReleaseId releaseId, KieFile... ruleFiles ) { - KieBuilder kieBuilder = createKieBuilder( ks, model, releaseId, ruleFiles ); + protected void createAndDeployJar(RUN_TYPE testRunType, KieServices ks, KieModuleModel model, ReleaseId releaseId, KieFile... ruleFiles ) { + KieBuilder kieBuilder = createKieBuilder(testRunType, ks, model, releaseId, ruleFiles ); InternalKieModule kieModule = (InternalKieModule) kieBuilder.getKieModule(); ks.getRepository().addKieModule( kieModule ); } diff --git a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/LargeAlphaNetworkTest.java b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/LargeAlphaNetworkTest.java index ce1bb10992a..326891e966a 100644 --- a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/LargeAlphaNetworkTest.java +++ b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/LargeAlphaNetworkTest.java @@ -20,20 +20,18 @@ import java.util.ArrayList; -import org.junit.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.kie.api.runtime.KieSession; import static org.assertj.core.api.Assertions.assertThat; public class LargeAlphaNetworkTest extends BaseModelTest { - public LargeAlphaNetworkTest(RUN_TYPE testRunType) { - super(testRunType); - } - - @Test - public void testLargeCompiledAlphaNetwork() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testLargeCompiledAlphaNetwork(RUN_TYPE testRunType) { final StringBuilder rule = new StringBuilder("global java.util.List results;\n" + "import " + Person.class.getCanonicalName() + ";\n"); @@ -43,7 +41,7 @@ public void testLargeCompiledAlphaNetwork() { rule.append(ruleWithIndex(i)); } - try (KieSession ksession = getKieSession(rule.toString())) { + try (KieSession ksession = getKieSession(testRunType, rule.toString())) { ArrayList results = new ArrayList<>(); ksession.setGlobal("results", results); Person a = new Person("a", 1); diff --git a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MixedConstraintsTest.java b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MixedConstraintsTest.java index ac6321acca5..26cce445d9f 100644 --- a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MixedConstraintsTest.java +++ b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MixedConstraintsTest.java @@ -20,23 +20,21 @@ import java.util.ArrayList; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.kie.api.runtime.KieSession; import static org.assertj.core.api.Assertions.assertThat; public class MixedConstraintsTest extends BaseModelTest { - public MixedConstraintsTest(RUN_TYPE testRunType) { - super(testRunType); - } - // When we have the startsWith constraint before the indexed constraint age == index the compiled alpha network // generation is wrong see DROOLS-5948 - @Test - @Ignore - public void testMixedConstraints() { + @Disabled + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testMixedConstraints(RUN_TYPE testRunType) { final StringBuilder rule = new StringBuilder("global java.util.List results;\n" + "import " + Person.class.getCanonicalName() + ";\n"); @@ -46,7 +44,7 @@ public void testMixedConstraints() { rule.append(ruleWithIndex(i)); } - try (KieSession ksession = getKieSession(rule.toString())) { + try (KieSession ksession = getKieSession(testRunType, rule.toString())) { ArrayList results = new ArrayList<>(); ksession.setGlobal("results", results); Person a = new Person("a", 1); diff --git a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MultipleIndexableConstraintsTest.java b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MultipleIndexableConstraintsTest.java index 431c4bce881..49c6e350b9e 100644 --- a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MultipleIndexableConstraintsTest.java +++ b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/MultipleIndexableConstraintsTest.java @@ -20,22 +20,20 @@ import java.util.ArrayList; -import org.junit.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.kie.api.runtime.KieSession; import static org.assertj.core.api.Assertions.assertThat; public class MultipleIndexableConstraintsTest extends BaseModelTest { - public MultipleIndexableConstraintsTest(RUN_TYPE testRunType) { - super(testRunType); - } - /* Currently we don't support multiple indexable constraints in the ANC, so this test will pass because it disables the switch generation and the inlining. See DROOLS-5947 */ - @Test - public void testMultipleIndexedConstraintTest() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testMultipleIndexedConstraintTest(RUN_TYPE testRunType) { final StringBuilder rule = new StringBuilder("global java.util.List results;\n" + "import " + Person.class.getCanonicalName() + ";\n"); @@ -45,7 +43,7 @@ public void testMultipleIndexedConstraintTest() { rule.append(ruleWithIndex(i)); } - try (KieSession ksession = getKieSession(rule.toString())) { + try (KieSession ksession = getKieSession(testRunType, rule.toString())) { ArrayList results = new ArrayList<>(); ksession.setGlobal("results", results); Person a = new Person("a", 1); diff --git a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/RangeIndexANCTest.java b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/RangeIndexANCTest.java index fe64111579f..cd33f39d09d 100644 --- a/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/RangeIndexANCTest.java +++ b/drools-alphanetwork-compiler/src/test/java/org/drools/ancompiler/RangeIndexANCTest.java @@ -21,7 +21,8 @@ import java.util.ArrayList; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.kie.api.KieBase; import org.kie.api.KieBaseConfiguration; import org.kie.api.KieServices; @@ -33,12 +34,9 @@ public class RangeIndexANCTest extends BaseModelTest { - public RangeIndexANCTest(RUN_TYPE testRunType) { - super(testRunType); - } - - @Test - public void testInteger() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testInteger(RUN_TYPE testRunType) { final String drl = "package org.drools.compiler.test\n" + "import " + Person.class.getCanonicalName() + "\n" + @@ -52,7 +50,7 @@ public void testInteger() { " Person( age > 8 )\n" + "then\n end\n"; - final KieBase kbase = createKieBaseWithRangeIndexThresholdValue(drl, 3); + final KieBase kbase = createKieBaseWithRangeIndexThresholdValue(testRunType, drl, 3); final KieSession ksession = kbase.newKieSession(); ksession.insert(new Person("John", 18)); @@ -64,15 +62,16 @@ public void testInteger() { assertThat(fired).isEqualTo(2); } - private KieBase createKieBaseWithRangeIndexThresholdValue(String drl, int rangeIndexThresholdValue) { - final KieContainer kieContainer = getKieContainer(drl); + private KieBase createKieBaseWithRangeIndexThresholdValue(RUN_TYPE testRunType, String drl, int rangeIndexThresholdValue) { + final KieContainer kieContainer = getKieContainer(testRunType, drl); final KieBaseConfiguration kieBaseConfiguration = KieServices.get().newKieBaseConfiguration(); kieBaseConfiguration.setOption(AlphaRangeIndexThresholdOption.get(rangeIndexThresholdValue)); // for test convenience. Default value is AlphaRangeIndexThresholdOption.DEFAULT_VALUE return kieContainer.newKieBase(kieBaseConfiguration); } - @Test - public void testMixedRangeHashAndOther() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testMixedRangeHashAndOther(RUN_TYPE testRunType) { final String drl = "package org.drools.compiler.test\n" + "import " + Person.class.getCanonicalName() + "\n" + "global java.util.List results;\n" + @@ -112,7 +111,7 @@ public void testMixedRangeHashAndOther() { " results.add(drools.getRule().getName());" + "end\n"; - final KieBase kbase = createKieBaseWithRangeIndexThresholdValue(drl, 3); + final KieBase kbase = createKieBaseWithRangeIndexThresholdValue(testRunType, drl, 3); final KieSession ksession = kbase.newKieSession(); List results = new ArrayList<>(); @@ -128,8 +127,9 @@ public void testMixedRangeHashAndOther() { assertThat(results).containsOnly("test1", "test3", "test4", "test7"); } - @Test - public void testChainRange() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testChainRange(RUN_TYPE testRunType) { final String drl = "package com.sample\n" + "import " + Person.class.getCanonicalName() + "\n" + "global java.util.List results;\n" + @@ -164,7 +164,7 @@ public void testChainRange() { " results.add(drools.getRule().getName());" + "end"; - final KieBase kbase = createKieBaseWithRangeIndexThresholdValue(drl, 3); + final KieBase kbase = createKieBaseWithRangeIndexThresholdValue(testRunType, drl, 3); final KieSession ksession = kbase.newKieSession(); List results = new ArrayList<>(); @@ -181,8 +181,9 @@ public void testChainRange() { results.clear(); } - @Test - public void testRangeWithBeta() { + @ParameterizedTest(name = "{0}") + @MethodSource("parameters") + public void testRangeWithBeta(RUN_TYPE testRunType) { final String drl = "package com.sample\n" + "import " + Person.class.getCanonicalName() + "\n" + "global java.util.List results;\n" + @@ -214,7 +215,7 @@ public void testRangeWithBeta() { " results.add(drools.getRule().getName());" + "end"; - final KieBase kbase = createKieBaseWithRangeIndexThresholdValue(drl, 3); + final KieBase kbase = createKieBaseWithRangeIndexThresholdValue(testRunType, drl, 3); final KieSession ksession = kbase.newKieSession(); List results = new ArrayList<>(); diff --git a/drools-core/pom.xml b/drools-core/pom.xml index 098b30fa9ab..f97f1681d1d 100644 --- a/drools-core/pom.xml +++ b/drools-core/pom.xml @@ -136,10 +136,10 @@ - junit - junit + org.junit.jupiter + junit-jupiter test - + org.assertj assertj-core diff --git a/drools-core/src/test/java/org/drools/core/base/ClassTypeResolverTest.java b/drools-core/src/test/java/org/drools/core/base/ClassTypeResolverTest.java index 55cfd83dc62..e49599985f6 100644 --- a/drools-core/src/test/java/org/drools/core/base/ClassTypeResolverTest.java +++ b/drools-core/src/test/java/org/drools/core/base/ClassTypeResolverTest.java @@ -25,7 +25,7 @@ import org.drools.core.test.model.SecondClass; import org.drools.util.ClassTypeResolver; import org.drools.util.TypeResolver; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/drools-core/src/test/java/org/drools/core/base/ValueTypeTest.java b/drools-core/src/test/java/org/drools/core/base/ValueTypeTest.java index f40d67e35b8..93214e55311 100755 --- a/drools-core/src/test/java/org/drools/core/base/ValueTypeTest.java +++ b/drools-core/src/test/java/org/drools/core/base/ValueTypeTest.java @@ -19,7 +19,7 @@ package org.drools.core.base; import org.drools.base.base.ValueType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/base/accumulators/VarianceNaNTest.java b/drools-core/src/test/java/org/drools/core/base/accumulators/VarianceNaNTest.java index a17cb635787..23624d15ff3 100644 --- a/drools-core/src/test/java/org/drools/core/base/accumulators/VarianceNaNTest.java +++ b/drools-core/src/test/java/org/drools/core/base/accumulators/VarianceNaNTest.java @@ -19,7 +19,7 @@ package org.drools.core.base.accumulators; import org.drools.core.base.accumulators.VarianceAccumulateFunction.VarianceData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.within; diff --git a/drools-core/src/test/java/org/drools/core/base/evaluators/TimeIntervalParserTest.java b/drools-core/src/test/java/org/drools/core/base/evaluators/TimeIntervalParserTest.java index c4a79c1d8ff..eaf46b7555f 100644 --- a/drools-core/src/test/java/org/drools/core/base/evaluators/TimeIntervalParserTest.java +++ b/drools-core/src/test/java/org/drools/core/base/evaluators/TimeIntervalParserTest.java @@ -19,7 +19,7 @@ package org.drools.core.base.evaluators; import org.drools.base.util.TimeIntervalParser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/common/ClassAwareObjectStoreTest.java b/drools-core/src/test/java/org/drools/core/common/ClassAwareObjectStoreTest.java index 16fa5b0cfc1..6d8d618304a 100644 --- a/drools-core/src/test/java/org/drools/core/common/ClassAwareObjectStoreTest.java +++ b/drools-core/src/test/java/org/drools/core/common/ClassAwareObjectStoreTest.java @@ -26,46 +26,49 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; +import java.util.stream.Stream; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import static org.assertj.core.api.Assertions.assertThat; -@RunWith(Parameterized.class) public class ClassAwareObjectStoreTest { - private final ClassAwareObjectStore underTest; - @Test - public void iterateObjectsReturnsObjectsOfAllTypes() throws Exception { + @ParameterizedTest + @MethodSource("parameters") + public void iterateObjectsReturnsObjectsOfAllTypes(ClassAwareObjectStore underTest) throws Exception { String aStringValue = "a string"; BigDecimal bigDecimalValue = new BigDecimal("1"); - insertObjectWithFactHandle(aStringValue); - insertObjectWithFactHandle(bigDecimalValue); + underTest.addHandle(handleFor(aStringValue), aStringValue); + underTest.addHandle(handleFor(bigDecimalValue), bigDecimalValue); Collection result = collect(underTest.iterateObjects()); assertThat(result).hasSize(2); } - @Test - public void iterateByClassFiltersByClass() { + @ParameterizedTest + @MethodSource("parameters") + public void iterateByClassFiltersByClass(ClassAwareObjectStore underTest) { SimpleClass object = new SimpleClass(); - insertObjectWithFactHandle("some string"); - insertObjectWithFactHandle(object); + underTest.addHandle(handleFor("some string"), "some string"); + underTest.addHandle(handleFor(object), object); Collection results = collect(underTest.iterateObjects(SimpleClass.class)); assertThat(results).hasSize(1); assertThat(results).contains(object); } - @Test - public void queryBySuperTypeFindsSubType() throws Exception { - insertObjectWithFactHandle(new SubClass()); - insertObjectWithFactHandle(new SuperClass()); + @ParameterizedTest + @MethodSource("parameters") + public void queryBySuperTypeFindsSubType(ClassAwareObjectStore underTest) throws Exception { + Object objectToInsert = new SubClass(); + underTest.addHandle(handleFor(objectToInsert), objectToInsert); + Object objectToInsert1 = new SuperClass(); + underTest.addHandle(handleFor(objectToInsert1), objectToInsert1); Collection result = collect(underTest.iterateObjects(SuperClass.class)); @@ -74,10 +77,13 @@ public void queryBySuperTypeFindsSubType() throws Exception { assertThat(result).hasAtLeastOneElementOfType(SuperClass.class); } - @Test - public void queryBySubtypeDoesNotReturnSuperType() throws Exception { - insertObjectWithFactHandle(new SubClass()); - insertObjectWithFactHandle(new SuperClass()); + @ParameterizedTest + @MethodSource("parameters") + public void queryBySubtypeDoesNotReturnSuperType(ClassAwareObjectStore underTest) throws Exception { + Object objectToInsert = new SubClass(); + underTest.addHandle(handleFor(objectToInsert), objectToInsert); + Object objectToInsert1 = new SuperClass(); + underTest.addHandle(handleFor(objectToInsert1), objectToInsert1); Collection result = collect(underTest.iterateObjects(SubClass.class)); @@ -88,11 +94,14 @@ public void queryBySubtypeDoesNotReturnSuperType() throws Exception { /** * Should have identical results to {@link #queryBySuperTypeFindsSubType()} */ - @Test - public void queryBySubTypeDoesNotPreventInsertionsBeingPropogatedToSuperTypeQueries() throws Exception { - insertObjectWithFactHandle(new SuperClass()); + @ParameterizedTest + @MethodSource("parameters") + public void queryBySubTypeDoesNotPreventInsertionsBeingPropogatedToSuperTypeQueries(ClassAwareObjectStore underTest) throws Exception { + Object objectToInsert = new SuperClass(); + underTest.addHandle(handleFor(objectToInsert), objectToInsert); collect(underTest.iterateObjects(SubClass.class)); - insertObjectWithFactHandle(new SubClass()); + Object objectToInsert1 = new SubClass(); + underTest.addHandle(handleFor(objectToInsert1), objectToInsert1); Collection result = collect(underTest.iterateObjects(SuperClass.class)); @@ -101,9 +110,11 @@ public void queryBySubTypeDoesNotPreventInsertionsBeingPropogatedToSuperTypeQuer assertThat(result).hasAtLeastOneElementOfType(SuperClass.class); } - @Test - public void queryBySuperTypeCanFindSubTypeWhenNoSuperTypeInstancesAreInStore() throws Exception { - insertObjectWithFactHandle(new SubClass()); + @ParameterizedTest + @MethodSource("parameters") + public void queryBySuperTypeCanFindSubTypeWhenNoSuperTypeInstancesAreInStore(ClassAwareObjectStore underTest) throws Exception { + Object objectToInsert = new SubClass(); + underTest.addHandle(handleFor(objectToInsert), objectToInsert); Collection result = collect(underTest.iterateObjects(SuperClass.class)); @@ -111,10 +122,13 @@ public void queryBySuperTypeCanFindSubTypeWhenNoSuperTypeInstancesAreInStore() t assertThat(result).hasAtLeastOneElementOfType(SubClass.class); } - @Test - public void isOkayToReinsertSameTypeThenQuery() throws Exception { - insertObjectWithFactHandle(new SubClass()); - insertObjectWithFactHandle(new SubClass()); + @ParameterizedTest + @MethodSource("parameters") + public void isOkayToReinsertSameTypeThenQuery(ClassAwareObjectStore underTest) throws Exception { + Object objectToInsert = new SubClass(); + underTest.addHandle(handleFor(objectToInsert), objectToInsert); + Object objectToInsert1 = new SubClass(); + underTest.addHandle(handleFor(objectToInsert1), objectToInsert1); Collection result = collect(underTest.iterateObjects(SuperClass.class)); @@ -124,12 +138,15 @@ public void isOkayToReinsertSameTypeThenQuery() throws Exception { assertThat(new HashSet(result)).hasSize(2); } - @Test - public void onceSuperClassIsSetUpForReadingItCanBecomeSetUpForWritingWithoutGettingDuplicateQueryReturns() throws Exception { + @ParameterizedTest + @MethodSource("parameters") + public void onceSuperClassIsSetUpForReadingItCanBecomeSetUpForWritingWithoutGettingDuplicateQueryReturns(ClassAwareObjectStore underTest) throws Exception { assertThat(collect(underTest.iterateObjects(SuperClass.class)).isEmpty()).isTrue(); + Object objectToInsert = new SubClass(); - insertObjectWithFactHandle(new SubClass()); - insertObjectWithFactHandle(new SuperClass()); + underTest.addHandle(handleFor(objectToInsert), objectToInsert); + Object objectToInsert1 = new SuperClass(); + underTest.addHandle(handleFor(objectToInsert1), objectToInsert1); Collection result = collect(underTest.iterateObjects(SuperClass.class)); @@ -139,9 +156,11 @@ public void onceSuperClassIsSetUpForReadingItCanBecomeSetUpForWritingWithoutGett assertThat(new HashSet(result)).hasSize(2); } - @Test - public void clearRemovesInsertedObjects() throws Exception { - insertObjectWithFactHandle(new SimpleClass()); + @ParameterizedTest + @MethodSource("parameters") + public void clearRemovesInsertedObjects(ClassAwareObjectStore underTest) throws Exception { + Object objectToInsert = new SimpleClass(); + underTest.addHandle(handleFor(objectToInsert), objectToInsert); assertThat(collect(underTest.iterateObjects())).hasSize(1); underTest.clear(); @@ -149,10 +168,13 @@ public void clearRemovesInsertedObjects() throws Exception { assertThat(collect(underTest.iterateObjects())).hasSize(0); } - @Test - public void canIterateOverObjectsUsingCustomFilter() throws Exception { - insertObjectWithFactHandle(new SuperClass()); - insertObjectWithFactHandle(new SubClass()); + @ParameterizedTest + @MethodSource("parameters") + public void canIterateOverObjectsUsingCustomFilter(ClassAwareObjectStore underTest) throws Exception { + Object objectToInsert = new SuperClass(); + underTest.addHandle(handleFor(objectToInsert), objectToInsert); + Object objectToInsert1 = new SubClass(); + underTest.addHandle(handleFor(objectToInsert1), objectToInsert1); Collection result = collect(underTest.iterateObjects(SubClass.class::isInstance)); @@ -160,24 +182,19 @@ public void canIterateOverObjectsUsingCustomFilter() throws Exception { assertThat(result).hasAtLeastOneElementOfType(SubClass.class); } - @Test - public void iteratingOverFactHandlesHasSameNumberOfResultsAsIteratingOverObjects() throws Exception { - insertObjectWithFactHandle(new SuperClass()); - insertObjectWithFactHandle(new SubClass()); + @ParameterizedTest + @MethodSource("parameters") + public void iteratingOverFactHandlesHasSameNumberOfResultsAsIteratingOverObjects(ClassAwareObjectStore underTest) throws Exception { + Object objectToInsert = new SuperClass(); + underTest.addHandle(handleFor(objectToInsert), objectToInsert); + Object objectToInsert1 = new SubClass(); + underTest.addHandle(handleFor(objectToInsert1), objectToInsert1); assertThat(collect(underTest.iterateFactHandles(SubClass.class))).hasSize(1); assertThat(collect(underTest.iterateFactHandles(SuperClass.class))).hasSize(2); } - private void insertObjectWithFactHandle(Object objectToInsert) { - underTest.addHandle(handleFor(objectToInsert), objectToInsert); - } - - public ClassAwareObjectStore getUnderTest() { - return underTest; - } - private static Collection collect(Iterator objects) { List result = new ArrayList(); while (objects.hasNext()) { @@ -185,17 +202,10 @@ private static Collection collect(Iterator objects) { } return result; } - - public ClassAwareObjectStoreTest(boolean isEqualityBehaviour) { - underTest = new ClassAwareObjectStore(isEqualityBehaviour, new ReentrantLock()); - } - - @Parameterized.Parameters - public static Collection ruleBaseConfigurations() { - List configurations = new ArrayList(2); - configurations.add(new Object[]{true}); - configurations.add(new Object[]{false}); - return configurations; + + public static Stream parameters() { + return Stream.of(new ClassAwareObjectStore(true, new ReentrantLock()), + new ClassAwareObjectStore(false, new ReentrantLock())); } private static final AtomicInteger factCounter = new AtomicInteger(0); diff --git a/drools-core/src/test/java/org/drools/core/common/DroolsObjectIOTest.java b/drools-core/src/test/java/org/drools/core/common/DroolsObjectIOTest.java index b396ff02dcf..55a4306b6f1 100644 --- a/drools-core/src/test/java/org/drools/core/common/DroolsObjectIOTest.java +++ b/drools-core/src/test/java/org/drools/core/common/DroolsObjectIOTest.java @@ -39,7 +39,7 @@ import org.drools.base.rule.GroupElement; import org.drools.core.reteoo.CoreComponentFactory; import org.drools.core.util.DroolsStreamUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/impl/KnowledgeBaseImplTest.java b/drools-core/src/test/java/org/drools/core/impl/KnowledgeBaseImplTest.java index da961ccf59a..691fd782281 100644 --- a/drools-core/src/test/java/org/drools/core/impl/KnowledgeBaseImplTest.java +++ b/drools-core/src/test/java/org/drools/core/impl/KnowledgeBaseImplTest.java @@ -22,7 +22,7 @@ import org.drools.base.definitions.InternalKnowledgePackage; import org.drools.core.reteoo.CoreComponentFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.kie.internal.conf.CompositeBaseConfiguration; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceSerializationTest.java b/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceSerializationTest.java index 1d26ecd2f01..dee1ec86caa 100644 --- a/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceSerializationTest.java +++ b/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceSerializationTest.java @@ -26,7 +26,7 @@ import java.nio.charset.StandardCharsets; import org.drools.io.ByteArrayResource; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceToStringTest.java b/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceToStringTest.java index 2bb1143a0ad..adde0442cff 100644 --- a/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceToStringTest.java +++ b/drools-core/src/test/java/org/drools/core/io/impl/ByteArrayResourceToStringTest.java @@ -18,62 +18,53 @@ */ package org.drools.core.io.impl; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.List; +import java.util.stream.Stream; import org.apache.commons.lang3.ArrayUtils; import org.drools.io.ByteArrayResource; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.params.provider.Arguments.arguments; -@RunWith(Parameterized.class) public class ByteArrayResourceToStringTest { - @Parameterized.Parameters(name = "{index}: bytes={0}, encoding={1}") - public static Collection data() { - return new ArrayList(Arrays.asList(new Object[][]{ - { + public static Stream parameters() { + List parameters = List.of( + arguments( Arrays.asList(new Byte[]{10, 20, 30, 40}), null, "ByteArrayResource[bytes=[10, 20, 30, 40], encoding=null]" - }, - { + ), + arguments( Arrays.asList(new Byte[]{10, 20, 30, 40, 50, 60, 70, 80, 90, 100}), null, "ByteArrayResource[bytes=[10, 20, 30, 40, 50, 60, 70, 80, 90, 100], encoding=null]" - }, - { + ), + arguments( Arrays.asList(new Byte[]{10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120}), null, "ByteArrayResource[bytes=[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, ...], encoding=null]" - }, + ), // non-null encoding - { + arguments( Arrays.asList(new Byte[]{10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120}), "UTF-8", "ByteArrayResource[bytes=[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, ...], encoding=UTF-8]" - }, - })); + )); + return parameters.stream(); } // using List instead of directly byte[] to make sure the bytes are printed as part of the test name // see above ({index}: bytes[{0}], encoding[{1}]) -- Array.toString only return object id - @Parameterized.Parameter(0) - public List bytes; - @Parameterized.Parameter(1) - public String encoding; - - @Parameterized.Parameter(2) - public String expectedString; - - @Test - public void testToString() { + @ParameterizedTest(name = "{index}: bytes={0}, encoding={1}") + @MethodSource("parameters") + public void testToString(List bytes, String encoding, String expectedString) { byte[] byteArray = ArrayUtils.toPrimitive(bytes.toArray(new Byte[0])); ByteArrayResource byteArrayResource = new ByteArrayResource(byteArray, encoding); assertThat(byteArrayResource.toString()).isEqualTo(expectedString); diff --git a/drools-core/src/test/java/org/drools/core/io/impl/ReaderResourceTest.java b/drools-core/src/test/java/org/drools/core/io/impl/ReaderResourceTest.java index 976c0947df0..8ffcf52fdfd 100644 --- a/drools-core/src/test/java/org/drools/core/io/impl/ReaderResourceTest.java +++ b/drools-core/src/test/java/org/drools/core/io/impl/ReaderResourceTest.java @@ -25,7 +25,7 @@ import java.nio.charset.Charset; import org.drools.io.ReaderResource; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/reteoo/BaseNodeTest.java b/drools-core/src/test/java/org/drools/core/reteoo/BaseNodeTest.java index dabc5b72d8b..c29bd76c5d9 100644 --- a/drools-core/src/test/java/org/drools/core/reteoo/BaseNodeTest.java +++ b/drools-core/src/test/java/org/drools/core/reteoo/BaseNodeTest.java @@ -24,7 +24,7 @@ import org.drools.core.common.PropagationContext; import org.drools.core.common.UpdateContext; import org.drools.core.reteoo.builder.BuildContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/reteoo/BetaNodeTest.java b/drools-core/src/test/java/org/drools/core/reteoo/BetaNodeTest.java index f416955594e..6623a2184e4 100755 --- a/drools-core/src/test/java/org/drools/core/reteoo/BetaNodeTest.java +++ b/drools-core/src/test/java/org/drools/core/reteoo/BetaNodeTest.java @@ -24,7 +24,7 @@ import org.drools.core.impl.InternalRuleBase; import org.drools.core.impl.RuleBaseFactory; import org.drools.core.reteoo.builder.BuildContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/reteoo/DefaultFactHandleFactoryTest.java b/drools-core/src/test/java/org/drools/core/reteoo/DefaultFactHandleFactoryTest.java index 9344e08a906..e0f6c40f1c3 100644 --- a/drools-core/src/test/java/org/drools/core/reteoo/DefaultFactHandleFactoryTest.java +++ b/drools-core/src/test/java/org/drools/core/reteoo/DefaultFactHandleFactoryTest.java @@ -19,7 +19,7 @@ package org.drools.core.reteoo; import org.drools.core.common.DefaultFactHandle; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/reteoo/FactHandleTest.java b/drools-core/src/test/java/org/drools/core/reteoo/FactHandleTest.java index a2fae1cadfd..8069df27261 100644 --- a/drools-core/src/test/java/org/drools/core/reteoo/FactHandleTest.java +++ b/drools-core/src/test/java/org/drools/core/reteoo/FactHandleTest.java @@ -20,7 +20,7 @@ import org.drools.core.common.DefaultFactHandle; import org.drools.core.common.DisconnectedFactHandle; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/reteoo/MockLeftTupleSink.java b/drools-core/src/test/java/org/drools/core/reteoo/MockLeftTupleSink.java index c086a27578e..c84d574d6dd 100644 --- a/drools-core/src/test/java/org/drools/core/reteoo/MockLeftTupleSink.java +++ b/drools-core/src/test/java/org/drools/core/reteoo/MockLeftTupleSink.java @@ -23,10 +23,8 @@ import org.drools.base.reteoo.NodeTypeEnums; import org.drools.core.RuleBaseConfiguration; -import org.drools.core.common.InternalFactHandle; import org.drools.core.common.Memory; import org.drools.core.common.MemoryFactory; -import org.drools.core.common.PropagationContext; import org.drools.core.common.ReteEvaluator; import org.drools.core.common.UpdateContext; import org.drools.core.reteoo.builder.BuildContext; diff --git a/drools-core/src/test/java/org/drools/core/reteoo/NodeTypeEnumTest.java b/drools-core/src/test/java/org/drools/core/reteoo/NodeTypeEnumTest.java index 719e49f436c..26c524a37db 100644 --- a/drools-core/src/test/java/org/drools/core/reteoo/NodeTypeEnumTest.java +++ b/drools-core/src/test/java/org/drools/core/reteoo/NodeTypeEnumTest.java @@ -18,7 +18,7 @@ */ package org.drools.core.reteoo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.drools.base.reteoo.NodeTypeEnums.isBetaNode; diff --git a/drools-core/src/test/java/org/drools/core/reteoo/ObjectSourceTest.java b/drools-core/src/test/java/org/drools/core/reteoo/ObjectSourceTest.java index 5839b12a0fd..23b41c6cbf0 100644 --- a/drools-core/src/test/java/org/drools/core/reteoo/ObjectSourceTest.java +++ b/drools-core/src/test/java/org/drools/core/reteoo/ObjectSourceTest.java @@ -20,7 +20,7 @@ import java.lang.reflect.Field; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/reteoo/ObjectTypeConfTest.java b/drools-core/src/test/java/org/drools/core/reteoo/ObjectTypeConfTest.java index 12bf7384ea7..1cae9c18aa0 100644 --- a/drools-core/src/test/java/org/drools/core/reteoo/ObjectTypeConfTest.java +++ b/drools-core/src/test/java/org/drools/core/reteoo/ObjectTypeConfTest.java @@ -18,8 +18,7 @@ */ package org.drools.core.reteoo; - -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/reteoo/TupleIterationTest.java b/drools-core/src/test/java/org/drools/core/reteoo/TupleIterationTest.java index 4142f3b2672..a0dc9e6176c 100644 --- a/drools-core/src/test/java/org/drools/core/reteoo/TupleIterationTest.java +++ b/drools-core/src/test/java/org/drools/core/reteoo/TupleIterationTest.java @@ -24,13 +24,13 @@ import org.drools.core.common.PropagationContext; import org.drools.core.reteoo.TupleIterator.OnLeaf; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; - public class TupleIterationTest { - @Test + + @Test public void testRootTraversal() { LeftTuple t0 = new LeftTuple(); LeftTuple t1 = new LeftTuple(t0, null, (PropagationContext) null, true); diff --git a/drools-core/src/test/java/org/drools/core/reteoo/TupleSourceTest.java b/drools-core/src/test/java/org/drools/core/reteoo/TupleSourceTest.java index acfdf31990b..9319bc87e32 100644 --- a/drools-core/src/test/java/org/drools/core/reteoo/TupleSourceTest.java +++ b/drools-core/src/test/java/org/drools/core/reteoo/TupleSourceTest.java @@ -24,7 +24,7 @@ import org.drools.core.impl.InternalRuleBase; import org.drools.core.impl.RuleBaseFactory; import org.drools.core.reteoo.builder.BuildContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.kie.api.KieBaseConfiguration; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/reteoo/builder/ReteooRuleBuilderTest.java b/drools-core/src/test/java/org/drools/core/reteoo/builder/ReteooRuleBuilderTest.java index 9a670077dc8..f6ce4a540fa 100755 --- a/drools-core/src/test/java/org/drools/core/reteoo/builder/ReteooRuleBuilderTest.java +++ b/drools-core/src/test/java/org/drools/core/reteoo/builder/ReteooRuleBuilderTest.java @@ -35,8 +35,8 @@ import org.drools.core.impl.RuleBaseFactory; import org.drools.core.reteoo.RuleTerminalNode; import org.drools.core.rule.consequence.KnowledgeHelper; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.kie.internal.conf.CompositeBaseConfiguration; import static org.assertj.core.api.Assertions.assertThat; @@ -48,7 +48,7 @@ public class ReteooRuleBuilderTest { /* (non-Javadoc) * @see junit.framework.TestCase#setUp() */ - @Before + @BeforeEach public void setUp() throws Exception { this.builder = new ReteooRuleBuilder(); rulebase = new KnowledgeBaseImpl("default", (CompositeBaseConfiguration) RuleBaseFactory.newKnowledgeBaseConfiguration()); diff --git a/drools-core/src/test/java/org/drools/core/time/TemporalDistanceTest.java b/drools-core/src/test/java/org/drools/core/time/TemporalDistanceTest.java index 8ec95a3e9a5..b3ae6f6e221 100644 --- a/drools-core/src/test/java/org/drools/core/time/TemporalDistanceTest.java +++ b/drools-core/src/test/java/org/drools/core/time/TemporalDistanceTest.java @@ -20,7 +20,7 @@ import org.drools.base.time.Interval; import org.drools.base.time.TimeUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/time/impl/CompositeMaxDurationTimerTest.java b/drools-core/src/test/java/org/drools/core/time/impl/CompositeMaxDurationTimerTest.java index e8e44f66469..0066656619b 100644 --- a/drools-core/src/test/java/org/drools/core/time/impl/CompositeMaxDurationTimerTest.java +++ b/drools-core/src/test/java/org/drools/core/time/impl/CompositeMaxDurationTimerTest.java @@ -21,7 +21,7 @@ import java.util.Date; import org.drools.base.time.Trigger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/time/impl/CronExpressionTest.java b/drools-core/src/test/java/org/drools/core/time/impl/CronExpressionTest.java index f4dd05968ce..4d7adc60ca8 100644 --- a/drools-core/src/test/java/org/drools/core/time/impl/CronExpressionTest.java +++ b/drools-core/src/test/java/org/drools/core/time/impl/CronExpressionTest.java @@ -27,8 +27,8 @@ import java.util.Date; import java.util.TimeZone; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -183,7 +183,8 @@ public void testQuartz640() throws ParseException { } } - @Test @Ignore + @Test + @Disabled public void testSerialization() { // TODO as we don't want to worry about this for now } diff --git a/drools-core/src/test/java/org/drools/core/time/impl/CronJobTest.java b/drools-core/src/test/java/org/drools/core/time/impl/CronJobTest.java index 530c8f19d83..0f6cb7d5687 100644 --- a/drools-core/src/test/java/org/drools/core/time/impl/CronJobTest.java +++ b/drools-core/src/test/java/org/drools/core/time/impl/CronJobTest.java @@ -25,11 +25,12 @@ import org.drools.core.impl.RuleBaseFactory; import org.drools.core.time.impl.JDKTimerServiceTest.HelloWorldJob; import org.drools.core.time.impl.JDKTimerServiceTest.HelloWorldJobContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; public class CronJobTest { + @Test public void testCronTriggerJob() throws Exception { SessionConfiguration config = RuleBaseFactory.newKnowledgeSessionConfiguration().as(SessionConfiguration.KEY); diff --git a/drools-core/src/test/java/org/drools/core/time/impl/JDKTimerServiceTest.java b/drools-core/src/test/java/org/drools/core/time/impl/JDKTimerServiceTest.java index 66854a69c2a..ac38fe59322 100644 --- a/drools-core/src/test/java/org/drools/core/time/impl/JDKTimerServiceTest.java +++ b/drools-core/src/test/java/org/drools/core/time/impl/JDKTimerServiceTest.java @@ -40,7 +40,7 @@ import org.drools.core.time.Job; import org.drools.core.time.JobContext; import org.drools.core.time.TimerService; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/time/impl/PseudoClockSchedulerTest.java b/drools-core/src/test/java/org/drools/core/time/impl/PseudoClockSchedulerTest.java index 4295f434578..f0ec5b022e5 100644 --- a/drools-core/src/test/java/org/drools/core/time/impl/PseudoClockSchedulerTest.java +++ b/drools-core/src/test/java/org/drools/core/time/impl/PseudoClockSchedulerTest.java @@ -26,7 +26,7 @@ import org.drools.base.time.Trigger; import org.drools.core.time.Job; import org.drools.core.time.JobContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.atLeast; @@ -48,7 +48,8 @@ public class PseudoClockSchedulerTest { private PseudoClockScheduler scheduler = new PseudoClockScheduler(); - @Test public void removeExistingJob() { + @Test + public void removeExistingJob() { final Date triggerTime = new Date(1000); when( mockTrigger_1.hasNextFireTime() ).thenReturn(triggerTime); @@ -62,7 +63,8 @@ public class PseudoClockSchedulerTest { } - @Test public void removeExistingJobWhenMultipleQueued() { + @Test + public void removeExistingJobWhenMultipleQueued() { final Date triggerTime_1 = new Date(1000); final Date triggerTime_2 = new Date(2000); when( mockTrigger_1.hasNextFireTime() ).thenReturn(triggerTime_1); @@ -82,7 +84,8 @@ public class PseudoClockSchedulerTest { verify( mockTrigger_2, atLeastOnce()).hasNextFireTime(); } - @Test public void timerIsSetToJobTriggerTimeForExecution() { + @Test + public void timerIsSetToJobTriggerTimeForExecution() { final Date triggerTime = new Date(1000); when( mockTrigger_1.hasNextFireTime() ).thenReturn(triggerTime, triggerTime, triggerTime, null); when( mockTrigger_1.nextFireTime() ).thenReturn(triggerTime); @@ -107,7 +110,8 @@ public void execute(JobContext ctx) { verify( mockTrigger_1, times(1) ).nextFireTime(); } - @Test public void timerIsResetWhenJobThrowsExceptions() { + @Test + public void timerIsResetWhenJobThrowsExceptions() { final Date triggerTime = new Date(1000); when( mockTrigger_1.hasNextFireTime() ).thenReturn(triggerTime, triggerTime, triggerTime, null); when( mockTrigger_1.nextFireTime() ).thenReturn(triggerTime); diff --git a/drools-core/src/test/java/org/drools/core/time/impl/Quartz601Test.java b/drools-core/src/test/java/org/drools/core/time/impl/Quartz601Test.java index 344f29e3e83..5206f94d427 100644 --- a/drools-core/src/test/java/org/drools/core/time/impl/Quartz601Test.java +++ b/drools-core/src/test/java/org/drools/core/time/impl/Quartz601Test.java @@ -21,7 +21,7 @@ import java.text.ParseException; import java.util.Set; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.fail; diff --git a/drools-core/src/test/java/org/drools/core/time/impl/SerializationTestSupport.java b/drools-core/src/test/java/org/drools/core/time/impl/SerializationTestSupport.java index eb41e46bf1f..426ff2be46c 100644 --- a/drools-core/src/test/java/org/drools/core/time/impl/SerializationTestSupport.java +++ b/drools-core/src/test/java/org/drools/core/time/impl/SerializationTestSupport.java @@ -23,7 +23,7 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Base class for unit tests that wish to verify diff --git a/drools-core/src/test/java/org/drools/core/util/BinaryHeapPriorityQueueTest.java b/drools-core/src/test/java/org/drools/core/util/BinaryHeapPriorityQueueTest.java index 4eb1d745356..a4a743bff91 100644 --- a/drools-core/src/test/java/org/drools/core/util/BinaryHeapPriorityQueueTest.java +++ b/drools-core/src/test/java/org/drools/core/util/BinaryHeapPriorityQueueTest.java @@ -24,9 +24,10 @@ import java.util.Random; import org.drools.core.util.Queue.QueueEntry; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class BinaryHeapPriorityQueueTest { + @Test public void testOptimised() { final Random random = new Random(); diff --git a/drools-core/src/test/java/org/drools/core/util/BinaryHeapQueueTest.java b/drools-core/src/test/java/org/drools/core/util/BinaryHeapQueueTest.java index 471a6ba5c14..14bf362c58c 100644 --- a/drools-core/src/test/java/org/drools/core/util/BinaryHeapQueueTest.java +++ b/drools-core/src/test/java/org/drools/core/util/BinaryHeapQueueTest.java @@ -33,11 +33,10 @@ import org.drools.core.common.PropagationContext; import org.drools.core.phreak.RuleAgendaItem; import org.drools.core.reteoo.TerminalNode; -import org.drools.core.reteoo.Tuple; import org.drools.core.reteoo.TupleImpl; import org.drools.core.rule.consequence.InternalMatch; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.kie.api.runtime.rule.FactHandle; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -115,7 +114,7 @@ public void testShuffled() { System.out.println("time:" + (System.currentTimeMillis() - time)); } - @Before + @BeforeEach public void setup() { System.out.println( "Running setup" ); Integer[] a = new Integer[max]; diff --git a/drools-core/src/test/java/org/drools/core/util/ClassUtilsTest.java b/drools-core/src/test/java/org/drools/core/util/ClassUtilsTest.java index 7339f04d88d..bd2bf40593b 100644 --- a/drools-core/src/test/java/org/drools/core/util/ClassUtilsTest.java +++ b/drools-core/src/test/java/org/drools/core/util/ClassUtilsTest.java @@ -19,7 +19,7 @@ package org.drools.core.util; import org.drools.util.ClassUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/util/IndexedHashtableIteratorTest.java b/drools-core/src/test/java/org/drools/core/util/IndexedHashtableIteratorTest.java index 1f4c75102f2..334ee044212 100644 --- a/drools-core/src/test/java/org/drools/core/util/IndexedHashtableIteratorTest.java +++ b/drools-core/src/test/java/org/drools/core/util/IndexedHashtableIteratorTest.java @@ -26,7 +26,7 @@ import org.drools.core.reteoo.RightTuple; import org.drools.core.util.index.TupleIndexHashTable; import org.drools.core.util.index.TupleList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/util/IoUtilsTest.java b/drools-core/src/test/java/org/drools/core/util/IoUtilsTest.java index b04f5d28d39..3c8b672a24d 100644 --- a/drools-core/src/test/java/org/drools/core/util/IoUtilsTest.java +++ b/drools-core/src/test/java/org/drools/core/util/IoUtilsTest.java @@ -23,7 +23,7 @@ import org.drools.io.ReaderInputStream; import org.drools.util.IoUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/util/KeyStoreHelperTest.java b/drools-core/src/test/java/org/drools/core/util/KeyStoreHelperTest.java index 50868fc9997..cc147ebfa9f 100755 --- a/drools-core/src/test/java/org/drools/core/util/KeyStoreHelperTest.java +++ b/drools-core/src/test/java/org/drools/core/util/KeyStoreHelperTest.java @@ -36,8 +36,8 @@ import javax.crypto.SecretKeyFactory; import javax.crypto.spec.DESKeySpec; -import org.junit.AfterClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -54,7 +54,7 @@ public class KeyStoreHelperTest { private static final String KEY_PASSWORD = "keypwd"; private static final String KEY_PHRASE = "secretkey"; - @AfterClass + @AfterAll public static void cleanup() { try { new File(KEYSTORE_JCEKS_FILENAME).delete(); diff --git a/drools-core/src/test/java/org/drools/core/util/KieFunctionsTest.java b/drools-core/src/test/java/org/drools/core/util/KieFunctionsTest.java index 75a9a77207a..94b15b8124c 100644 --- a/drools-core/src/test/java/org/drools/core/util/KieFunctionsTest.java +++ b/drools-core/src/test/java/org/drools/core/util/KieFunctionsTest.java @@ -21,7 +21,7 @@ import java.math.BigDecimal; import java.math.BigInteger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/util/LeftTupleRBTreeTest.java b/drools-core/src/test/java/org/drools/core/util/LeftTupleRBTreeTest.java index 0942747f4c9..ada3eadc433 100644 --- a/drools-core/src/test/java/org/drools/core/util/LeftTupleRBTreeTest.java +++ b/drools-core/src/test/java/org/drools/core/util/LeftTupleRBTreeTest.java @@ -21,7 +21,7 @@ import java.util.Random; import org.drools.core.util.TupleRBTree.Node; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/drools-core/src/test/java/org/drools/core/util/LinkedListTest.java b/drools-core/src/test/java/org/drools/core/util/LinkedListTest.java index 9025cd40c5c..83d01a3f34f 100644 --- a/drools-core/src/test/java/org/drools/core/util/LinkedListTest.java +++ b/drools-core/src/test/java/org/drools/core/util/LinkedListTest.java @@ -18,12 +18,13 @@ */ package org.drools.core.util; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; + public class LinkedListTest { LinkedList list = null; @@ -31,7 +32,7 @@ public class LinkedListTest { DoubleLinkedEntry node2 = null; DoubleLinkedEntry node3 = null; - @Before + @BeforeEach public void setUp() throws Exception { this.list = new LinkedList(); this.node1 = new AbstractBaseLinkedListNodeMock(); diff --git a/drools-core/src/test/java/org/drools/core/util/MethodUtilsTest.java b/drools-core/src/test/java/org/drools/core/util/MethodUtilsTest.java index 8d0e8693b6d..3bef34c1f7d 100644 --- a/drools-core/src/test/java/org/drools/core/util/MethodUtilsTest.java +++ b/drools-core/src/test/java/org/drools/core/util/MethodUtilsTest.java @@ -26,7 +26,7 @@ import java.util.stream.Stream; import org.drools.util.MethodUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/util/RightTupleListTest.java b/drools-core/src/test/java/org/drools/core/util/RightTupleListTest.java index b992a9b7e7f..856fb1c13aa 100644 --- a/drools-core/src/test/java/org/drools/core/util/RightTupleListTest.java +++ b/drools-core/src/test/java/org/drools/core/util/RightTupleListTest.java @@ -22,10 +22,9 @@ import org.drools.core.common.InternalFactHandle; import org.drools.core.reteoo.LeftTuple; import org.drools.core.reteoo.MockLeftTupleSink; -import org.drools.core.reteoo.MockObjectSink; import org.drools.core.test.model.Cheese; import org.drools.core.util.index.TupleList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/util/ScalablePoolTest.java b/drools-core/src/test/java/org/drools/core/util/ScalablePoolTest.java index 34bc1e9f903..94b8effdae6 100644 --- a/drools-core/src/test/java/org/drools/core/util/ScalablePoolTest.java +++ b/drools-core/src/test/java/org/drools/core/util/ScalablePoolTest.java @@ -18,7 +18,7 @@ */ package org.drools.core.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/drools-core/src/test/java/org/drools/core/util/index/IndexUtilTest.java b/drools-core/src/test/java/org/drools/core/util/index/IndexUtilTest.java index 5d204db44b2..ebb5d93ef5d 100644 --- a/drools-core/src/test/java/org/drools/core/util/index/IndexUtilTest.java +++ b/drools-core/src/test/java/org/drools/core/util/index/IndexUtilTest.java @@ -43,7 +43,7 @@ import org.drools.core.reteoo.BetaMemory; import org.drools.core.util.AbstractHashTable.DoubleCompositeIndex; import org.drools.core.util.AbstractHashTable.Index; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.kie.api.KieBaseConfiguration; import org.kie.api.runtime.rule.FactHandle; import org.kie.internal.conf.CompositeConfiguration; diff --git a/drools-core/src/test/java/org/drools/core/util/index/RangeIndexTest.java b/drools-core/src/test/java/org/drools/core/util/index/RangeIndexTest.java index cc9b14c3282..dd5470d2a28 100644 --- a/drools-core/src/test/java/org/drools/core/util/index/RangeIndexTest.java +++ b/drools-core/src/test/java/org/drools/core/util/index/RangeIndexTest.java @@ -19,7 +19,7 @@ package org.drools.core.util.index; import org.drools.core.test.model.Person; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; From adab80f65ad8852103a2f67dc9c9aec4dd41ff10 Mon Sep 17 00:00:00 2001 From: Toshiya Kobayashi Date: Mon, 2 Dec 2024 17:47:55 +0900 Subject: [PATCH 4/4] [NO-ISSUE] License check (#6174) * [NO-ISSUE] License check - Remaining Category A license - Remove duplicate headers - Fix .rat-excludes * Add mention to Spring --- .rat-excludes | 12 +- LICENSE | 284 +++++++++++++++++- .../antlr4/expander_multiple_constraints.dslr | 18 ++ .../expander_multiple_constraints_flush.dslr | 18 ++ .../parser/antlr4/expander_spread_lines.dslr | 18 ++ .../drl/parser/antlr4/ParserHelper.java | 13 - .../test/resources/batch_drl_files/.gitignore | 17 ++ .../org/drools/model/bitmask/OpenBitSet.java | 18 -- .../org/drools/util/bitmask/OpenBitSet.java | 19 -- .../core/0004-simpletable-U-noinputvalues.dmn | 14 - .../org/kie/dmn/core/0004-simpletable-U.dmn | 14 - .../org/kie/dmn/core/0008-LX-arithmetic.dmn | 14 - .../DTABLE_NON_PRIORITY_MISSING_OUTVALS.dmn | 14 - .../core/DTABLE_PRIORITY_MISSING_OUTVALS.dmn | 14 - .../org/kie/dmn/core/NotificationsTest2.dmn | 14 - .../core/v1_1/0001-input-data-item-def.dmn | 19 -- ...nput-data-string-artificial-attributes.dmn | 19 -- .../core/v1_1/0001-input-data-string-itIT.dmn | 19 -- .../core/v1_1/0001-input-data-string.dmn | 19 -- .../core/v1_1/0002-input-data-number.dmn | 19 -- .../0003-input-data-string-allowed-values.dmn | 19 -- .../v1_1/0004-simpletable-A-non-equal.dmn | 33 -- .../tests/core/v1_1/0004-simpletable-A.dmn | 33 -- .../core/v1_1/0004-simpletable-C-count.dmn | 33 -- .../core/v1_1/0004-simpletable-C-max.dmn | 33 -- .../core/v1_1/0004-simpletable-C-min.dmn | 33 -- ...004-simpletable-C-sum-multiple-outputs.dmn | 33 -- .../core/v1_1/0004-simpletable-C-sum.dmn | 33 -- .../tests/core/v1_1/0004-simpletable-C.dmn | 33 -- .../tests/core/v1_1/0004-simpletable-F.dmn | 33 -- .../0004-simpletable-O-multiple-outputs.dmn | 33 -- .../tests/core/v1_1/0004-simpletable-O.dmn | 33 -- ...etable-P-multiple-outputs-wrong-output.dmn | 33 -- .../0004-simpletable-P-multiple-outputs.dmn | 33 -- .../tests/core/v1_1/0004-simpletable-P.dmn | 33 -- .../tests/core/v1_1/0004-simpletable-R.dmn | 33 -- .../v1_1/0004-simpletable-U-noinputvalues.dmn | 14 - .../tests/core/v1_1/0004-simpletable-U.dmn | 14 - .../tests/core/v1_1/0008-LX-arithmetic.dmn | 14 - .../DTABLE_NON_PRIORITY_MISSING_OUTVALS.dmn | 14 - .../v1_1/DTABLE_PRIORITY_MISSING_OUTVALS.dmn | 14 - .../core/v1_1/DTABLE_PRIORITY_ONE_OUTVAL.dmn | 33 -- .../tests/core/v1_1/FunctionDefinition.dmn | 19 -- .../legacy/tests/core/v1_1/InvalidInput.dmn | 19 -- .../tests/core/v1_1/NotificationsTest2.dmn | 14 - .../dmn/legacy/tests/core/v1_1/Recursive.dmn | 38 --- .../v1_1/alternative_feel_ns_declaration.dmn | 19 -- ...usiness-knowledge-model-required-input.dmn | 19 -- .../tests/core/v1_1/compilationThrowsNPE.dmn | 19 -- ...0001-input-data-string-with-extensions.dmn | 19 -- .../core/v1_1/decisiontable-default-value.dmn | 33 -- .../v1_1/duplicate.0001-input-data-string.dmn | 96 +++--- .../core/v1_1/invalid-variable-names.dmn | 165 +++++----- .../tests/core/v1_1/list-expression.dmn | 87 +++--- .../legacy/tests/core/v1_1/null_values.dmn | 133 ++++---- .../tests/core/v1_1/out-of-order-items.dmn | 97 +++--- .../tests/core/v1_1/relation-expression.dmn | 109 +++---- .../tests/core/v1_1/simple-item-def.dmn | 105 +++---- .../v1_1/variableLeadingTrailingSpaces.dmn | 19 +- .../validation/v1_1/DRGELEM_NOT_UNIQUE.dmn | 19 +- .../tests/validation/v1_1/DROOLS-1447.dmn | 19 +- .../validation/v1_1/DTABLE_EMPTY_ENTRY.dmn | 14 +- .../DTABLE_MULTIPLEOUTPUT_WRONG_OUTPUT.dmn | 14 +- .../v1_1/DTABLE_PRIORITY_MISSING_OUTVALS.dmn | 14 +- .../v1_1/DTABLE_SINGLEOUTPUT_WRONG_OUTPUT.dmn | 14 +- .../v1_1/FORMAL_PARAM_DUPLICATED.dmn | 19 +- .../INVOCATION_INCONSISTENT_PARAM_NAMES.dmn | 19 +- .../v1_1/INVOCATION_MISSING_EXPR.dmn | 19 +- .../v1_1/INVOCATION_MISSING_TARGET.dmn | 19 +- .../v1_1/INVOCATION_MISSING_TARGETbis.dmn | 19 +- .../v1_1/INVOCATION_WRONG_PARAM_COUNT.dmn | 19 +- .../validation/v1_1/ITEMCOMP_DUPLICATED.dmn | 19 +- .../validation/v1_1/ITEMDEF_NOT_UNIQUE.dmn | 19 +- .../v1_1/ITEMDEF_NOT_UNIQUE_DROOLS-1450.dmn | 19 +- .../tests/validation/v1_1/NAME_IS_VALID.dmn | 19 +- .../validation/v1_1/RELATION_DUP_COLUMN.dmn | 19 +- .../v1_1/RELATION_ROW_CELLCOUNTMISMATCH.dmn | 19 +- .../v1_1/RELATION_ROW_CELL_NOTLITERAL.dmn | 19 +- .../v1_1/REQAUTH_NOT_KNOWLEDGESOURCEbis.dmn | 14 +- .../validation/v1_1/UNKNOWN_VARIABLE.dmn | 19 +- .../v1_1/VARIABLE_LEADING_TRAILING_SPACES.dmn | 19 +- .../artifact/ASSOC_REFERENCES_NOT_EMPTY.dmn | 19 +- ...THREQ_DEP_REQ_AUTH_NOT_KNOWLEDGESOURCE.dmn | 14 +- .../AUTHREQ_DEP_REQ_DEC_NOT_DECISION.dmn | 19 +- .../AUTHREQ_DEP_REQ_INPUT_NOT_INPUT.dmn | 19 +- .../AUTHREQ_MISSING_DEPENDENCY_REQ_AUTH.dmn | 19 +- .../AUTHREQ_MISSING_DEPENDENCY_REQ_DEC.dmn | 19 +- .../AUTHREQ_MISSING_DEPENDENCY_REQ_INPUT.dmn | 19 +- .../ORG_UNIT_DECISION_MADE_WRONG_TYPE.dmn | 19 +- .../ORG_UNIT_DECISION_OWNED_WRONG_TYPE.dmn | 19 +- ...PERF_INDICATOR_IMP_DECISION_WRONG_TYPE.dmn | 19 +- .../BKM_MISMATCH_VAR.dmn | 19 +- .../BKM_MISSING_EXPR.dmn | 19 +- .../BKM_MISSING_VAR.dmn | 19 +- .../v1_1/context/CONTEXT_DUP_ENTRY.dmn | 19 +- .../CONTEXT_ENTRY_MISSING_VARIABLE.dmn | 19 +- .../v1_1/context/CONTEXT_ENTRY_NOTYPEREF.dmn | 19 +- .../v1_1/context/CONTEXT_MISSING_ENTRIES.dmn | 19 +- .../v1_1/context/CONTEXT_MISSING_EXPR.dmn | 19 +- .../decision/DECISION_CYCLIC_DEPENDENCY.dmn | 19 +- ...ISION_CYCLIC_DEPENDENCY_SELF_REFERENCE.dmn | 19 +- .../v1_1/decision/DECISION_DEADLY_DIAMOND.dmn | 19 +- .../v1_1/decision/DECISION_DEADLY_KITE.dmn | 19 +- .../DECISION_DECISION_MAKER_WRONG_TYPE.dmn | 19 +- .../DECISION_DECISION_OWNER_WRONG_TYPE.dmn | 19 +- .../v1_1/decision/DECISION_MISMATCH_VAR.dmn | 19 +- .../v1_1/decision/DECISION_MISSING_EXPR.dmn | 19 +- .../v1_1/decision/DECISION_MISSING_VAR.dmn | 19 +- .../v1_1/decision/DECISION_MISSING_VARbis.dmn | 19 +- .../DECISION_MULTIPLE_EXPRESSIONS.dmn | 19 +- .../DECISION_PERF_INDICATOR_WRONG_TYPE.dmn | 19 +- .../v1_1/dmnelementref/ELEMREF_NOHASH.dmn | 14 +- .../INFOREQ_DECISION_NOT_DECISION.dmn | 19 +- .../INFOREQ_INPUT_NOT_INPUTDATA.dmn | 19 +- .../INFOREQ_MISSING_DECISION.dmn | 19 +- .../INFOREQ_MISSING_INPUT.dmn | 19 +- .../v1_1/inputdata/INPUTDATA_MISMATCH_VAR.dmn | 19 +- .../v1_1/inputdata/INPUTDATA_MISSING_VAR.dmn | 19 +- .../tests/validation/v1_1/invalidXml.dmn | 19 +- .../KNOWREQ_MISSING_BKM.dmn | 19 +- .../KNOWREQ_REQ_DECISION_NOT_BKM.dmn | 19 +- .../KNOW_SOURCE_MISSING_OWNER.dmn | 19 +- .../KNOW_SOURCE_OWNER_NOT_ORG_UNIT.dmn | 19 +- .../v1_1/typeref/TYPEREF_NOT_FEEL_NOT_DEF.dmn | 19 +- .../TYPEREF_NOT_FEEL_NOT_DEF_valid.dmn | 19 +- .../v1_1/typeref/TYPEREF_NO_FEEL_TYPE.dmn | 19 +- .../validation/v1_1/typeref/TYPEREF_NO_NS.dmn | 19 +- .../kie/dmn/validation/DTABLE_EMPTY_ENTRY.dmn | 14 +- .../DTABLE_MULTIPLEOUTPUT_WRONG_OUTPUT.dmn | 14 +- .../DTABLE_PRIORITY_MISSING_OUTVALS.dmn | 14 +- .../DTABLE_SINGLEOUTPUT_WRONG_OUTPUT.dmn | 14 +- .../REQAUTH_NOT_KNOWLEDGESOURCEbis.dmn | 14 +- ...THREQ_DEP_REQ_AUTH_NOT_KNOWLEDGESOURCE.dmn | 14 +- .../dmnelementref/ELEMREF_NOHASH.dmn | 14 +- 134 files changed, 768 insertions(+), 2810 deletions(-) diff --git a/.rat-excludes b/.rat-excludes index 16ea79745bb..71348ce825f 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -36,14 +36,6 @@ lunr-2.3.9.min.js JavaLexer.g4 # drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/JavaParser.g4 JavaParser.g4 -# drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints.dslr -expander_multiple_constraints.dslr -# drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints_flush.dslr -expander_multiple_constraints_flush.dslr -# drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_spread_lines.dslr -expander_spread_lines.dslr -# drools-drlonyaml-parent/drools-drlonyaml-cli-tests/src/test/resources/batch_drl_files/.gitignore -.gitignore # drools-drlonyaml-parent/drools-drlonyaml-cli-tests/src/test/resources/expected/test1.yml test1.yml # drools-drlonyaml-parent/drools-drlonyaml-cli-tests/src/test/resources/expected/test2.drl.txt @@ -56,6 +48,8 @@ drl.ftl Sample.sdo # drools-impact-analysis/drools-impact-analysis-graph/drools-impact-analysis-graph-graphviz/src/test/resources/org/drools/impact/analysis/graph/graphviz/simple.dot simple.dot +# drools-model/drools-canonical-model/src/main/java/org/drools/model/bitmask/OpenBitSet.java +OpenBitSet.java # drools-model/drools-mvel-parser/src/main/javacc/mvel.jj mvel.jj # drools-quarkus-extension/drools-quarkus-integration-test-hotreload/src/main/resources/org/drools/hotreload/adult.txt @@ -78,6 +72,8 @@ unicode.drl.csv PhoneNumberCategory.drl.csv # drools-test-coverage/test-suite/src/test/resources/org/drools/testcoverage/functional/oopath/oopath.drl.csv oopath.drl.csv +# drools-util/src/main/java/org/drools/util/bitmask/OpenBitSet.java +OpenBitSet.java # efesto/documentation/sdt/CompositeKnowledgeBuilderImpl_build.sdt CompositeKnowledgeBuilderImpl_build.sdt # efesto/documentation/sdt/PMMLAssemblerService_addResourceAfterRules_withoutConfigurations.sdt diff --git a/LICENSE b/LICENSE index bdfb8e372d8..b7ffb7aa1cd 100644 --- a/LICENSE +++ b/LICENSE @@ -381,6 +381,284 @@ event that testing suites are implemented or approved by Object Management Group specification may claim compliance or conformance with the specification only if the software satisfactorily completes the testing suites. - ------------------------------------------------------------------------------------ - for drools-model/drools-mvel-parser/src/main/javacc/mvel.jj - JavaParser is dual licensed under LGPL license and Apache License Version 2.0 license. We choose the Apache License Version 2.0. +------------------------------------------------------------------------------------ +for drools-model/drools-mvel-parser/src/main/javacc/mvel.jj + JavaParser is dual licensed under LGPL license and Apache License Version 2.0 license. We choose the Apache License Version 2.0. + +------------------------------------------------------------------------------------ +for drools-model/drools-canonical-model/src/main/java/org/drools/model/bitmask/OpenBitSet.java + drools-util/src/main/java/org/drools/util/bitmask/OpenBitSet.java + +A. HISTORY OF THE SOFTWARE +========================== + +Python was created in the early 1990s by Guido van Rossum at Stichting +Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands +as a successor of a language called ABC. Guido remains Python's +principal author, although it includes many contributions from others. + +In 1995, Guido continued his work on Python at the Corporation for +National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) +in Reston, Virginia where he released several versions of the +software. + +In May 2000, Guido and the Python core development team moved to +BeOpen.com to form the BeOpen PythonLabs team. In October of the same +year, the PythonLabs team moved to Digital Creations (now Zope +Corporation, see http://www.zope.com). In 2001, the Python Software +Foundation (PSF, see http://www.python.org/psf/) was formed, a +non-profit organization created specifically to own Python-related +Intellectual Property. Zope Corporation is a sponsoring member of +the PSF. + +All Python releases are Open Source (see http://www.opensource.org for +the Open Source Definition). Historically, most, but not all, Python +releases have also been GPL-compatible; the table below summarizes +the various releases. + + Release Derived Year Owner GPL- + from compatible? (1) + + 0.9.0 thru 1.2 1991-1995 CWI yes + 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes + 1.6 1.5.2 2000 CNRI no + 2.0 1.6 2000 BeOpen.com no + 1.6.1 1.6 2001 CNRI yes (2) + 2.1 2.0+1.6.1 2001 PSF no + 2.0.1 2.0+1.6.1 2001 PSF yes + 2.1.1 2.1+2.0.1 2001 PSF yes + 2.2 2.1.1 2001 PSF yes + 2.1.2 2.1.1 2002 PSF yes + 2.1.3 2.1.2 2002 PSF yes + 2.2.1 2.2 2002 PSF yes + 2.2.2 2.2.1 2002 PSF yes + 2.2.3 2.2.2 2003 PSF yes + 2.3 2.2.2 2002-2003 PSF yes + 2.3.1 2.3 2002-2003 PSF yes + 2.3.2 2.3.1 2002-2003 PSF yes + 2.3.3 2.3.2 2002-2003 PSF yes + 2.3.4 2.3.3 2004 PSF yes + 2.3.5 2.3.4 2005 PSF yes + 2.4 2.3 2004 PSF yes + 2.4.1 2.4.1 2005 PSF yes + 2.4.2 2.4.1 2005 PSF yes + +Footnotes: + +(1) GPL-compatible doesn't mean that we're distributing Python under + the GPL. All Python licenses, unlike the GPL, let you distribute + a modified version without making your changes open source. The + GPL-compatible licenses make it possible to combine Python with + other software that is released under the GPL; the others don't. + +(2) According to Richard Stallman, 1.6.1 is not GPL-compatible, + because its license has a choice of law clause. According to + CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 + is "not incompatible" with the GPL. + +Thanks to the many outside volunteers who have worked under Guido's +direction to make these releases possible. + + +B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON +=============================================================== + +PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 +-------------------------------------------- + +1. This LICENSE AGREEMENT is between the Python Software Foundation +("PSF"), and the Individual or Organization ("Licensee") accessing and +otherwise using this software ("Python") in source or binary form and +its associated documentation. + +2. Subject to the terms and conditions of this License Agreement, PSF +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python +alone or in any derivative version, provided, however, that PSF's +License Agreement and PSF's notice of copyright, i.e., "Copyright (c) +2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved" +are retained in Python alone or in any derivative version prepared +by Licensee. + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python. + +4. PSF is making Python available to Licensee on an "AS IS" +basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between PSF and +Licensee. This License Agreement does not grant permission to use PSF +trademarks or trade name in a trademark sense to endorse or promote +products or services of Licensee, or any third party. + +8. By copying, installing or otherwise using Python, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + + +BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 +------------------------------------------- + +BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 + +1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an +office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the +Individual or Organization ("Licensee") accessing and otherwise using +this software in source or binary form and its associated +documentation ("the Software"). + +2. Subject to the terms and conditions of this BeOpen Python License +Agreement, BeOpen hereby grants Licensee a non-exclusive, +royalty-free, world-wide license to reproduce, analyze, test, perform +and/or display publicly, prepare derivative works, distribute, and +otherwise use the Software alone or in any derivative version, +provided, however, that the BeOpen Python License is retained in the +Software, alone or in any derivative version prepared by Licensee. + +3. BeOpen is making the Software available to Licensee on an "AS IS" +basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE +SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS +AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY +DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +5. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +6. This License Agreement shall be governed by and interpreted in all +respects by the law of the State of California, excluding conflict of +law provisions. Nothing in this License Agreement shall be deemed to +create any relationship of agency, partnership, or joint venture +between BeOpen and Licensee. This License Agreement does not grant +permission to use BeOpen trademarks or trade names in a trademark +sense to endorse or promote products or services of Licensee, or any +third party. As an exception, the "BeOpen Python" logos available at +http://www.pythonlabs.com/logos.html may be used according to the +permissions granted on that web page. + +7. By copying, installing or otherwise using the software, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + + +CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 +--------------------------------------- + +1. This LICENSE AGREEMENT is between the Corporation for National +Research Initiatives, having an office at 1895 Preston White Drive, +Reston, VA 20191 ("CNRI"), and the Individual or Organization +("Licensee") accessing and otherwise using Python 1.6.1 software in +source or binary form and its associated documentation. + +2. Subject to the terms and conditions of this License Agreement, CNRI +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python 1.6.1 +alone or in any derivative version, provided, however, that CNRI's +License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) +1995-2001 Corporation for National Research Initiatives; All Rights +Reserved" are retained in Python 1.6.1 alone or in any derivative +version prepared by Licensee. Alternately, in lieu of CNRI's License +Agreement, Licensee may substitute the following text (omitting the +quotes): "Python 1.6.1 is made available subject to the terms and +conditions in CNRI's License Agreement. This Agreement together with +Python 1.6.1 may be located on the Internet using the following +unique, persistent identifier (known as a handle): 1895.22/1013. This +Agreement may also be obtained from a proxy server on the Internet +using the following URL: http://hdl.handle.net/1895.22/1013". + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python 1.6.1 or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python 1.6.1. + +4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" +basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. This License Agreement shall be governed by the federal +intellectual property law of the United States, including without +limitation the federal copyright law, and, to the extent such +U.S. federal law does not apply, by the law of the Commonwealth of +Virginia, excluding Virginia's conflict of law provisions. +Notwithstanding the foregoing, with regard to derivative works based +on Python 1.6.1 that incorporate non-separable material that was +previously distributed under the GNU General Public License (GPL), the +law of the Commonwealth of Virginia shall govern this License +Agreement only as to issues arising under or with respect to +Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this +License Agreement shall be deemed to create any relationship of +agency, partnership, or joint venture between CNRI and Licensee. This +License Agreement does not grant permission to use CNRI trademarks or +trade name in a trademark sense to endorse or promote products or +services of Licensee, or any third party. + +8. By clicking on the "ACCEPT" button where indicated, or by copying, +installing or otherwise using Python 1.6.1, Licensee agrees to be +bound by the terms and conditions of this License Agreement. + + ACCEPT + + +CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 +-------------------------------------------------- + +Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, +The Netherlands. All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Stichting Mathematisch +Centrum or CWI not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. + +STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +------------------------------------------------------------------------------------ +for drools-util/src/main/java/org/drools/util/StringUtils.java + Borrowed from Spring + +Licensed under the Apache License, Version 2.0 (the "License"); \ No newline at end of file diff --git a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints.dslr b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints.dslr index cfb3bdf78b9..4fd1e0bbf2c 100644 --- a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints.dslr +++ b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints.dslr @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ //created on: 13/04/2006 package mydsl diff --git a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints_flush.dslr b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints_flush.dslr index f352d9196fa..329f3b1addc 100644 --- a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints_flush.dslr +++ b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_multiple_constraints_flush.dslr @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ //created on: 13/04/2006 package mydsl diff --git a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_spread_lines.dslr b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_spread_lines.dslr index 02ae6b5bcca..4e2ccc15ac1 100644 --- a/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_spread_lines.dslr +++ b/drools-drl/drools-drl-parser-tests/src/test/resources/org/drools/drl/parser/antlr4/expander_spread_lines.dslr @@ -1,3 +1,21 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ //created on: 13/04/2006 package mydsl diff --git a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/ParserHelper.java b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/ParserHelper.java index fed7024c20c..9e30e9a5da6 100644 --- a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/ParserHelper.java +++ b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/antlr4/ParserHelper.java @@ -16,19 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -/* - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ package org.drools.drl.parser.antlr4; import java.util.ArrayDeque; diff --git a/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/src/test/resources/batch_drl_files/.gitignore b/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/src/test/resources/batch_drl_files/.gitignore index 1cda54be937..dcdfb9ac928 100644 --- a/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/src/test/resources/batch_drl_files/.gitignore +++ b/drools-drlonyaml-parent/drools-drlonyaml-cli-tests/src/test/resources/batch_drl_files/.gitignore @@ -1 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + *.yml diff --git a/drools-model/drools-canonical-model/src/main/java/org/drools/model/bitmask/OpenBitSet.java b/drools-model/drools-canonical-model/src/main/java/org/drools/model/bitmask/OpenBitSet.java index 12c718a72be..d2441609758 100644 --- a/drools-model/drools-canonical-model/src/main/java/org/drools/model/bitmask/OpenBitSet.java +++ b/drools-model/drools-canonical-model/src/main/java/org/drools/model/bitmask/OpenBitSet.java @@ -1,21 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ package org.drools.model.bitmask; import java.lang.reflect.Field; diff --git a/drools-util/src/main/java/org/drools/util/bitmask/OpenBitSet.java b/drools-util/src/main/java/org/drools/util/bitmask/OpenBitSet.java index 72707f1bc1e..dee476bf03b 100644 --- a/drools-util/src/main/java/org/drools/util/bitmask/OpenBitSet.java +++ b/drools-util/src/main/java/org/drools/util/bitmask/OpenBitSet.java @@ -1,22 +1,3 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - package org.drools.util.bitmask; import java.lang.reflect.Field; diff --git a/kie-dmn/kie-dmn-core/src/test/resources/org/kie/dmn/core/0004-simpletable-U-noinputvalues.dmn b/kie-dmn/kie-dmn-core/src/test/resources/org/kie/dmn/core/0004-simpletable-U-noinputvalues.dmn index b84c0f97630..758151404a9 100644 --- a/kie-dmn/kie-dmn-core/src/test/resources/org/kie/dmn/core/0004-simpletable-U-noinputvalues.dmn +++ b/kie-dmn/kie-dmn-core/src/test/resources/org/kie/dmn/core/0004-simpletable-U-noinputvalues.dmn @@ -17,20 +17,6 @@ specific language governing permissions and limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/business-knowledge-model-required-input.dmn b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/business-knowledge-model-required-input.dmn index 9224c428879..0416b8b5bf0 100644 --- a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/business-knowledge-model-required-input.dmn +++ b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/business-knowledge-model-required-input.dmn @@ -19,25 +19,6 @@ --> - - - - - - - - - - - - - - - - - - - - - - - "Hello " + Full Name - - - - - - + + + + + + + + + + + + + "Hello " + Full Name + + + + + + diff --git a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/invalid-variable-names.dmn b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/invalid-variable-names.dmn index d334160b079..e3d4942d6eb 100644 --- a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/invalid-variable-names.dmn +++ b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/invalid-variable-names.dmn @@ -1,91 +1,74 @@ - - - - - - - - - - feel:boolean - - - - - - - - - - - - "Hello " + Full Name - - - - - - - some number - - - - - - - - - - - "x" - 100 - - - - - - - - - - - - - + + + + + + + + + + feel:boolean + + + + + + + + + + + + "Hello " + Full Name + + + + + + + some number + + + + + + + + + + + "x" + 100 + + + + + + + + + + + + + diff --git a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/list-expression.dmn b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/list-expression.dmn index dfa6133f554..7f1df5c6f81 100644 --- a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/list-expression.dmn +++ b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/list-expression.dmn @@ -1,52 +1,35 @@ - - - - - - - - - - - "John" - "Ma"+"ry" - - - + + + + + + + + + + + "John" + "Ma"+"ry" + + + diff --git a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/null_values.dmn b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/null_values.dmn index 1faee221e7a..634ad3a26ba 100644 --- a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/null_values.dmn +++ b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/null_values.dmn @@ -1,75 +1,58 @@ - - - - - - - - - - - - - - - - Null Input - - - - - - - null - - "Input is null" - - - - not(null) - - "Input is not null" - - - - - - - + + + + + + + + + + + + + + + + Null Input + + + + + + + null + + "Input is null" + + + + not(null) + + "Input is not null" + + + + + + + diff --git a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/out-of-order-items.dmn b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/out-of-order-items.dmn index d92ccef7bdf..c002ef799e8 100644 --- a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/out-of-order-items.dmn +++ b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/out-of-order-items.dmn @@ -1,57 +1,40 @@ - - - - - - - - - - kie:tStatus - - - - feel:string - - "gold","silver","bronze" - - - + + + + + + + + + + kie:tStatus + + + + feel:string + + "gold","silver","bronze" + + + diff --git a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/relation-expression.dmn b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/relation-expression.dmn index beff24d3ae6..591f3355d86 100644 --- a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/relation-expression.dmn +++ b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/relation-expression.dmn @@ -1,63 +1,46 @@ - - - - - - - - - - - - - - - "John" - "Sales" - 100000 - - - "Mary" - "Finances" - 120000 - - - - + + + + + + + + + + + + + + + "John" + "Sales" + 100000 + + + "Mary" + "Finances" + 120000 + + + + diff --git a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/simple-item-def.dmn b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/simple-item-def.dmn index bda94216d5b..e2acbda7283 100644 --- a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/simple-item-def.dmn +++ b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/simple-item-def.dmn @@ -1,61 +1,44 @@ - - - - - - - - - feel:number - - - - - - - - 12 * Monthly Salary - - - - - - + + + + + + + + + feel:number + + + + + + + + 12 * Monthly Salary + + + + + + diff --git a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/variableLeadingTrailingSpaces.dmn b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/variableLeadingTrailingSpaces.dmn index 9bc30c9fb31..4bb6bf71d05 100644 --- a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/variableLeadingTrailingSpaces.dmn +++ b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/core/v1_1/variableLeadingTrailingSpaces.dmn @@ -19,24 +19,7 @@ --> - + - + - + diff --git a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/validation/v1_1/DTABLE_EMPTY_ENTRY.dmn b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/validation/v1_1/DTABLE_EMPTY_ENTRY.dmn index 101d7a3dc80..f4d4b5ee7ea 100644 --- a/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/validation/v1_1/DTABLE_EMPTY_ENTRY.dmn +++ b/kie-dmn/kie-dmn-legacy-tests/src/test/resources/org/kie/dmn/legacy/tests/validation/v1_1/DTABLE_EMPTY_ENTRY.dmn @@ -19,19 +19,7 @@ --> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +