From 9bf365d4dde10ca6ceac85cc4fa18082b2e25381 Mon Sep 17 00:00:00 2001 From: Martin Wittlinger Date: Sun, 23 Jan 2022 23:59:55 +0100 Subject: [PATCH 1/2] refactor(MainTest): The following has changed in the code: Replaced junit 4 test annotation with junit 5 test annotation in testGenericContract Replaced junit 4 test annotation with junit 5 test annotation in testTest Replaced junit 4 test annotation with junit 5 test annotation in testResourcesCopiedInTargetDirectory Replaced junit 4 test annotation with junit 5 test annotation in testResourcesNotCopiedInTargetDirectory Replaced junit 4 test annotation with junit 5 test annotation in testLauncherWithoutArgumentsExitWithSystemExit Transformed junit4 assert to junit 5 assertion in testTest Transformed junit4 assert to junit 5 assertion in testResourcesCopiedInTargetDirectory Transformed junit4 assert to junit 5 assertion in testResourcesNotCopiedInTargetDirectory --- src/test/java/spoon/test/main/MainTest.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/test/java/spoon/test/main/MainTest.java b/src/test/java/spoon/test/main/MainTest.java index 51fc310f0c0..2a8b2c669a8 100644 --- a/src/test/java/spoon/test/main/MainTest.java +++ b/src/test/java/spoon/test/main/MainTest.java @@ -17,10 +17,9 @@ package spoon.test.main; import org.junit.Rule; -import org.junit.Test; import org.junit.contrib.java.lang.system.Assertion; import org.junit.contrib.java.lang.system.ExpectedSystemExit; - +import org.junit.jupiter.api.Test; import spoon.ContractVerifier; import spoon.Launcher; import spoon.reflect.declaration.CtPackage; @@ -34,8 +33,8 @@ import java.nio.file.Path; import java.nio.file.Paths; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MainTest { @@ -145,7 +144,7 @@ public void testTest() { //Meta model classes doesn't have to follow test class naming conventions continue; } - assertTrue(t.getQualifiedName() + " is not clearly a test class, it should contain 'test' either in its package name or class name", t.getQualifiedName().matches("(?i:.*test.*)")); + assertTrue(t.getQualifiedName().matches("(?i:.*test.*)"), t.getQualifiedName() + " is not clearly a test class, it should contain 'test' either in its package name or class name"); } } From 663d234005bc41b9bf99db7ef8e31721f98297aa Mon Sep 17 00:00:00 2001 From: Martin Wittlinger Date: Mon, 24 Jan 2022 00:05:46 +0100 Subject: [PATCH 2/2] :rocket: --- src/test/java/spoon/test/main/MainTest.java | 27 --------------------- 1 file changed, 27 deletions(-) diff --git a/src/test/java/spoon/test/main/MainTest.java b/src/test/java/spoon/test/main/MainTest.java index 2a8b2c669a8..525ba8166b1 100644 --- a/src/test/java/spoon/test/main/MainTest.java +++ b/src/test/java/spoon/test/main/MainTest.java @@ -16,23 +16,17 @@ */ package spoon.test.main; -import org.junit.Rule; -import org.junit.contrib.java.lang.system.Assertion; -import org.junit.contrib.java.lang.system.ExpectedSystemExit; import org.junit.jupiter.api.Test; import spoon.ContractVerifier; import spoon.Launcher; import spoon.reflect.declaration.CtPackage; import spoon.reflect.declaration.CtType; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; -import java.io.PrintStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; - import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -198,25 +192,4 @@ public void testResourcesNotCopiedInTargetDirectory() { assertTrue(new File("src/test/resources/no-copy-resources/fr/inria/package.html").exists()); assertFalse(new File("target/spooned-without-resources/fr/inria/package.html").exists()); } - - @Rule - public final ExpectedSystemExit exit = ExpectedSystemExit.none(); - private final ByteArrayOutputStream errContent = new ByteArrayOutputStream(); - - @Test - public void testLauncherWithoutArgumentsExitWithSystemExit() { - exit.expectSystemExit(); - - final PrintStream oldErr = System.err; - System.setErr(new PrintStream(errContent)); - exit.checkAssertionAfterwards(new Assertion() { - @Override - public void checkAssertion() { - assertTrue(errContent.toString().contains("Usage: java [option(s)]")); - System.setErr(oldErr); - } - }); - - new Launcher().run(new String[] { }); - } }