From 3e6f3ed80c0b631d794bcb2e744f3517ad0db989 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Tue, 19 Jan 2016 11:14:50 +0100 Subject: Cut many dependencies on sonar-testing-harness --- .../batch/protocol/input/GlobalRepositoriesTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sonar-batch-protocol/src/test') diff --git a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalRepositoriesTest.java b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalRepositoriesTest.java index ab6b6b120c7..fe0643b5c45 100644 --- a/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalRepositoriesTest.java +++ b/sonar-batch-protocol/src/test/java/org/sonar/batch/protocol/input/GlobalRepositoriesTest.java @@ -19,32 +19,32 @@ */ package org.sonar.batch.protocol.input; +import org.apache.commons.io.IOUtils; import org.junit.Test; -import org.sonar.test.JsonAssert; +import static net.javacrumbs.jsonunit.assertj.JsonAssert.assertThatJson; import static org.assertj.core.api.Assertions.assertThat; public class GlobalRepositoriesTest { @Test - public void to_json() { + public void to_json() throws Exception { GlobalRepositories ref = new GlobalRepositories(); ref.addMetric(new Metric(1, "ncloc", "INT", "Description", -1, "NCLOC", true, false, 2.0, 1.0, true)); ref.addGlobalSetting("prop", "value"); ref.setTimestamp(10); - JsonAssert - .assertJson(ref.toJson()) - .isSimilarTo(getClass().getResource("GlobalRepositoriesTest/expected.json")); + assertThatJson(ref.toJson()) + .isEqualTo(IOUtils.toString(getClass().getResource("GlobalRepositoriesTest/expected.json"))); } @Test public void from_json() { GlobalRepositories ref = GlobalRepositories .fromJson( - "{timestamp:1," - + "metrics:[{id:1,key:ncloc,valueType:DATA,description:Description,direction:-1,name:NCLOC,qualitative:true,userManaged:false,worstValue:2.0,bestValue:1.0,optimizedBestValue:true}]," - + "globalSettings:{prop:value}}"); + "{timestamp:1," + + "metrics:[{id:1,key:ncloc,valueType:DATA,description:Description,direction:-1,name:NCLOC,qualitative:true,userManaged:false,worstValue:2.0,bestValue:1.0,optimizedBestValue:true}]," + + "globalSettings:{prop:value}}"); assertThat(ref.timestamp()).isEqualTo(1); Metric metric = ref.metrics().iterator().next(); -- cgit v1.2.3