From 9d68b7b15265b78de61c5949d917c8d9dcb53bb5 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 4 Jun 2014 10:58:19 +0200 Subject: [PATCH] Fix unit tests --- .../sonar/server/test/ws/TestsCoveredFilesActionTest.java | 2 +- .../sonar/server/test/ws/TestsTestCasesActionTest.java | 2 +- .../test/java/org/sonar/server/test/ws/TestsWsTest.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsCoveredFilesActionTest.java b/sonar-server/src/test/java/org/sonar/server/test/ws/TestsCoveredFilesActionTest.java index b44254ee790..3cd50188543 100644 --- a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsCoveredFilesActionTest.java +++ b/sonar-server/src/test/java/org/sonar/server/test/ws/TestsCoveredFilesActionTest.java @@ -66,7 +66,7 @@ public class TestsCoveredFilesActionTest { MutableTestCase testCase2 = testCase("org.foo.File.java", "src/main/java/org/foo/File.java", 3); when(testPlan.testCasesByName("my_test")).thenReturn(newArrayList(testCase1, testCase2)); - WsTester.TestRequest request = tester.newGetRequest("api/tests", "plan").setParam("key", TEST_PLAN_KEY).setParam("test", "my_test"); + WsTester.TestRequest request = tester.newGetRequest("api/tests", "covered_files").setParam("key", TEST_PLAN_KEY).setParam("test", "my_test"); request.execute().assertJson("{\n" + " \"files\": [\n" + diff --git a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsTestCasesActionTest.java b/sonar-server/src/test/java/org/sonar/server/test/ws/TestsTestCasesActionTest.java index fa39a3c1d2d..5c5eb7eaae8 100644 --- a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsTestCasesActionTest.java +++ b/sonar-server/src/test/java/org/sonar/server/test/ws/TestsTestCasesActionTest.java @@ -63,7 +63,7 @@ public class TestsTestCasesActionTest { TestCase testCase2 = testCase("test2", TestCase.Status.ERROR, 97L, "org.foo.FileTest.java", "src/test/java/org/foo/FileTest.java"); when(testable.testCasesOfLine(10)).thenReturn(newArrayList(testCase1, testCase2)); - WsTester.TestRequest request = tester.newGetRequest("api/tests", "testable").setParam("key", FILE_KEY).setParam("line", "10"); + WsTester.TestRequest request = tester.newGetRequest("api/tests", "test_cases").setParam("key", FILE_KEY).setParam("line", "10"); request.execute().assertJson("{\n" + " \"tests\": [\n" + diff --git a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java b/sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java index cb14b174a29..5dd2c4f185f 100644 --- a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java +++ b/sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java @@ -60,8 +60,8 @@ public class TestsWsTest { } @Test - public void define_plan_action() throws Exception { - WebService.Action action = controller.action("plan"); + public void define_covered_files_action() throws Exception { + WebService.Action action = controller.action("covered_files"); assertThat(action).isNotNull(); assertThat(action.isInternal()).isFalse(); assertThat(action.isPost()).isFalse(); @@ -71,8 +71,8 @@ public class TestsWsTest { } @Test - public void define_testable_action() throws Exception { - WebService.Action action = controller.action("testable"); + public void define_test_cases_action() throws Exception { + WebService.Action action = controller.action("test_cases"); assertThat(action).isNotNull(); assertThat(action.isInternal()).isFalse(); assertThat(action.isPost()).isFalse(); -- 2.39.5