Skip to content

Commit

Permalink
[7.x][DROOLS-6933] Migrate drools-core tests to assertj (apache#4489)
Browse files Browse the repository at this point in the history 
* [DROOLS-6933] Migrate drools-core tests to assertj (apache#4436)

* [DROOLS-6933] Migrate more drools-core tests to assertj
  • Loading branch information
@pibizza
pibizza authored Jun 27, 2022
1 parent 3cd1e8a commit aee4727
Show file tree
Hide file tree
Showing 72 changed files with 1,483 additions and 1,953 deletions.
10 changes: 5 additions & 5 deletions drools-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,6 @@
<artifactId>antlr</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.glassfish.jaxb</groupId>
Expand Down Expand Up @@ -132,6 +127,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down
181 changes: 62 additions & 119 deletions drools-core/src/test/java/org/drools/core/base/ClassTypeResolverTest.java
View file

Large diffs are not rendered by default.

17 changes: 7 additions & 10 deletions drools-core/src/test/java/org/drools/core/base/FieldFactoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,24 @@
import java.util.Date;
import java.util.Locale;

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

public class FieldFactoryTest {

@Test
public void testBigDecimal() {
final FieldValue val = FieldFactory.getInstance().getFieldValue( "42.42",
ValueType.BIG_DECIMAL_TYPE );
assertEquals( BigDecimal.class,
val.getValue().getClass() );
assertTrue( val.getValue().equals( new BigDecimal( "42.42" ) ) );
assertThat(val.getValue().getClass()).isEqualTo(BigDecimal.class);
assertThat(val.getValue().equals(new BigDecimal( "42.42" ))).isTrue();
}

@Test
public void testBigInteger() {
final FieldValue val = FieldFactory.getInstance().getFieldValue( "424242",
ValueType.BIG_INTEGER_TYPE );
assertEquals( BigInteger.class,
val.getValue().getClass() );
assertTrue( val.getValue().equals( new BigInteger( "424242" ) ) );
assertThat(val.getValue().getClass()).isEqualTo(BigInteger.class);
assertThat(val.getValue().equals(new BigInteger( "424242" ))).isTrue();
}

@Test
Expand All @@ -54,10 +51,10 @@ public void testDate() throws Exception {
String s = df.format(df.parse("10-Jul-1974"));
final FieldValue val = FieldFactory.getInstance().getFieldValue( s,
ValueType.DATE_TYPE );
assertEquals( Date.class, val.getValue().getClass() );
assertThat(val.getValue().getClass()).isEqualTo(Date.class);

Date dt = (Date) val.getValue();
assertEquals(s, df.format(dt));
assertThat(df.format(dt)).isEqualTo(s);

}

Expand Down
38 changes: 15 additions & 23 deletions drools-core/src/test/java/org/drools/core/base/FieldValueTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;

import static org.assertj.core.api.Assertions.assertThat;
import org.drools.core.spi.FieldValue;

public class FieldValueTest {
Expand All @@ -43,35 +43,27 @@ public void setUp() throws Exception {
*/
@Test
public void testHashCode() {
assertEquals( this.field1.hashCode(),
this.field1.hashCode() );
assertEquals( this.field1.hashCode(),
this.field2.hashCode() );
assertEquals( this.field3.hashCode(),
this.field3.hashCode() );
assertEquals( this.field3.hashCode(),
this.field4.hashCode() );
assertFalse( this.field1.hashCode() == this.field3.hashCode() );
assertFalse( this.field3.hashCode() == this.field1.hashCode() );
assertFalse( this.field3.hashCode() == this.field5.hashCode() );
assertThat(this.field1.hashCode()).isEqualTo(this.field1.hashCode());
assertThat(this.field2.hashCode()).isEqualTo(this.field1.hashCode());
assertThat(this.field3.hashCode()).isEqualTo(this.field3.hashCode());
assertThat(this.field4.hashCode()).isEqualTo(this.field3.hashCode());
assertThat(this.field1.hashCode() == this.field3.hashCode()).isFalse();
assertThat(this.field3.hashCode() == this.field1.hashCode()).isFalse();
assertThat(this.field3.hashCode() == this.field5.hashCode()).isFalse();
}

/*
* Test method for 'org.kie.base.FieldValue.equals(Object)'
*/
@Test
public void testEqualsObject() {
assertEquals( this.field1,
this.field1 );
assertEquals( this.field1,
this.field2 );
assertEquals( this.field3,
this.field3 );
assertEquals( this.field3,
this.field4 );
assertFalse( this.field1.equals( this.field3 ) );
assertFalse( this.field3.equals( this.field1 ) );
assertFalse( this.field3.equals( this.field5 ) );
assertThat(this.field1).isEqualTo(this.field1);
assertThat(this.field2).isEqualTo(this.field1);
assertThat(this.field3).isEqualTo(this.field3);
assertThat(this.field4).isEqualTo(this.field3);
assertThat(this.field1.equals(this.field3)).isFalse();
assertThat(this.field3.equals(this.field1)).isFalse();
assertThat(this.field3.equals(this.field5)).isFalse();
}

}
30 changes: 10 additions & 20 deletions drools-core/src/test/java/org/drools/core/base/TemporalEvaluatorFactoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,7 @@
import java.math.BigDecimal;
import java.math.BigInteger;

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

/**
* Test coverage for the temporal evaluators.
Expand Down Expand Up @@ -930,7 +927,7 @@ private void runEvaluatorTest(final Object[][] data,
parameters = parameters.split( "\\]" )[0];
}
EvaluatorDefinition evalDef = registry.getEvaluatorDefinition( evaluatorStr );
assertNotNull( evalDef );
assertThat(evalDef).isNotNull();
final Evaluator evaluator = evalDef.getEvaluator( valueType,
evaluatorStr,
isNegated,
Expand All @@ -954,8 +951,7 @@ private void runEvaluatorTest(final Object[][] data,
row,
evaluator );

assertEquals( valueType,
evaluator.getValueType() );
assertThat(evaluator.getValueType()).isEqualTo(valueType);

}
}
Expand All @@ -972,11 +968,9 @@ private void checkEvaluatorMethodWith2Extractors(final ValueType valueType,
final String message = "The evaluator type: [" + valueType + "] with 2 extractors incorrectly returned " + result + " for [" + row[0] + " " + row[1] + " " + row[2] + "]. It was asserted to return " + row[3];

if ( row[3] == Boolean.TRUE ) {
assertTrue( message,
result );
assertThat(result).as(message).isTrue();
} else {
assertFalse( message,
result );
assertThat(result).as(message).isFalse();
}
}

Expand All @@ -995,11 +989,9 @@ private void checkEvaluatorMethodCachedRight(final ValueType valueType,
final String message = "The evaluator type: [" + valueType + "] with CachedRight incorrectly returned " + result + " for [" + row[0] + " " + row[1] + " " + row[2] + "]. It was asserted to return " + row[3];

if ( row[3] == Boolean.TRUE ) {
assertTrue( message,
result );
assertThat(result).as(message).isTrue();
} else {
assertFalse( message,
result );
assertThat(result).as(message).isFalse();
}
}

Expand All @@ -1018,11 +1010,9 @@ private void checkEvaluatorMethodCachedLeft(final ValueType valueType,
final String message = "The evaluator type: [" + valueType + "] with CachedLeft incorrectly returned " + result + " for [" + row[0] + " " + row[1] + " " + row[2] + "]. It was asserted to return " + row[3];

if ( row[3] == Boolean.TRUE ) {
assertTrue( message,
result );
assertThat(result).as(message).isTrue();
} else {
assertFalse( message,
result );
assertThat(result).as(message).isFalse();
}
}

Expand All @@ -1040,7 +1030,7 @@ private void checkEvaluatorMethodWithFieldValue(final ValueType valueType,
} catch ( RuntimeException e ) {
exc = e;
}
assertNotNull( exc );
assertThat(exc).isNotNull();
}

private VariableContextEntry getContextEntry(final Evaluator evaluator,
Expand Down
31 changes: 16 additions & 15 deletions drools-core/src/test/java/org/drools/core/base/ValueTypeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,31 @@
package org.drools.core.base;

import org.junit.Test;
import static org.junit.Assert.*;

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

public class ValueTypeTest {

@Test
public void testIsBoolean() {
assertTrue( ValueType.BOOLEAN_TYPE.isBoolean() );
assertTrue( ValueType.PBOOLEAN_TYPE.isBoolean() );
assertThat(ValueType.BOOLEAN_TYPE.isBoolean()).isTrue();
assertThat(ValueType.PBOOLEAN_TYPE.isBoolean()).isTrue();
}

@Test
public void testIsNumber() {
assertTrue( ValueType.PBYTE_TYPE.isNumber() );
assertTrue( ValueType.PSHORT_TYPE.isNumber() );
assertTrue( ValueType.PINTEGER_TYPE.isNumber() );
assertTrue( ValueType.PLONG_TYPE.isNumber() );
assertTrue( ValueType.PFLOAT_TYPE.isNumber() );
assertTrue( ValueType.PDOUBLE_TYPE.isNumber() );
assertTrue( ValueType.BYTE_TYPE.isNumber() );
assertTrue( ValueType.SHORT_TYPE.isNumber() );
assertTrue( ValueType.INTEGER_TYPE.isNumber() );
assertTrue( ValueType.LONG_TYPE.isNumber() );
assertTrue( ValueType.FLOAT_TYPE.isNumber() );
assertTrue( ValueType.DOUBLE_TYPE.isNumber() );
assertThat(ValueType.PBYTE_TYPE.isNumber()).isTrue();
assertThat(ValueType.PSHORT_TYPE.isNumber()).isTrue();
assertThat(ValueType.PINTEGER_TYPE.isNumber()).isTrue();
assertThat(ValueType.PLONG_TYPE.isNumber()).isTrue();
assertThat(ValueType.PFLOAT_TYPE.isNumber()).isTrue();
assertThat(ValueType.PDOUBLE_TYPE.isNumber()).isTrue();
assertThat(ValueType.BYTE_TYPE.isNumber()).isTrue();
assertThat(ValueType.SHORT_TYPE.isNumber()).isTrue();
assertThat(ValueType.INTEGER_TYPE.isNumber()).isTrue();
assertThat(ValueType.LONG_TYPE.isNumber()).isTrue();
assertThat(ValueType.FLOAT_TYPE.isNumber()).isTrue();
assertThat(ValueType.DOUBLE_TYPE.isNumber()).isTrue();

}

Expand Down
18 changes: 10 additions & 8 deletions drools-core/src/test/java/org/drools/core/base/accumulators/VarianceNaNTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import org.drools.core.base.accumulators.VarianceAccumulateFunction.VarianceData;
import org.junit.Test;
import static org.junit.Assert.*;

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

public class VarianceNaNTest {

Expand All @@ -11,22 +13,22 @@ public void shouldNotProduceNaNAfterBackout(){
VarianceAccumulateFunction varianceAccumulateFunction = new VarianceAccumulateFunction();
VarianceData data = varianceAccumulateFunction.createContext();
varianceAccumulateFunction.init(data);

//Before being initialized result is NaN.
assertEquals(Double.NaN, varianceAccumulateFunction.getResult(data), 0);
assertThat(varianceAccumulateFunction.getResult(data)).isCloseTo(Double.NaN, within(0.0));

Double value = 1.5;

//With single value variance should be 0
varianceAccumulateFunction.accumulate(data, value);
assertEquals(0.0d, varianceAccumulateFunction.getResult(data), .001d);
varianceAccumulateFunction.accumulate(data, value);
assertThat(varianceAccumulateFunction.getResult(data)).isCloseTo(0.0d, within(.001d));

//should be back to NaN after backout
varianceAccumulateFunction.reverse(data, value);
assertEquals(Double.NaN, varianceAccumulateFunction.getResult(data), 0);
assertThat(varianceAccumulateFunction.getResult(data)).isCloseTo(Double.NaN, within(0.0));

//should be zero after adding number back
varianceAccumulateFunction.accumulate(data, value);
assertEquals(0.0d, varianceAccumulateFunction.getResult(data), .001d);
varianceAccumulateFunction.accumulate(data, value);
assertThat(varianceAccumulateFunction.getResult(data)).isCloseTo(0.0d, within(.001d));
}
}
Loading

0 comments on commit aee4727

Please sign in to comment.