Move all testng to assertj migration methods to TestUtilities.

cdancy · Feb 5, 2018 · 25b1b4f · 25b1b4f
1 parent ec31da5
commit 25b1b4f
Show file tree

Hide file tree

Showing 15 changed files with 84 additions and 34 deletions.
diff --git a/src/test/java/com/cdancy/artifactory/rest/BaseArtifactoryApiLiveTest.java b/src/test/java/com/cdancy/artifactory/rest/BaseArtifactoryApiLiveTest.java
@@ -31,7 +31,6 @@
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Module;
-import static org.assertj.core.api.Assertions.assertThat;
 
 @Test(groups = "live")
 public class BaseArtifactoryApiLiveTest extends BaseApiLiveTest<ArtifactoryApi> {
@@ -97,20 +96,4 @@ public File randomFile() {
         }
         return randomFile;
     }
-
-    public void assertTrue(boolean value) {
-        assertThat(value).isTrue();
-    }
-
-    public void assertFalse(boolean value) {
-        assertThat(value).isFalse();
-    }
-
-    public void assertNotNull(Object obj) {
-        assertThat(obj).isNotNull();
-    }
-
-    public void assertNull(Object obj) {
-        assertThat(obj).isNull();
-    }
 }
diff --git a/src/test/java/com/cdancy/artifactory/rest/BaseArtifactoryMockTest.java b/src/test/java/com/cdancy/artifactory/rest/BaseArtifactoryMockTest.java
@@ -92,20 +92,4 @@ protected RecordedRequest assertSent(MockWebServer server, String method, String
         assertThat(request.getHeader(HttpHeaders.ACCEPT)).isEqualTo(mediaType);
         return request;
     }
-
-    public void assertTrue(boolean value) {
-        assertThat(value).isTrue();
-    }
-
-    public void assertFalse(boolean value) {
-        assertThat(value).isFalse();
-    }
-
-    public void assertNotNull(Object obj) {
-        assertThat(obj).isNotNull();
-    }
-
-    public void assertNull(Object obj) {
-        assertThat(obj).isNull();
-    }
 }
diff --git a/src/test/java/com/cdancy/artifactory/rest/TestUtilities.java b/src/test/java/com/cdancy/artifactory/rest/TestUtilities.java
@@ -17,6 +17,8 @@
 
 package com.cdancy.artifactory.rest;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import java.util.Random;
 import java.util.UUID;
 
@@ -86,6 +88,42 @@ public static ArtifactoryAuthentication inferTestAuthentication() {
         return inferAuth.build();
     }
 
+    /**
+     * Migration from testng to assertj method to test for true.
+     * 
+     * @param value boolean that hopefully represents true.
+     */
+    public static void assertTrue(boolean value) {
+        assertThat(value).isTrue();
+    }
+
+    /**
+     * Migration from testng to assertj method to test for false.
+     * 
+     * @param value boolean that hopefully represents false.
+     */
+    public static void assertFalse(boolean value) {
+        assertThat(value).isFalse();
+    }
+
+    /**
+     * Migration from testng to assertj method to test for non-null.
+     * 
+     * @param value object which is hopefully non-null.
+     */
+    public static void assertNotNull(Object value) {
+        assertThat(value).isNotNull();
+    }
+
+    /**
+     * Migration from testng to assertj method to test for null.
+     * 
+     * @param value object which is hopefully null.
+     */
+    public static void assertNull(Object value) {
+        assertThat(value).isNull();
+    }
+
     private TestUtilities() {
         throw new UnsupportedOperationException("Purposefully not implemented");
     }

diff --git a/src/test/java/com/cdancy/artifactory/rest/features/ArtifactApiLiveTest.java b/src/test/java/com/cdancy/artifactory/rest/features/ArtifactApiLiveTest.java
@@ -16,6 +16,10 @@
  */
 package com.cdancy.artifactory.rest.features;
 
+import static com.cdancy.artifactory.rest.TestUtilities.assertFalse;
+import static com.cdancy.artifactory.rest.TestUtilities.assertNotNull;
+import static com.cdancy.artifactory.rest.TestUtilities.assertTrue;
+
 import java.io.File;
 import java.util.HashMap;
 import java.util.List;
@@ -97,7 +101,7 @@ public void testDeleteArtifactWithProperties() {
 
     @Test
     public void testDeleteNonExistentArtifact() {
-      assertFalse(api().deleteArtifact(repoKey, randomPath()));
+        assertFalse(api().deleteArtifact(repoKey, randomPath()));
     }
 
     @AfterClass

diff --git a/src/test/java/com/cdancy/artifactory/rest/features/ArtifactApiMockTest.java b/src/test/java/com/cdancy/artifactory/rest/features/ArtifactApiMockTest.java
@@ -16,6 +16,10 @@
  */
 package com.cdancy.artifactory.rest.features;
 
+import static com.cdancy.artifactory.rest.TestUtilities.assertFalse;
+import static com.cdancy.artifactory.rest.TestUtilities.assertNotNull;
+import static com.cdancy.artifactory.rest.TestUtilities.assertTrue;
+
 import com.cdancy.artifactory.rest.ArtifactoryApi;
 import com.cdancy.artifactory.rest.domain.artifact.Artifact;
 import com.cdancy.artifactory.rest.domain.error.RequestStatus;

diff --git a/src/test/java/com/cdancy/artifactory/rest/features/BuildApiLiveTest.java b/src/test/java/com/cdancy/artifactory/rest/features/BuildApiLiveTest.java
@@ -16,6 +16,10 @@
  */
 package com.cdancy.artifactory.rest.features;
 
+import static com.cdancy.artifactory.rest.TestUtilities.assertFalse;
+import static com.cdancy.artifactory.rest.TestUtilities.assertNotNull;
+import static com.cdancy.artifactory.rest.TestUtilities.assertTrue;
+
 import com.cdancy.artifactory.rest.BaseArtifactoryApiLiveTest;
 import com.cdancy.artifactory.rest.domain.artifact.Artifact;
 import com.cdancy.artifactory.rest.domain.error.RequestStatus;

diff --git a/src/test/java/com/cdancy/artifactory/rest/features/BuildApiMockTest.java b/src/test/java/com/cdancy/artifactory/rest/features/BuildApiMockTest.java
@@ -16,6 +16,9 @@
  */
 package com.cdancy.artifactory.rest.features;
 
+import static com.cdancy.artifactory.rest.TestUtilities.assertNotNull;
+import static com.cdancy.artifactory.rest.TestUtilities.assertTrue;
+
 import com.cdancy.artifactory.rest.ArtifactoryApi;
 import com.cdancy.artifactory.rest.domain.error.RequestStatus;
 import com.cdancy.artifactory.rest.BaseArtifactoryMockTest;

diff --git a/src/test/java/com/cdancy/artifactory/rest/features/DockerApiLiveTest.java b/src/test/java/com/cdancy/artifactory/rest/features/DockerApiLiveTest.java
@@ -16,6 +16,10 @@
  */
 package com.cdancy.artifactory.rest.features;
 
+import static com.cdancy.artifactory.rest.TestUtilities.assertFalse;
+import static com.cdancy.artifactory.rest.TestUtilities.assertNotNull;
+import static com.cdancy.artifactory.rest.TestUtilities.assertTrue;
+
 import com.cdancy.artifactory.rest.BaseArtifactoryApiLiveTest;
 import com.cdancy.artifactory.rest.domain.docker.PromoteImage;
 import org.testng.annotations.BeforeClass;

diff --git a/src/test/java/com/cdancy/artifactory/rest/features/DockerApiMockTest.java b/src/test/java/com/cdancy/artifactory/rest/features/DockerApiMockTest.java
@@ -16,6 +16,10 @@
  */
 package com.cdancy.artifactory.rest.features;
 
+import static com.cdancy.artifactory.rest.TestUtilities.assertFalse;
+import static com.cdancy.artifactory.rest.TestUtilities.assertNotNull;
+import static com.cdancy.artifactory.rest.TestUtilities.assertTrue;
+
 import com.cdancy.artifactory.rest.ArtifactoryApi;
 import com.cdancy.artifactory.rest.domain.docker.PromoteImage;
 import com.cdancy.artifactory.rest.BaseArtifactoryMockTest;

diff --git a/src/test/java/com/cdancy/artifactory/rest/features/SearchApiLiveTest.java b/src/test/java/com/cdancy/artifactory/rest/features/SearchApiLiveTest.java
@@ -16,6 +16,10 @@
  */
 package com.cdancy.artifactory.rest.features;
 
+import static com.cdancy.artifactory.rest.TestUtilities.assertNull;
+import static com.cdancy.artifactory.rest.TestUtilities.assertNotNull;
+import static com.cdancy.artifactory.rest.TestUtilities.assertTrue;
+
 import com.cdancy.artifactory.rest.domain.search.AQLResult;
 import com.cdancy.artifactory.rest.domain.search.KeyValue;
 import com.cdancy.artifactory.rest.domain.search.SearchBuildArtifacts;

diff --git a/src/test/java/com/cdancy/artifactory/rest/features/SearchApiMockTest.java b/src/test/java/com/cdancy/artifactory/rest/features/SearchApiMockTest.java
@@ -16,6 +16,10 @@
  */
 package com.cdancy.artifactory.rest.features;
 
+import static com.cdancy.artifactory.rest.TestUtilities.assertNull;
+import static com.cdancy.artifactory.rest.TestUtilities.assertNotNull;
+import static com.cdancy.artifactory.rest.TestUtilities.assertTrue;
+
 import com.cdancy.artifactory.rest.domain.search.Mapping;
 import com.cdancy.artifactory.rest.domain.search.SearchBuildArtifacts;
 import com.cdancy.artifactory.rest.domain.search.SearchResult;

diff --git a/src/test/java/com/cdancy/artifactory/rest/features/StorageApiLiveTest.java b/src/test/java/com/cdancy/artifactory/rest/features/StorageApiLiveTest.java
@@ -16,6 +16,10 @@
  */
 package com.cdancy.artifactory.rest.features;
 
+import static com.cdancy.artifactory.rest.TestUtilities.assertFalse;
+import static com.cdancy.artifactory.rest.TestUtilities.assertNotNull;
+import static com.cdancy.artifactory.rest.TestUtilities.assertTrue;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/src/test/java/com/cdancy/artifactory/rest/features/StorageApiMockTest.java b/src/test/java/com/cdancy/artifactory/rest/features/StorageApiMockTest.java
@@ -16,6 +16,10 @@
  */
 package com.cdancy.artifactory.rest.features;
 
+import static com.cdancy.artifactory.rest.TestUtilities.assertFalse;
+import static com.cdancy.artifactory.rest.TestUtilities.assertNotNull;
+import static com.cdancy.artifactory.rest.TestUtilities.assertTrue;
+
 import com.cdancy.artifactory.rest.domain.storage.FileList;
 import com.cdancy.artifactory.rest.domain.storage.StorageInfo;
 import com.google.common.collect.Lists;

diff --git a/src/test/java/com/cdancy/artifactory/rest/features/SystemApiLiveTest.java b/src/test/java/com/cdancy/artifactory/rest/features/SystemApiLiveTest.java
@@ -16,6 +16,9 @@
  */
 package com.cdancy.artifactory.rest.features;
 
+import static com.cdancy.artifactory.rest.TestUtilities.assertNotNull;
+import static com.cdancy.artifactory.rest.TestUtilities.assertTrue;
+
 import org.testng.annotations.Test;
 
 import com.cdancy.artifactory.rest.BaseArtifactoryApiLiveTest;

diff --git a/src/test/java/com/cdancy/artifactory/rest/features/SystemApiMockTest.java b/src/test/java/com/cdancy/artifactory/rest/features/SystemApiMockTest.java
@@ -16,6 +16,9 @@
  */
 package com.cdancy.artifactory.rest.features;
 
+import static com.cdancy.artifactory.rest.TestUtilities.assertNotNull;
+import static com.cdancy.artifactory.rest.TestUtilities.assertTrue;
+
 import org.testng.annotations.Test;
 
 import com.cdancy.artifactory.rest.ArtifactoryApi;