Fix test suite for Gradle

pixee · Aug 16, 2023 · d6ba5e6 · d6ba5e6
1 parent e3c506e
commit d6ba5e6
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 63 deletions.
diff --git a/pom-operator/build.gradle.kts b/pom-operator/build.gradle.kts
@@ -38,7 +38,7 @@ dependencies {
     testImplementation("fun.mike:diff-match-patch:0.0.2")
     testImplementation("io.github.java-diff-utils:java-diff-utils:4.12")
     testImplementation("org.hamcrest:hamcrest-all:1.3")
-    testImplementation("junit:junit:4.13.2")
+    testImplementation(testlibs.bundles.junit.jupiter)
     compileOnly("org.slf4j:slf4j-api:2.0.0")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
     testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.2")

diff --git a/pom-operator/src/test/java/io/github/pixee/maven/operator/test/POMOperatorJavaIT.java b/pom-operator/src/test/java/io/github/pixee/maven/operator/test/POMOperatorJavaIT.java
@@ -1,12 +1,12 @@
 package io.github.pixee.maven.operator.test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.github.pixee.maven.operator.Util;
 import java.util.Arrays;
 import java.util.List;
 import org.apache.commons.lang3.SystemUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class POMOperatorJavaIT {
   @Test
@@ -35,6 +35,6 @@ public void testJavaSample() throws Exception {
 
     int retCode = process.waitFor();
 
-    assertEquals("Embedded execution must return zero", 0, retCode);
+    assertEquals(0, retCode, "Embedded execution must return zero");
   }
 }
diff --git a/pom-operator/src/test/kotlin/io/github/pixee/maven/operator/test/AbstractTestBase.kt b/pom-operator/src/test/kotlin/io/github/pixee/maven/operator/test/AbstractTestBase.kt
@@ -6,7 +6,7 @@ import io.github.pixee.maven.operator.ProjectModel
 import io.github.pixee.maven.operator.ProjectModelFactory
 import org.dom4j.Document
 import org.dom4j.io.SAXReader
-import org.junit.Assert.assertFalse
+import org.junit.jupiter.api.Assertions.assertFalse
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.xmlunit.builder.DiffBuilder
@@ -57,8 +57,8 @@ open class AbstractTestBase {
             LOGGER.debug("context after: {}", context)
 
             assertFalse(
-                "Expected and outcome have differences",
-                getXmlDifferences(context.pomFile.resultPom, outcome).hasDifferences()
+                getXmlDifferences(context.pomFile.resultPom, outcome).hasDifferences(),
+                    "Expected and outcome have differences"
             )
         } else {
             val resultFilePath = "src/test/resources/" + this.javaClass.`package`.name.replace(

diff --git a/pom-operator/src/test/kotlin/io/github/pixee/maven/operator/test/MassRepoTest.kt b/pom-operator/src/test/kotlin/io/github/pixee/maven/operator/test/MassRepoTest.kt
@@ -5,9 +5,9 @@ import io.github.pixee.maven.operator.POMOperator
 import io.github.pixee.maven.operator.ProjectModelFactory
 import io.github.pixee.maven.operator.Util.which
 import org.apache.commons.lang3.SystemUtils
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Test
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.io.File
@@ -166,14 +166,16 @@ class MassRepoIT {
         val dependencyAsStringWithPackaging = dependencyToUpgrade.toString()
 
         assertFalse(
-            "Dependency should be originally missing", originalDependencies.contains(
+            originalDependencies.contains(
                 dependencyAsStringWithPackaging
-            )
+            ),
+                "Dependency should be originally missing"
         )
         assertTrue(
-            "New Dependency should be appearing", finalDependencies.contains(
+            finalDependencies.contains(
                 dependencyAsStringWithPackaging
-            )
+            ),
+                "New Dependency should be appearing"
         )
     }
 

diff --git a/pom-operator/src/test/kotlin/io/github/pixee/maven/operator/test/POMOperatorMultipomTest.kt b/pom-operator/src/test/kotlin/io/github/pixee/maven/operator/test/POMOperatorMultipomTest.kt
@@ -2,14 +2,15 @@ package io.github.pixee.maven.operator.test
 
 import com.google.common.io.Files
 import io.github.pixee.maven.operator.*
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import java.io.File
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 class POMOperatorMultipomTest : AbstractTestBase() {
-    @Test(expected = WrongDependencyTypeException::class)
+    @Test
     fun testWithParentAndChildMissingPackaging() {
+        // expected = WrongDependencyTypeException::class
         val parentResource = getResource("parent-and-child-parent-broken.xml")
 
         val parentPomFiles = listOf(POMDocumentFactory.load(parentResource))
@@ -24,7 +25,7 @@ class POMOperatorMultipomTest : AbstractTestBase() {
         )
     }
 
-    @Test(expected = WrongDependencyTypeException::class)
+    @Test
     fun testWithParentAndChildWrongType() {
         val parentResource = getResource("parent-and-child-child-broken.xml")
 

diff --git a/pom-operator/src/test/kotlin/io/github/pixee/maven/operator/test/POMOperatorQueryTest.kt b/pom-operator/src/test/kotlin/io/github/pixee/maven/operator/test/POMOperatorQueryTest.kt
@@ -1,8 +1,8 @@
 package io.github.pixee.maven.operator.test
 
 import io.github.pixee.maven.operator.*
-import junit.framework.TestCase.*
-import org.junit.Test
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Test
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.io.File
@@ -26,7 +26,7 @@ class POMOperatorQueryTest {
 
             LOGGER.debug("Dependencies found: {}", dependencies)
 
-            assertTrue("Dependencies are not empty", dependencies.isNotEmpty())
+            assertTrue(dependencies.isNotEmpty(), "Dependencies are not empty")
         }
     }
 
@@ -40,11 +40,12 @@ class POMOperatorQueryTest {
 
         val dependencies = POMOperator.queryDependency(context)
 
-        assertTrue("Dependencies are empty", dependencies.isEmpty())
+        assertTrue(dependencies.isEmpty(), "Dependencies are empty")
     }
 
-    @Test(expected = IllegalStateException::class)
+    @Test
     fun testFailedUnsafeQuery() {
+        // expected = IllegalStateException::class
         val context =
             ProjectModelFactory
                 .load(this.javaClass.getResource("pom-broken.xml")!!)
@@ -53,7 +54,7 @@ class POMOperatorQueryTest {
 
         val dependencies = POMOperator.queryDependency(context)
 
-        assertTrue("Dependencies are empty", dependencies.isEmpty())
+        assertTrue(dependencies.isEmpty(), "Dependencies are empty")
     }
 
     @Test
@@ -74,7 +75,7 @@ class POMOperatorQueryTest {
                 val dependencies =
                     POMOperator.queryDependency(context, commandList = commandListOverride)
 
-                assertTrue("Dependencies are not empty", dependencies.isNotEmpty())
+                assertTrue(dependencies.isNotEmpty(), "Dependencies are not empty")
             }
         }
     }
@@ -87,11 +88,11 @@ class POMOperatorQueryTest {
 
             LOGGER.info("Using queryType: $queryType at $tempDirectory")
 
-            assertFalse("Temp Directory does not exist initially", tempDirectory.exists())
+            assertFalse(tempDirectory.exists(), "Temp Directory does not exist initially")
             assertEquals(
-                "There must be no files",
                 tempDirectory.list()?.filter { File(it).isDirectory }?.size ?: 0,
                 0,
+                "There must be no files"
             )
 
             val context =
@@ -105,10 +106,10 @@ class POMOperatorQueryTest {
 
             LOGGER.debug("Dependencies found: {}", dependencies)
 
-            assertTrue("Dependencies are not empty", dependencies.isNotEmpty())
+            assertTrue(dependencies.isNotEmpty(), "Dependencies are not empty")
 
-            assertTrue("Temp Directory ends up existing", tempDirectory.exists())
-            assertTrue("Temp Directory is a directory", tempDirectory.isDirectory)
+            assertTrue(tempDirectory.exists(), "Temp Directory ends up existing")
+            assertTrue(tempDirectory.isDirectory, "Temp Directory is a directory")
         }
     }
 
@@ -130,7 +131,7 @@ class POMOperatorQueryTest {
 
                 LOGGER.debug("Dependencies found: {}", dependencies)
 
-                assertTrue("Dependencies are not empty", dependencies.isNotEmpty())
+                assertTrue(dependencies.isNotEmpty(), "Dependencies are not empty")
             }
     }
 
@@ -179,9 +180,9 @@ class POMOperatorQueryTest {
 
         LOGGER.debug("Dependencies found: {}", dependencies)
 
-        assertTrue("Dependencies are not empty", dependencies.isNotEmpty())
+        assertTrue(dependencies.isNotEmpty(), "Dependencies are not empty")
 
-        assertTrue("Random name matches", dependencies.first().artifactId.equals(randomName))
+        assertTrue(dependencies.first().artifactId.equals(randomName), "Random name matches")
     }
 
     @Test
@@ -268,9 +269,9 @@ class POMOperatorQueryTest {
 
         LOGGER.debug("Dependencies found: {}", dependencies)
 
-        assertTrue("Dependencies are not empty", dependencies.isNotEmpty())
+        assertTrue(dependencies.isNotEmpty(), "Dependencies are not empty")
 
-        assertTrue("Random name matches", dependencies.first().artifactId.equals(randomName))
+        assertTrue(dependencies.first().artifactId.equals(randomName), "Random name matches")
     }
 
     @Test
@@ -332,7 +333,7 @@ class POMOperatorQueryTest {
 
         LOGGER.debug("Dependencies found: {}", dependencies)
 
-        assertTrue("Dependencies are empty", dependencies.isEmpty())
+        assertTrue(dependencies.isEmpty(), "Dependencies are empty")
     }
 
     @Test
@@ -402,12 +403,12 @@ class POMOperatorQueryTest {
 
         LOGGER.debug("Dependencies found: {}", dependencies)
 
-        assertTrue("Dependencies are empty", dependencies.isNotEmpty())
+        assertTrue(dependencies.isNotEmpty(), "Dependencies are empty")
 
         val foundDependencies =
             dependencies.firstOrNull { it.version == "0.0.1" && it.artifactId.equals("managed-$randomName") }
 
-        assertTrue("there's a dependencyManaged-version", foundDependencies != null)
+        assertTrue(foundDependencies != null, "there's a dependencyManaged-version")
     }
 
     private fun getCommandListFor(vararg names: String): List<Command> =
@@ -436,7 +437,7 @@ class POMOperatorQueryTest {
 
         LOGGER.debug("Dependencies found: {}", dependencies)
 
-        assertTrue("Dependencies are empty", dependencies.isEmpty())
+        assertTrue(dependencies.isEmpty(), "Dependencies are empty")
 
     }
 }
diff --git a/pom-operator/src/test/kotlin/io/github/pixee/maven/operator/test/POMOperatorTest.kt b/pom-operator/src/test/kotlin/io/github/pixee/maven/operator/test/POMOperatorTest.kt
@@ -7,8 +7,8 @@ import io.github.pixee.maven.operator.Util.which
 import org.apache.commons.lang3.SystemUtils
 import org.dom4j.DocumentException
 import org.hamcrest.MatcherAssert.assertThat
-import org.junit.Assert.assertEquals
-import org.junit.Test
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
 import org.xmlunit.diff.ComparisonType
 import java.io.File
 import java.nio.charset.Charset
@@ -19,8 +19,9 @@ import kotlin.test.assertTrue
  * Unit test for simple App.
  */
 class POMOperatorTest : AbstractTestBase() {
-    @Test(expected = DocumentException::class)
+    @Test
     fun testWithBrokenPom() {
+        // expected = DocumentException::class
         gwt(
             "broken-pom",
             ProjectModelFactory.load(
@@ -76,8 +77,9 @@ class POMOperatorTest : AbstractTestBase() {
         )
     }
 
-    @Test(expected = MissingDependencyException::class)
+    @Test
     fun testWithDependencyMissing() {
+        // expected = MissingDependencyException::class
         gwt(
             "case-dependency-missing",
             ProjectModelFactory.load(
@@ -318,14 +320,15 @@ class POMOperatorTest : AbstractTestBase() {
         )
 
         assertEquals(
-            "Document changes a property called 'sample.version'",
-            differenceList.first().comparison.testDetails.xPath,
-            "/project[1]/properties[1]/sample.version[1]/text()[1]"
+                        differenceList.first().comparison.testDetails.xPath,
+            "/project[1]/properties[1]/sample.version[1]/text()[1]",
+                "Document changes a property called 'sample.version'"
         )
     }
 
-    @Test(expected = IllegalStateException::class)
+    @Test
     fun testCaseWithPropertyDefinedTwice() {
+        // expected = IllegalStateException::class
         val dependencyToUpgrade =
             Dependency("org.dom4j", "dom4j", version = "1.0.0")
 

diff --git a/pom-operator/src/test/kotlin/io/github/pixee/maven/operator/test/POMScannerTest.kt b/pom-operator/src/test/kotlin/io/github/pixee/maven/operator/test/POMScannerTest.kt
@@ -2,7 +2,7 @@ package io.github.pixee.maven.operator.test
 
 import io.github.pixee.maven.operator.InvalidPathException
 import io.github.pixee.maven.operator.POMScanner
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import java.io.File
 import kotlin.test.assertTrue
 import kotlin.test.fail
@@ -17,8 +17,9 @@ class POMScannerTest: AbstractTestBase() {
         val pmf = POMScanner.scanFrom(pomFile, currentDirectory)
     }
 
-    @Test(expected = InvalidPathException::class)
+    @Test
     fun testTwoLevelsWithLoop() {
+        // expected = InvalidPathException::class
         val pomFile = getResourceAsFile("sample-child-with-relativepath-and-two-levels.xml")
 
         val pmf = POMScanner.scanFrom(pomFile, currentDirectory)
@@ -102,4 +103,4 @@ class POMScannerTest: AbstractTestBase() {
             }
         }
     }
-}
+}