Skip to content

Commit

Permalink
Migrate more tests to junit5
Browse files Browse the repository at this point in the history
  • Loading branch information
@pibizza
pibizza committed Nov 7, 2024
1 parent ff654a9 commit 5f542a5
Show file tree
Hide file tree
Showing 25 changed files with 1,129 additions and 1,006 deletions.
276 changes: 153 additions & 123 deletions ...ler-integration/src/test/java/org/drools/mvel/integrationtests/NamedConsequencesTest.java
View file

Large diffs are not rendered by default.

31 changes: 12 additions & 19 deletions ...compiler-integration/src/test/java/org/drools/mvel/integrationtests/NewLineAtEoFTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@
*/
package org.drools.mvel.integrationtests;

import java.util.Collection;
import java.util.stream.Stream;

import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
import org.drools.testcoverage.common.util.KieUtil;
import org.drools.testcoverage.common.util.TestParametersUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.drools.testcoverage.common.util.TestParametersUtil2;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.kie.api.builder.KieBuilder;
import org.kie.api.builder.Message.Level;

Expand All @@ -36,18 +35,10 @@
* Tests an error appearing when DLR does not contain a new line at the end of
* the file.
*/
@RunWith(Parameterized.class)
public class NewLineAtEoFTest {

private final KieBaseTestConfiguration kieBaseTestConfiguration;

public NewLineAtEoFTest(final KieBaseTestConfiguration kieBaseTestConfiguration) {
this.kieBaseTestConfiguration = kieBaseTestConfiguration;
}

@Parameterized.Parameters(name = "KieBase type={0}")
public static Collection<Object[]> getParameters() {
return TestParametersUtil.getKieBaseCloudConfigurations(true);
public static Stream<KieBaseTestConfiguration> parameters() {
return TestParametersUtil2.getKieBaseCloudConfigurations(true).stream();
}

private static final String drl =
Expand All @@ -58,16 +49,18 @@ public static Collection<Object[]> getParameters() {
+ " System.out.println(\"Hello world!\");\n"
+ "end\n";

@Test
public void testNoNewlineAtTheEnd() {
@ParameterizedTest(name = "KieBase type={0}")
@MethodSource("parameters")
public void testNoNewlineAtTheEnd(KieBaseTestConfiguration kieBaseTestConfiguration) {
KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl + "//test");
if (kieBuilder.getResults().hasMessages(Level.ERROR)) {
fail(kieBuilder.getResults().getMessages(Level.ERROR).toString());
}
}

@Test
public void testNewlineAtTheEnd() {
@ParameterizedTest(name = "KieBase type={0}")
@MethodSource("parameters")
public void testNewlineAtTheEnd(KieBaseTestConfiguration kieBaseTestConfiguration) {
KieBuilder kieBuilder = KieUtil.getKieBuilderFromDrls(kieBaseTestConfiguration, false, drl);
assertThat(kieBuilder.getResults().hasMessages(Level.ERROR)).isFalse();
}
Expand Down
26 changes: 9 additions & 17 deletions ...er-integration/src/test/java/org/drools/mvel/integrationtests/NodePositionInPathTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.drools.mvel.integrationtests;

import java.util.Collection;
import java.util.stream.Stream;

import org.drools.base.base.ClassObjectType;
import org.drools.core.impl.InternalRuleBase;
Expand All @@ -34,30 +34,22 @@
import org.drools.core.reteoo.RuleTerminalNode;
import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
import org.drools.testcoverage.common.util.KieBaseUtil;
import org.drools.testcoverage.common.util.TestParametersUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.drools.testcoverage.common.util.TestParametersUtil2;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.kie.api.KieBase;

import static org.assertj.core.api.Assertions.assertThat;

@RunWith(Parameterized.class)
public class NodePositionInPathTest {

private final KieBaseTestConfiguration kieBaseTestConfiguration;

public NodePositionInPathTest(final KieBaseTestConfiguration kieBaseTestConfiguration) {
this.kieBaseTestConfiguration = kieBaseTestConfiguration;
}

@Parameterized.Parameters(name = "KieBase type={0}")
public static Collection<Object[]> getParameters() {
return TestParametersUtil.getKieBaseCloudConfigurations(true);
public static Stream<KieBaseTestConfiguration> parameters() {
return TestParametersUtil2.getKieBaseCloudConfigurations(true).stream();
}

@Test
public void test() {
@ParameterizedTest(name = "KieBase type={0}")
@MethodSource("parameters")
public void test(KieBaseTestConfiguration kieBaseTestConfiguration) {
String drl =
"rule R1 when\n" +
" Integer()\n" +
Expand Down
44 changes: 19 additions & 25 deletions ...ler-integration/src/test/java/org/drools/mvel/integrationtests/NodesPartitioningTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,51 +28,44 @@
import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
import org.drools.testcoverage.common.util.KieBaseUtil;
import org.drools.testcoverage.common.util.KieUtil;
import org.drools.testcoverage.common.util.TestParametersUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.drools.testcoverage.common.util.TestParametersUtil2;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.kie.api.builder.KieModule;
import org.kie.internal.conf.ParallelExecutionOption;

import java.util.Collection;
import java.util.stream.Stream;

import static org.assertj.core.api.Assertions.assertThat;

@RunWith(Parameterized.class)
public class NodesPartitioningTest {

private final KieBaseTestConfiguration kieBaseTestConfiguration;

public NodesPartitioningTest(final KieBaseTestConfiguration kieBaseTestConfiguration) {
this.kieBaseTestConfiguration = kieBaseTestConfiguration;
}

@Parameterized.Parameters(name = "KieBase type={0}")
public static Collection<Object[]> getParameters() {
return TestParametersUtil.getKieBaseCloudConfigurations(true);
public static Stream<KieBaseTestConfiguration> parameters() {
return TestParametersUtil2.getKieBaseCloudConfigurations(true).stream();
}

@Test
public void test2Partitions() {
@ParameterizedTest(name = "KieBase type={0}")
@MethodSource("parameters")
public void test2Partitions(KieBaseTestConfiguration kieBaseTestConfiguration) {
String drl = ruleA(1) + ruleB(2) + ruleC(2) + ruleD(1) +
ruleD(2) + ruleC(1) + ruleA(2) + ruleB(1);
checkDrl( drl );
checkDrl(kieBaseTestConfiguration, drl);
}

@Test
public void testPartitioningWithSharedNodes() {
@ParameterizedTest(name = "KieBase type={0}")
@MethodSource("parameters")
public void testPartitioningWithSharedNodes(KieBaseTestConfiguration kieBaseTestConfiguration) {
StringBuilder sb = new StringBuilder( 400 );
for (int i = 1; i < 4; i++) {
sb.append( getRule( i ) );
}
for (int i = 1; i < 4; i++) {
sb.append( getNotRule( i ) );
}
checkDrl( sb.toString() );
checkDrl(kieBaseTestConfiguration, sb.toString() );
}

private void checkDrl(String drl) {
private void checkDrl(KieBaseTestConfiguration kieBaseTestConfiguration, String drl) {
final KieModule kieModule = KieUtil.getKieModuleFromDrls("test", kieBaseTestConfiguration, drl);
final InternalKnowledgeBase kbase = (InternalKnowledgeBase)KieBaseUtil.newKieBaseFromKieModuleWithAdditionalOptions(kieModule, kieBaseTestConfiguration, ParallelExecutionOption.FULLY_PARALLEL);
Rete rete = kbase.getRete();
Expand Down Expand Up @@ -213,8 +206,9 @@ public String getUuid() {
}
}

@Test
public void testChangePartitionOfAlphaSourceOfAlpha() {
@ParameterizedTest(name = "KieBase type={0}")
@MethodSource("parameters")
public void testChangePartitionOfAlphaSourceOfAlpha(KieBaseTestConfiguration kieBaseTestConfiguration) {
// DROOLS-1487
String drl =
"import " + Account.class.getCanonicalName() + ";\n" +
Expand All @@ -233,6 +227,6 @@ public void testChangePartitionOfAlphaSourceOfAlpha() {
"then\n" +
"end";

checkDrl( drl );
checkDrl(kieBaseTestConfiguration, drl);
}
}
44 changes: 19 additions & 25 deletions ...ration/src/test/java/org/drools/mvel/integrationtests/NullCheckOnExistentialNodeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,24 @@
*/
package org.drools.mvel.integrationtests;

import java.util.Collection;
import java.util.stream.Stream;

import org.drools.testcoverage.common.util.KieBaseTestConfiguration;
import org.drools.testcoverage.common.util.KieBaseUtil;
import org.drools.testcoverage.common.util.TestParametersUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.drools.testcoverage.common.util.TestParametersUtil2;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.kie.api.KieBase;
import org.kie.api.runtime.KieSession;
import org.kie.api.runtime.rule.FactHandle;

import static org.assertj.core.api.Assertions.assertThat;

// DROOLS-4295
@RunWith(Parameterized.class)
public class NullCheckOnExistentialNodeTest {

private final KieBaseTestConfiguration kieBaseTestConfiguration;

public NullCheckOnExistentialNodeTest(final KieBaseTestConfiguration kieBaseTestConfiguration) {
this.kieBaseTestConfiguration = kieBaseTestConfiguration;
}

@Parameterized.Parameters(name = "KieBase type={0}")
public static Collection<Object[]> getParameters() {
return TestParametersUtil.getKieBaseCloudConfigurations(true);
public static Stream<KieBaseTestConfiguration> parameters() {
return TestParametersUtil2.getKieBaseCloudConfigurations(true).stream();
}

public static class A {
Expand All @@ -71,7 +62,7 @@ public String getValue() {
}
}

private void check( String drl, int fire1, int fire2 ) {
private void check( KieBaseTestConfiguration kieBaseTestConfiguration, String drl, int fire1, int fire2 ) {
KieBase kbase = KieBaseUtil.getKieBaseFromKieModuleFromDrl("test", kieBaseTestConfiguration, drl);
KieSession kieSession = kbase.newKieSession();

Expand All @@ -93,8 +84,9 @@ private void check( String drl, int fire1, int fire2 ) {
assertThat(kieSession.fireAllRules()).isEqualTo(fire2);
}

@Test
public void testNot() {
@ParameterizedTest(name = "KieBase type={0}")
@MethodSource("parameters")
public void testNot(KieBaseTestConfiguration kieBaseTestConfiguration) {
String drl =
"import " + A.class.getCanonicalName() + ";\n" +
"import " + B.class.getCanonicalName() + ";\n" +
Expand All @@ -106,11 +98,12 @@ public void testNot() {
" then\n" +
"end";

check( drl, 0, 1 );
check(kieBaseTestConfiguration, drl, 0, 1 );
}

@Test
public void testExists() {
@ParameterizedTest(name = "KieBase type={0}")
@MethodSource("parameters")
public void testExists(KieBaseTestConfiguration kieBaseTestConfiguration) {
String drl =
"import " + A.class.getCanonicalName() + ";\n" +
"import " + B.class.getCanonicalName() + ";\n" +
Expand All @@ -122,11 +115,12 @@ public void testExists() {
" then\n" +
"end";

check( drl, 1, 0 );
check( kieBaseTestConfiguration, drl, 1, 0 );
}

@Test
public void testNotIndexable() {
@ParameterizedTest(name = "KieBase type={0}")
@MethodSource("parameters")
public void testNotIndexable(KieBaseTestConfiguration kieBaseTestConfiguration) {
String drl =
"import " + NullCheckOnExistentialNodeTest.class.getCanonicalName() + ";\n" +
"import " + A.class.getCanonicalName() + ";\n" +
Expand All @@ -139,7 +133,7 @@ public void testNotIndexable() {
" then\n" +
"end";

check( drl, 0, 1 );
check( kieBaseTestConfiguration, drl, 0, 1 );
}

public static boolean myPredicate(String s1, String s2) {
Expand Down
Loading

0 comments on commit 5f542a5

Please sign in to comment.