Skip to content

Commit

Permalink
[7.x][DROOLS-7046] Migrate drools-test-coverage tests to assertj (apa…
Browse files Browse the repository at this point in the history 
…che#4538)

* [DROOLS-7046] Migrate drools-test-coverage tests to assertj

* [DROOLS-7046] Cleaning up remaing tests in drools-test-coverage
  • Loading branch information
@pibizza
pibizza authored Jul 13, 2022
1 parent 9053e51 commit d3319fe
Show file tree
Hide file tree
Showing 336 changed files with 9,583 additions and 12,374 deletions.
55 changes: 27 additions & 28 deletions ...tion/src/test/java/org/drools/compiler/integrationtests/AbstractBackwardChainingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
import org.kie.api.KieBase;
import org.kie.api.runtime.KieSession;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;

public abstract class AbstractBackwardChainingTest {

Expand Down Expand Up @@ -207,56 +206,56 @@ private void testQuery(final String drl) {
ksession.insert("go1");
ksession.fireAllRules();
if (kieBaseTestConfiguration.isIdentity()) {
assertEquals(5, list.size());
assertTrue(list.contains("darth : 100"));
assertTrue(list.contains("darth : 200"));
assertTrue(list.contains("yoda : 300"));
assertTrue(list.contains("luke : 300"));
assertTrue(list.contains("bobba : 300"));
assertThat(list.size()).isEqualTo(5);
assertThat(list.contains("darth : 100")).isTrue();
assertThat(list.contains("darth : 200")).isTrue();
assertThat(list.contains("yoda : 300")).isTrue();
assertThat(list.contains("luke : 300")).isTrue();
assertThat(list.contains("bobba : 300")).isTrue();
} else {
assertEquals(4, list.size());
assertTrue(list.contains("darth : 100"));
assertTrue(list.contains("yoda : 300"));
assertTrue(list.contains("luke : 300"));
assertTrue(list.contains("bobba : 300"));
assertThat(list.size()).isEqualTo(4);
assertThat(list.contains("darth : 100")).isTrue();
assertThat(list.contains("yoda : 300")).isTrue();
assertThat(list.contains("luke : 300")).isTrue();
assertThat(list.contains("bobba : 300")).isTrue();
}

list.clear();
ksession.insert("go2");
ksession.fireAllRules();

if (kieBaseTestConfiguration.isIdentity()) {
assertEquals(3, list.size());
assertTrue(list.contains("darth : 100"));
assertTrue(list.contains("darth : 200"));
assertTrue(list.contains("yoda : 300"));
assertThat(list.size()).isEqualTo(3);
assertThat(list.contains("darth : 100")).isTrue();
assertThat(list.contains("darth : 200")).isTrue();
assertThat(list.contains("yoda : 300")).isTrue();
} else {
assertEquals(2, list.size());
assertTrue(list.contains("darth : 100"));
assertTrue(list.contains("yoda : 300"));
assertThat(list.size()).isEqualTo(2);
assertThat(list.contains("darth : 100")).isTrue();
assertThat(list.contains("yoda : 300")).isTrue();
}

list.clear();
ksession.insert("go3");
ksession.fireAllRules();

if (kieBaseTestConfiguration.isIdentity()) {
assertEquals(2, list.size());
assertTrue(list.contains("darth : 100"));
assertTrue(list.contains("darth : 200"));
assertThat(list.size()).isEqualTo(2);
assertThat(list.contains("darth : 100")).isTrue();
assertThat(list.contains("darth : 200")).isTrue();
} else {
assertEquals(1, list.size());
assertTrue(list.contains("darth : 100"));
assertThat(list.size()).isEqualTo(1);
assertThat(list.contains("darth : 100")).isTrue();
}

list.clear();
ksession.insert("go4");
ksession.fireAllRules();
if (kieBaseTestConfiguration.isIdentity()) {
assertEquals(1, list.size());
assertTrue(list.contains("darth : 200"));
assertThat(list.size()).isEqualTo(1);
assertThat(list.contains("darth : 200")).isTrue();
} else {
assertEquals(0, list.size());
assertThat(list.size()).isEqualTo(0);
}
} finally {
ksession.dispose();
Expand Down
6 changes: 3 additions & 3 deletions ...iler-integration/src/test/java/org/drools/compiler/integrationtests/AbstractCellTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import org.kie.api.runtime.EnvironmentName;
import org.kie.api.runtime.KieSession;

import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;

public abstract class AbstractCellTest {

Expand Down Expand Up @@ -77,9 +77,9 @@ public void testCell() throws IOException, ClassNotFoundException {

session.fireAllRules();
if (kieBaseTestConfiguration.isIdentity()) {
assertEquals(9, cell.getValue());
assertThat(cell.getValue()).isEqualTo(9);
} else {
assertEquals(0, cell.getValue());
assertThat(cell.getValue()).isEqualTo(0);
}
} finally {
session.dispose();
Expand Down
22 changes: 10 additions & 12 deletions ...er-integration/src/test/java/org/drools/compiler/integrationtests/AbstractCepEspTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@
import org.kie.api.runtime.rule.FactHandle;
import org.kie.api.time.SessionPseudoClock;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
Expand Down Expand Up @@ -69,18 +67,18 @@ public void testAssertBehaviorOnEntryPoints() {
final FactHandle fh3 = ep1.insert(st3);

if (kieBaseTestConfiguration.isIdentity()) {
assertSame(fh1, fh1_2);
assertNotSame(fh1, fh2);
assertNotSame(fh1, fh3);
assertNotSame(fh2, fh3);
assertThat(fh1).isSameAs(fh1_2);
assertThat(fh1).isNotSameAs(fh2);
assertThat(fh1).isNotSameAs(fh3);
assertThat(fh2).isNotSameAs(fh3);

ksession.fireAllRules();
// must have fired 3 times, one for each event identity
verify(ael1, times(3)).afterMatchFired(any(AfterMatchFiredEvent.class));
} else {
assertSame(fh1, fh1_2);
assertSame(fh1, fh2);
assertNotSame(fh1, fh3);
assertThat(fh1).isSameAs(fh1_2);
assertThat(fh1).isNotSameAs(fh2);
assertThat(fh1).isNotSameAs(fh3);

ksession.fireAllRules();
// must have fired 2 times, one for each event equality
Expand Down Expand Up @@ -139,9 +137,9 @@ public void testDuplicateFiring2() {
} finally {
ksession.dispose();
if (kieBaseTestConfiguration.isIdentity()) {
assertEquals(Arrays.asList(1L, 2L, 1L, 1L), list);
assertThat(list).isEqualTo(Arrays.asList(1L, 2L, 1L, 1L));
} else {
assertEquals(Arrays.asList(1L, 2L, 1L), list);
assertThat(list).isEqualTo(Arrays.asList(1L, 2L, 1L));
}
}
}
Expand Down
17 changes: 8 additions & 9 deletions ...ler-integration/src/test/java/org/drools/compiler/integrationtests/AccumulateCepTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@
import org.kie.api.time.SessionPseudoClock;

import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.assertj.core.api.Assertions.assertThat;

@RunWith(Parameterized.class)
public class AccumulateCepTest {
Expand Down Expand Up @@ -127,7 +126,7 @@ public void testAccumulatesExpireVsCancel() throws Exception {

ksession.fireAllRules();

assertFalse(list.contains(0));
assertThat(list.contains(0)).isFalse();
} finally {
ksession.dispose();
}
Expand All @@ -148,28 +147,28 @@ public void testManySlidingWindows() {
// the same number
ksession.insert( new Integer( 20 ) );
ksession.fireAllRules();
assertEquals(asList(1, 1), list);
assertThat(list).isEqualTo(asList(1, 1));

ksession.insert(new Integer(20));
ksession.fireAllRules();

assertEquals(asList(2, 2), list);
assertThat(list).isEqualTo(asList(2, 2));

ksession.insert(new Integer(20));
ksession.fireAllRules();
assertEquals(asList(2, 3), list);
assertThat(list).isEqualTo(asList(2, 3));

ksession.insert(new Integer(2));
ksession.fireAllRules();
assertEquals(asList(2, 4), list);
assertThat(list).isEqualTo(asList(2, 4));

ksession.insert(new Integer(2));
ksession.fireAllRules();
assertEquals(asList(2, 5), list);
assertThat(list).isEqualTo(asList(2, 5));

ksession.insert(new Integer(2));
ksession.fireAllRules();
assertEquals(asList(2, 5), list);
assertThat(list).isEqualTo(asList(2, 5));
} finally {
ksession.dispose();
}
Expand Down
38 changes: 19 additions & 19 deletions ...gration/src/test/java/org/drools/compiler/integrationtests/AccumulateConsistencyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import org.kie.api.runtime.rule.QueryResults;
import org.kie.api.runtime.rule.Variable;

import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;

@RunWith(Parameterized.class)
public class AccumulateConsistencyTest {
Expand Down Expand Up @@ -81,9 +81,9 @@ public void testMinNoMatch() {
try {
kieSession.insert(new Person("Paul", 20));
if (accumulateNullPropagation) {
assertEquals(1, kieSession.fireAllRules());
assertThat(kieSession.fireAllRules()).isEqualTo(1);
} else {
assertEquals(0, kieSession.fireAllRules()); // don't propagate null
assertThat(kieSession.fireAllRules()).isEqualTo(0); // don't propagate null
}
} finally {
kieSession.dispose();
Expand Down Expand Up @@ -111,9 +111,9 @@ public void testMaxNoMatch() {
try {
kieSession.insert(new Person("Paul", 20));
if (accumulateNullPropagation) {
assertEquals(1, kieSession.fireAllRules());
assertThat(kieSession.fireAllRules()).isEqualTo(1);
} else {
assertEquals(0, kieSession.fireAllRules()); // don't propagate null
assertThat(kieSession.fireAllRules()).isEqualTo(0); // don't propagate null
}
} finally {
kieSession.dispose();
Expand Down Expand Up @@ -141,9 +141,9 @@ public void testAveNoMatch() {
try {
kieSession.insert(new Person("Paul", 20));
if (accumulateNullPropagation) {
assertEquals(1, kieSession.fireAllRules());
assertThat(kieSession.fireAllRules()).isEqualTo(1);
} else {
assertEquals(0, kieSession.fireAllRules()); // don't propagate null
assertThat(kieSession.fireAllRules()).isEqualTo(0); // don't propagate null
}
} finally {
kieSession.dispose();
Expand All @@ -170,7 +170,7 @@ public void testSumNoMatch() {

try {
kieSession.insert(new Person("Paul", 20));
assertEquals(1, kieSession.fireAllRules());
assertThat(kieSession.fireAllRules()).isEqualTo(1);
} finally {
kieSession.dispose();
}
Expand All @@ -196,7 +196,7 @@ public void testCountNoMatch() {

try {
kieSession.insert(new Person("Paul", 20));
assertEquals(1, kieSession.fireAllRules());
assertThat(kieSession.fireAllRules()).isEqualTo(1);
} finally {
kieSession.dispose();
}
Expand All @@ -223,7 +223,7 @@ public void testMinMaxNoMatch() {

try {
kieSession.insert(new Person("Paul", 20));
assertEquals(1, kieSession.fireAllRules());
assertThat(kieSession.fireAllRules()).isEqualTo(1);
} finally {
kieSession.dispose();
}
Expand Down Expand Up @@ -258,9 +258,9 @@ public void testMinMaxMatch() {
kieSession.insert(new Person(0, "John", 20));
kieSession.insert(new Person(1, "John", 60));

assertEquals(1, kieSession.fireAllRules());
assertEquals(20, result.get("min").intValue());
assertEquals(60, result.get("max").intValue());
assertThat(kieSession.fireAllRules()).isEqualTo(1);
assertThat(result.get("min").intValue()).isEqualTo(20);
assertThat(result.get("max").intValue()).isEqualTo(60);
} finally {
kieSession.dispose();
}
Expand Down Expand Up @@ -288,9 +288,9 @@ public void testMinNoMatchAccFrom() {
try {
kieSession.insert(new Person("Paul", 20));
if (accumulateNullPropagation) {
assertEquals(1, kieSession.fireAllRules());
assertThat(kieSession.fireAllRules()).isEqualTo(1);
} else {
assertEquals(0, kieSession.fireAllRules()); // don't propagate null
assertThat(kieSession.fireAllRules()).isEqualTo(0); // don't propagate null
}
} finally {
kieSession.dispose();
Expand Down Expand Up @@ -321,7 +321,7 @@ public void testMinMatchUnification() {
try {
kieSession.insert(new Person("John", 20));
kieSession.insert(new MyFact("A", 20));
assertEquals(1, kieSession.fireAllRules());
assertThat(kieSession.fireAllRules()).isEqualTo(1);
} finally {
kieSession.dispose();
}
Expand Down Expand Up @@ -351,9 +351,9 @@ public void testMinNoMatchUnification() {
kieSession.insert(new Person("Paul", 20));
kieSession.insert(new MyFact("A", null));
if (accumulateNullPropagation) {
assertEquals(1, kieSession.fireAllRules());
assertThat(kieSession.fireAllRules()).isEqualTo(1);
} else {
assertEquals(0, kieSession.fireAllRules()); // don't propagate null
assertThat(kieSession.fireAllRules()).isEqualTo(0); // don't propagate null
}
} finally {
kieSession.dispose();
Expand Down Expand Up @@ -384,7 +384,7 @@ public void testMinMatchUnificationQuery() {
kieSession.insert(new Person(1, "John", 19));
final QueryResults results = kieSession.getQueryResults("getResults", "John", Variable.v);
List<Person> persons = (List<Person>)results.iterator().next().get("$persons");
assertEquals(2, persons.size());
assertThat(persons.size()).isEqualTo(2);
} finally {
kieSession.dispose();
}
Expand Down
Loading

0 comments on commit d3319fe

Please sign in to comment.