Rename Assertions class to avoid conflicts

trickl · Feb 28, 2019 · 6dd5f04 · 6dd5f04
1 parent 67cdf48
commit 6dd5f04
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...m/trickl/assertj/core/api/Assertions.java → ...ickl/assertj/core/api/JsonAssertions.java b/...m/trickl/assertj/core/api/Assertions.java → ...ickl/assertj/core/api/JsonAssertions.java
@@ -8,7 +8,7 @@
 import java.nio.file.Path;
 
 /** The entry point for all JSON assertions. */
-public class Assertions {
+public class JsonAssertions {
 
   public static JsonAssert assertThat(JsonContainer json) {
     return new JsonAssert(json);
@@ -28,7 +28,7 @@ public static JsonContainer json(File file) throws IOException {
   }
 
   /** Creates a new <code>{@link Assertions}</code>. */
-  protected Assertions() {
+  protected JsonAssertions() {
     // empty
   }
 }
diff --git a/src/test/java/com/trickl/assertj/core/api/json/JsonAssert_isSameJsonAs_Test.java b/src/test/java/com/trickl/assertj/core/api/json/JsonAssert_isSameJsonAs_Test.java
@@ -1,7 +1,7 @@
 package com.trickl.assertj.core.api.json;
 
-import static com.trickl.assertj.core.api.Assertions.assertThat;
-import static com.trickl.assertj.core.api.Assertions.json;
+import static com.trickl.assertj.core.api.JsonAssertions.assertThat;
+import static com.trickl.assertj.core.api.JsonAssertions.json;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.verify;
 

diff --git a/src/test/java/com/trickl/assertj/core/internal/JsonDiff_diff_File_Test.java b/src/test/java/com/trickl/assertj/core/internal/JsonDiff_diff_File_Test.java
@@ -1,6 +1,6 @@
 package com.trickl.assertj.core.internal;
 
-import static com.trickl.assertj.core.api.Assertions.json;
+import static com.trickl.assertj.core.api.JsonAssertions.json;
 import static java.lang.String.format;
 import static java.nio.charset.Charset.defaultCharset;
 import static org.assertj.core.api.Assertions.assertThat;