From 50fdfe7bda59d5fc90b82d0e08bf90597ae8081c Mon Sep 17 00:00:00 2001
From: Greg Messner <greg@messners.com>
Date: Sun, 2 Mar 2014 21:58:18 -0800
Subject: [PATCH] Removed dependency on jsonassert.
---
pom.xml | 6 ------
.../java/com/messners/gitlab/api/TestGitLabApiBeans.java | 3 +--
.../java/com/messners/gitlab/api/TestGitLabApiEvents.java | 3 +--
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8bd2da85..b331bf52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,12 +136,6 @@
<version>4.11</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.skyscreamer</groupId>
- <artifactId>jsonassert</artifactId>
- <version>1.2.3</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/src/test/java/com/messners/gitlab/api/TestGitLabApiBeans.java b/src/test/java/com/messners/gitlab/api/TestGitLabApiBeans.java
index dc12ec28..24a30885 100644
--- a/src/test/java/com/messners/gitlab/api/TestGitLabApiBeans.java
+++ b/src/test/java/com/messners/gitlab/api/TestGitLabApiBeans.java
@@ -11,7 +11,6 @@ import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.TypeReference;
-import org.json.JSONException;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -257,7 +256,7 @@ public class TestGitLabApiBeans {
return (objectMapper.readValue(reader, returnType));
}
- private <T> boolean compareJson (T apiObject, String file) throws IOException, JSONException {
+ private <T> boolean compareJson (T apiObject, String file) throws IOException {
InputStreamReader reader = new InputStreamReader(GitLabApi.class.getResourceAsStream(file + ".json"));
String objectJson = jacksonJson.marshal(apiObject);
diff --git a/src/test/java/com/messners/gitlab/api/TestGitLabApiEvents.java b/src/test/java/com/messners/gitlab/api/TestGitLabApiEvents.java
index 9d58fb4f..3ed30e2a 100644
--- a/src/test/java/com/messners/gitlab/api/TestGitLabApiEvents.java
+++ b/src/test/java/com/messners/gitlab/api/TestGitLabApiEvents.java
@@ -9,7 +9,6 @@ import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
-import org.json.JSONException;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -69,7 +68,7 @@ public class TestGitLabApiEvents {
return (objectMapper.readValue(reader, returnType));
}
- private <T> boolean compareJson (T apiObject, String file) throws IOException, JSONException {
+ private <T> boolean compareJson (T apiObject, String file) throws IOException {
InputStreamReader reader = new InputStreamReader(GitLabApi.class.getResourceAsStream(file + ".json"));
String objectJson = jacksonJson.marshal(apiObject);
--
GitLab