assert fixes

Skatteetaten · Nov 19, 2020 · 5cbf323 · 5cbf323
1 parent fbeffbd
commit 5cbf323
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/test/kotlin/no/skatteetaten/aurora/gradle/plugins/unit/AuroraToolsTest.kt b/src/test/kotlin/no/skatteetaten/aurora/gradle/plugins/unit/AuroraToolsTest.kt
@@ -105,9 +105,9 @@ class AuroraToolsTest {
         val metaEntryCount = zipEntries.filter { it.name.contains("Leveransepakke/metadata") }
         val distDir = testProjectDir.resolve("build/distributions")
 
-        assertThat(libEntry?.isDirectory ?: false).isTrue()
+        assertThat(libEntry?.isDirectory).isNotNull().isTrue()
         assertThat(libEntryCount.size).isEqualTo(2)
-        assertThat(metaEntry?.isDirectory ?: false).isTrue()
+        assertThat(metaEntry?.isDirectory).isNotNull().isTrue()
         assertThat(metaEntryCount.size).isEqualTo(2)
         assertThat(distDir.listFiles().size).isEqualTo(1)
         assertThat(distDir.listFiles().first().name).contains("Leveransepakke")
@@ -170,9 +170,9 @@ class AuroraToolsTest {
         val distDir = testProjectDir.resolve("build/distributions")
 
         assertThat(libEntry).isNotNull()
-        assertThat(libEntry?.isDirectory ?: false).isTrue()
+        assertThat(libEntry?.isDirectory).isNotNull().isTrue()
         assertThat(metaEntry).isNotNull()
-        assertThat(metaEntry?.isDirectory ?: false).isTrue()
+        assertThat(metaEntry?.isDirectory).isNotNull().isTrue()
         assertThat(result.taskOutcome()).isSuccessOrEqualTo()
         assertThat(distDir.listFiles()).hasSize(1)
         assertThat(distDir.listFiles().first().name).contains("Leveransepakke")
@@ -246,9 +246,9 @@ class AuroraToolsTest {
         val metaEntryCount = zipEntries.filter { it.name.contains("Leveransepakke/metadata") }
         val distDir = testProjectDir.resolve("build/distributions")
 
-        assertThat(libEntry?.isDirectory ?: false).isTrue()
+        assertThat(libEntry?.isDirectory).isNotNull().isTrue()
         assertThat(libEntryCount.size).isEqualTo(3)
-        assertThat(metaEntry?.isDirectory ?: false).isTrue()
+        assertThat(metaEntry?.isDirectory).isNotNull().isTrue()
         assertThat(metaEntryCount.size).isEqualTo(2)
         assertThat(distDir.listFiles().size).isEqualTo(1)
         assertThat(distDir.listFiles().first().name).contains("Leveransepakke")

diff --git a/src/test/kotlin/no/skatteetaten/aurora/gradle/plugins/unit/JavaToolsTest.kt b/src/test/kotlin/no/skatteetaten/aurora/gradle/plugins/unit/JavaToolsTest.kt
@@ -128,9 +128,9 @@ class JavaToolsTest {
         val metaEntry = zipEntries.find { it.name.endsWith("metadata/") }
         val metaEntryCount = zipEntries.filter { it.name.contains("Leveransepakke/metadata") }
 
-        assertThat(libEntry?.isDirectory ?: false).isTrue()
+        assertThat(libEntry?.isDirectory).isNotNull().isTrue()
         assertThat(libEntryCount.size).isEqualTo(2)
-        assertThat(metaEntry?.isDirectory ?: false).isTrue()
+        assertThat(metaEntry?.isDirectory).isNotNull().isTrue()
         assertThat(metaEntryCount.size).isEqualTo(2)
         assertThat(result.taskOutcome()).isSuccessOrEqualTo()
     }
@@ -189,9 +189,9 @@ class JavaToolsTest {
         val metaEntry = jarAsZip.entries().toList().find { it.name.endsWith("metadata/") }
 
         assertThat(libEntry).isNotNull()
-        assertThat(libEntry?.isDirectory ?: false).isTrue()
+        assertThat(libEntry?.isDirectory).isNotNull().isTrue()
         assertThat(metaEntry).isNotNull()
-        assertThat(metaEntry?.isDirectory ?: false).isTrue()
+        assertThat(metaEntry?.isDirectory).isNotNull().isTrue()
         assertThat(result.taskOutcome()).isSuccessOrEqualTo()
     }