Commit 50fdfe7b authored by Greg Messner's avatar Greg Messner
Browse files

Removed dependency on jsonassert.

parent 5ffec843
...@@ -136,12 +136,6 @@ ...@@ -136,12 +136,6 @@
<version>4.11</version> <version>4.11</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.skyscreamer</groupId>
<artifactId>jsonassert</artifactId>
<version>1.2.3</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>
...@@ -11,7 +11,6 @@ import org.codehaus.jackson.JsonParseException; ...@@ -11,7 +11,6 @@ import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.TypeReference; import org.codehaus.jackson.type.TypeReference;
import org.json.JSONException;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
...@@ -257,7 +256,7 @@ public class TestGitLabApiBeans { ...@@ -257,7 +256,7 @@ public class TestGitLabApiBeans {
return (objectMapper.readValue(reader, returnType)); 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")); InputStreamReader reader = new InputStreamReader(GitLabApi.class.getResourceAsStream(file + ".json"));
String objectJson = jacksonJson.marshal(apiObject); String objectJson = jacksonJson.marshal(apiObject);
......
...@@ -9,7 +9,6 @@ import org.codehaus.jackson.JsonNode; ...@@ -9,7 +9,6 @@ import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.JsonParseException; import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectMapper;
import org.json.JSONException;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
...@@ -69,7 +68,7 @@ public class TestGitLabApiEvents { ...@@ -69,7 +68,7 @@ public class TestGitLabApiEvents {
return (objectMapper.readValue(reader, returnType)); 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")); InputStreamReader reader = new InputStreamReader(GitLabApi.class.getResourceAsStream(file + ".json"));
String objectJson = jacksonJson.marshal(apiObject); String objectJson = jacksonJson.marshal(apiObject);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment