Skip to content

Commit 1853bdc

Browse files
lucaneglucaneg
committed
moving to junit 5
1 parent b7ac18a commit 1853bdc

File tree

100 files changed

+905
-899
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+905
-899
lines changed

‎lisa/java.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ javadoc {
5050
}
5151

5252
test {
53+
useJUnitPlatform()
54+
5355
filter {
5456
includeTestsMatching 'it.unive.lisa.*'
5557
excludeTestsMatching 'it.unive.lisa.cron.*'

‎lisa/lisa-analyses/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ dependencies {
55

66
// testing
77
testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.19.4'
8-
testImplementation 'junit:junit:4.12'
8+
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
99
}

‎lisa/lisa-analyses/src/test/java/it/unive/lisa/CronUtils.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package it.unive.lisa;
22

3-
import static org.junit.Assert.fail;
3+
import static org.junit.jupiter.api.Assertions.fail;
44

55
import it.unive.lisa.outputs.serializableGraph.SerializableGraph;
66
import it.unive.lisa.util.file.FileManager;
@@ -12,13 +12,13 @@
1212
import java.io.Reader;
1313
import java.nio.charset.StandardCharsets;
1414
import java.nio.file.Paths;
15-
import org.junit.Ignore;
16-
import org.junit.Test;
15+
import org.junit.jupiter.api.Disabled;
16+
import org.junit.jupiter.api.Test;
1717

1818
public class CronUtils {
1919

2020
@Test
21-
@Ignore("This is just an utility to visualize the json graphs generated by the test system")
21+
@Disabled("This is just an utility to visualize the json graphs generated by the test system")
2222
public void generateFromJson()
2323
throws IOException {
2424
String target = "test-outputs/numeric/sign/untyped_tutorial.sign_parity_example(tutorial__this).json";

‎lisa/lisa-analyses/src/test/java/it/unive/lisa/EqualityContractVerificationTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package it.unive.lisa;
22

3-
import static org.junit.Assert.assertTrue;
3+
import static org.junit.jupiter.api.Assertions.assertTrue;
44

55
import guru.nidi.graphviz.model.Factory;
66
import guru.nidi.graphviz.model.MutableGraph;
@@ -156,9 +156,9 @@
156156
import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
157157
import org.apache.commons.collections4.ListUtils;
158158
import org.apache.commons.lang3.tuple.Pair;
159-
import org.junit.AfterClass;
160-
import org.junit.BeforeClass;
161-
import org.junit.Test;
159+
import org.junit.jupiter.api.AfterAll;
160+
import org.junit.jupiter.api.BeforeAll;
161+
import org.junit.jupiter.api.Test;
162162
import org.reflections.Reflections;
163163
import org.reflections.scanners.SubTypesScanner;
164164

@@ -239,7 +239,7 @@ public class EqualityContractVerificationTest {
239239

240240
private static final Collection<Class<?>> tested = new HashSet<>();
241241

242-
@BeforeClass
242+
@BeforeAll
243243
public static void setup() {
244244
adj1.addNode(new Ret(cfg1, loc));
245245
g1.add(Factory.mutNode("a"));
@@ -249,7 +249,7 @@ private static Reflections mkReflections() {
249249
return new Reflections("it.unive.lisa", SemanticOracle.class, new SubTypesScanner(false));
250250
}
251251

252-
@AfterClass
252+
@AfterAll
253253
public static void ensureAllTested()
254254
throws ClassNotFoundException,
255255
NoSuchMethodException,
@@ -278,7 +278,7 @@ && definesEqualsHashcode(clazz)
278278
if (!notTested.isEmpty())
279279
System.err.println("The following equals/hashcode implementations have not been tested: " + notTested);
280280

281-
assertTrue("Not all equals/hashcode have been tested", notTested.isEmpty());
281+
assertTrue(notTested.isEmpty(), "Not all equals/hashcode have been tested");
282282
}
283283

284284
private static boolean definesEqualsHashcode(

‎lisa/lisa-analyses/src/test/java/it/unive/lisa/TestParameterProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package it.unive.lisa;
22

3-
import static org.junit.Assert.fail;
3+
import static org.junit.jupiter.api.Assertions.fail;
44

55
import it.unive.lisa.analysis.AbstractDomain;
66
import it.unive.lisa.analysis.AbstractLattice;

‎lisa/lisa-analyses/src/test/java/it/unive/lisa/analysis/heap/pointbased/PointBasedHeapTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package it.unive.lisa.analysis.heap.pointbased;
22

3-
import static org.junit.Assert.assertEquals;
4-
import static org.junit.Assert.assertFalse;
5-
import static org.junit.Assert.assertTrue;
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertFalse;
5+
import static org.junit.jupiter.api.Assertions.assertTrue;
66

77
import it.unive.lisa.TestParameterProvider;
88
import it.unive.lisa.analysis.ScopeToken;
@@ -42,7 +42,7 @@
4242
import java.util.HashSet;
4343
import java.util.List;
4444
import org.apache.commons.lang3.tuple.Pair;
45-
import org.junit.Test;
45+
import org.junit.jupiter.api.Test;
4646

4747
public class PointBasedHeapTest {
4848

‎lisa/lisa-analyses/src/test/java/it/unive/lisa/analysis/nonrelational/EnvironmentTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package it.unive.lisa.analysis.nonrelational;
22

3-
import static org.junit.Assert.assertEquals;
4-
import static org.junit.Assert.assertSame;
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertSame;
55

66
import it.unive.lisa.analysis.ScopeToken;
77
import it.unive.lisa.analysis.SemanticException;
@@ -18,7 +18,7 @@
1818
import it.unive.lisa.symbolic.value.Variable;
1919
import it.unive.lisa.type.Untyped;
2020
import java.util.Set;
21-
import org.junit.Test;
21+
import org.junit.jupiter.api.Test;
2222

2323
public class EnvironmentTest {
2424

‎lisa/lisa-analyses/src/test/java/it/unive/lisa/analysis/nonrelational/value/BaseNonRelationalTypeDomainTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package it.unive.lisa.analysis.nonrelational.value;
22

3-
import static org.junit.Assert.assertSame;
4-
import static org.junit.Assert.assertTrue;
5-
import static org.junit.Assert.fail;
3+
import static org.junit.jupiter.api.Assertions.assertSame;
4+
import static org.junit.jupiter.api.Assertions.assertTrue;
5+
import static org.junit.jupiter.api.Assertions.fail;
66

77
import it.unive.lisa.TestParameterProvider;
88
import it.unive.lisa.analysis.Lattice;
@@ -13,7 +13,7 @@
1313
import java.lang.reflect.Method;
1414
import java.lang.reflect.Modifier;
1515
import java.util.concurrent.atomic.AtomicReference;
16-
import org.junit.Test;
16+
import org.junit.jupiter.api.Test;
1717

1818
public class BaseNonRelationalTypeDomainTest {
1919

@@ -31,19 +31,19 @@ public void testDefaults()
3131
Object ret = mtd.invoke(new TestParameterProvider.SampleNRTD(), params);
3232
if (mtd.getName().startsWith("eval"))
3333
assertTrue(
34-
"Default implementation of " + mtd.getName() + " did not return top",
35-
((Lattice<?>) ret).isTop());
34+
((Lattice<?>) ret).isTop(),
35+
"Default implementation of " + mtd.getName() + " did not return top");
3636
else if (mtd.getName().startsWith("satisfies"))
3737
assertSame(
38-
"Default implementation of " + mtd.getName() + " did not return UNKNOWN",
3938
Satisfiability.UNKNOWN,
40-
ret);
39+
ret,
40+
"Default implementation of " + mtd.getName() + " did not return UNKNOWN");
4141
else if (mtd.getName().startsWith("assume"))
4242
assertSame(
43-
"Default implementation of " + mtd.getName()
44-
+ " did not return an unchanged environment",
4543
params[envPos.get()],
46-
ret);
44+
ret,
45+
"Default implementation of " + mtd.getName()
46+
+ " did not return an unchanged environment");
4747

4848
} catch (Exception e) {
4949
e.printStackTrace();

‎lisa/lisa-analyses/src/test/java/it/unive/lisa/analysis/nonrelational/value/BaseNonRelationalValueDomainTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package it.unive.lisa.analysis.nonrelational.value;
22

3-
import static org.junit.Assert.assertSame;
4-
import static org.junit.Assert.assertTrue;
5-
import static org.junit.Assert.fail;
3+
import static org.junit.jupiter.api.Assertions.assertSame;
4+
import static org.junit.jupiter.api.Assertions.assertTrue;
5+
import static org.junit.jupiter.api.Assertions.fail;
66

77
import it.unive.lisa.TestParameterProvider;
88
import it.unive.lisa.analysis.Lattice;
@@ -11,7 +11,7 @@
1111
import java.lang.reflect.Method;
1212
import java.lang.reflect.Modifier;
1313
import java.util.concurrent.atomic.AtomicReference;
14-
import org.junit.Test;
14+
import org.junit.jupiter.api.Test;
1515

1616
public class BaseNonRelationalValueDomainTest {
1717

@@ -29,19 +29,19 @@ public void testDefaults()
2929
Object ret = mtd.invoke(new TestParameterProvider.SampleNRVD(), params);
3030
if (mtd.getName().startsWith("eval"))
3131
assertTrue(
32-
"Default implementation of " + mtd.getName() + " did not return top",
33-
((Lattice<?>) ret).isTop());
32+
((Lattice<?>) ret).isTop(),
33+
"Default implementation of " + mtd.getName() + " did not return top");
3434
else if (mtd.getName().startsWith("satisfies"))
3535
assertSame(
36-
"Default implementation of " + mtd.getName() + " did not return UNKNOWN",
3736
Satisfiability.UNKNOWN,
38-
ret);
37+
ret,
38+
"Default implementation of " + mtd.getName() + " did not return UNKNOWN");
3939
else if (mtd.getName().startsWith("assume"))
4040
assertSame(
41-
"Default implementation of " + mtd.getName()
42-
+ " did not return an unchanged environment",
4341
params[envPos.get()],
44-
ret);
42+
ret,
43+
"Default implementation of " + mtd.getName()
44+
+ " did not return an unchanged environment");
4545

4646
} catch (Exception e) {
4747
e.printStackTrace();

0 commit comments

Comments
 (0)