diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2014-07-18 16:36:40 +0600 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2014-07-18 16:36:51 +0600 |
| commit | e75cc2d845fd0fac42797b460063a1827533956f (patch) | |
| tree | 84c2b68424dc35664df66ba5d654a26a161b9bd4 /sonar-server/src/test | |
| parent | 4232affa985c379616b2a6ae52fdfabe753d48b2 (diff) | |
| download | sonarqube-e75cc2d845fd0fac42797b460063a1827533956f.tar.gz sonarqube-e75cc2d845fd0fac42797b460063a1827533956f.zip | |
Fix bad merge
Diffstat (limited to 'sonar-server/src/test')
| -rw-r--r-- | sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data.json | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data.json b/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data.json deleted file mode 100644 index 97a9239999b..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "tests": [ - { - "name": "test1", - "status": "OK", - "durationInMs": 10 - }, - { - "name": "test2", - "status": "ERROR", - "durationInMs": 97, - "message": "expected:<true> but was:<false>", - "stackTrace": "java.lang.AssertionError: expected:<true> but was:<false>\n\tat org.junit.Assert.fail(Assert.java:91)\n\tat org.junit.Assert.failNotEquals(Assert.java:645)\n\tat org.junit.Assert.assertEquals(Assert.java:126)\n\tat org.junit.Assert.assertEquals(Assert.java:145)\n" - } - ] -} |