From ca4f0a47bc7e60bbcc74f05e495cad95eaee7a09 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 4 Jun 2014 09:39:48 +0200 Subject: [PATCH] SONAR-5338 rename actions "plan" to "covered_files" and "testable" to "test_cases" in /api/tests WS --- .../server/platform/ServerComponents.java | 148 ++---------------- ...tion.java => TestsCoveredFilesAction.java} | 6 +- ...eAction.java => TestsTestCasesAction.java} | 6 +- .../org/sonar/server/test/ws/TestsWs.java | 6 +- ....java => TestsCoveredFilesActionTest.java} | 4 +- .../server/test/ws/TestsShowActionTest.java | 2 +- ...est.java => TestsTestCasesActionTest.java} | 4 +- .../org/sonar/server/test/ws/TestsWsTest.java | 2 +- .../org/sonar/wsclient/test/TestClient.java | 4 +- .../test/internal/DefaultTestClient.java | 8 +- .../test/internal/DefaultTestClientTest.java | 18 +-- .../{show_plan.json => covered_files.json} | 0 .../{show_testable.json => test_cases.json} | 0 13 files changed, 46 insertions(+), 162 deletions(-) rename sonar-server/src/main/java/org/sonar/server/test/ws/{TestsPlanAction.java => TestsCoveredFilesAction.java} (93%) rename sonar-server/src/main/java/org/sonar/server/test/ws/{TestsTestableAction.java => TestsTestCasesAction.java} (95%) rename sonar-server/src/test/java/org/sonar/server/test/ws/{TestsPlanActionTest.java => TestsCoveredFilesActionTest.java} (96%) rename sonar-server/src/test/java/org/sonar/server/test/ws/{TestsTestableActionTest.java => TestsTestCasesActionTest.java} (96%) rename sonar-ws-client/src/test/resources/org/sonar/wsclient/test/internal/DefaultTestClientTest/{show_plan.json => covered_files.json} (100%) rename sonar-ws-client/src/test/resources/org/sonar/wsclient/test/internal/DefaultTestClientTest/{show_testable.json => test_cases.json} (100%) diff --git a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java index bc15fb2498b..2a7265dd4cf 100644 --- a/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java +++ b/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java @@ -52,13 +52,7 @@ import org.sonar.core.measure.db.MeasureFilterDao; import org.sonar.core.metric.DefaultMetricFinder; import org.sonar.core.notification.DefaultNotificationManager; import org.sonar.core.permission.PermissionFacade; -import org.sonar.core.persistence.DaoUtils; -import org.sonar.core.persistence.DatabaseVersion; -import org.sonar.core.persistence.DefaultDatabase; -import org.sonar.core.persistence.MyBatis; -import org.sonar.core.persistence.PreviewDatabaseFactory; -import org.sonar.core.persistence.SemaphoreUpdater; -import org.sonar.core.persistence.SemaphoresImpl; +import org.sonar.core.persistence.*; import org.sonar.core.preview.PreviewCache; import org.sonar.core.profiling.Profiling; import org.sonar.core.purge.PurgeProfiler; @@ -92,33 +86,11 @@ import org.sonar.server.db.DbClient; import org.sonar.server.db.EmbeddedDatabaseFactory; import org.sonar.server.db.migrations.DatabaseMigrations; import org.sonar.server.db.migrations.DatabaseMigrator; -import org.sonar.server.debt.DebtCharacteristicsXMLImporter; -import org.sonar.server.debt.DebtModelBackup; -import org.sonar.server.debt.DebtModelLookup; -import org.sonar.server.debt.DebtModelOperations; -import org.sonar.server.debt.DebtModelPluginRepository; -import org.sonar.server.debt.DebtModelService; -import org.sonar.server.debt.DebtModelXMLExporter; -import org.sonar.server.debt.DebtRulesXMLImporter; +import org.sonar.server.debt.*; import org.sonar.server.duplication.ws.DuplicationsParser; import org.sonar.server.duplication.ws.DuplicationsWriter; import org.sonar.server.duplication.ws.DuplicationsWs; -import org.sonar.server.issue.ActionService; -import org.sonar.server.issue.AssignAction; -import org.sonar.server.issue.CommentAction; -import org.sonar.server.issue.DefaultIssueFinder; -import org.sonar.server.issue.InternalRubyIssueService; -import org.sonar.server.issue.IssueBulkChangeService; -import org.sonar.server.issue.IssueChangelogFormatter; -import org.sonar.server.issue.IssueChangelogService; -import org.sonar.server.issue.IssueCommentService; -import org.sonar.server.issue.IssueService; -import org.sonar.server.issue.IssueStatsFinder; -import org.sonar.server.issue.PlanAction; -import org.sonar.server.issue.PublicRubyIssueService; -import org.sonar.server.issue.ServerIssueStorage; -import org.sonar.server.issue.SetSeverityAction; -import org.sonar.server.issue.TransitionAction; +import org.sonar.server.issue.*; import org.sonar.server.issue.actionplan.ActionPlanService; import org.sonar.server.issue.actionplan.ActionPlanWs; import org.sonar.server.issue.filter.IssueFilterService; @@ -143,81 +115,22 @@ import org.sonar.server.platform.ws.L10nWs; import org.sonar.server.platform.ws.RestartHandler; import org.sonar.server.platform.ws.ServerWs; import org.sonar.server.platform.ws.SystemWs; -import org.sonar.server.plugins.BatchWs; -import org.sonar.server.plugins.InstalledPluginReferentialFactory; -import org.sonar.server.plugins.PluginDownloader; -import org.sonar.server.plugins.ServerExtensionInstaller; -import org.sonar.server.plugins.ServerPluginJarInstaller; -import org.sonar.server.plugins.ServerPluginJarsInstaller; -import org.sonar.server.plugins.ServerPluginRepository; -import org.sonar.server.plugins.UpdateCenterClient; -import org.sonar.server.plugins.UpdateCenterMatrixFactory; +import org.sonar.server.plugins.*; import org.sonar.server.qualitygate.QgateProjectFinder; import org.sonar.server.qualitygate.QualityGates; import org.sonar.server.qualitygate.RegisterQualityGates; -import org.sonar.server.qualitygate.ws.QGatesAppAction; -import org.sonar.server.qualitygate.ws.QGatesCopyAction; -import org.sonar.server.qualitygate.ws.QGatesCreateAction; -import org.sonar.server.qualitygate.ws.QGatesCreateConditionAction; -import org.sonar.server.qualitygate.ws.QGatesDeleteConditionAction; -import org.sonar.server.qualitygate.ws.QGatesDeselectAction; -import org.sonar.server.qualitygate.ws.QGatesDestroyAction; -import org.sonar.server.qualitygate.ws.QGatesListAction; -import org.sonar.server.qualitygate.ws.QGatesRenameAction; -import org.sonar.server.qualitygate.ws.QGatesSearchAction; -import org.sonar.server.qualitygate.ws.QGatesSelectAction; -import org.sonar.server.qualitygate.ws.QGatesSetAsDefaultAction; -import org.sonar.server.qualitygate.ws.QGatesShowAction; -import org.sonar.server.qualitygate.ws.QGatesUnsetDefaultAction; -import org.sonar.server.qualitygate.ws.QGatesUpdateConditionAction; -import org.sonar.server.qualitygate.ws.QGatesWs; -import org.sonar.server.qualityprofile.DefaultProfilesCache; -import org.sonar.server.qualityprofile.ProfilesManager; -import org.sonar.server.qualityprofile.QProfileActiveRuleOperations; -import org.sonar.server.qualityprofile.QProfileBackup; -import org.sonar.server.qualityprofile.QProfileBackuper; -import org.sonar.server.qualityprofile.QProfileCopier; -import org.sonar.server.qualityprofile.QProfileLookup; -import org.sonar.server.qualityprofile.QProfileOperations; -import org.sonar.server.qualityprofile.QProfileProjectLookup; -import org.sonar.server.qualityprofile.QProfileProjectOperations; -import org.sonar.server.qualityprofile.QProfileRepositoryExporter; -import org.sonar.server.qualityprofile.QProfileService; -import org.sonar.server.qualityprofile.QProfiles; -import org.sonar.server.qualityprofile.RegisterQualityProfiles; -import org.sonar.server.qualityprofile.RuleActivationContextFactory; -import org.sonar.server.qualityprofile.RuleActivator; +import org.sonar.server.qualitygate.ws.*; +import org.sonar.server.qualityprofile.*; import org.sonar.server.qualityprofile.db.ActiveRuleDao; import org.sonar.server.qualityprofile.index.ActiveRuleIndex; import org.sonar.server.qualityprofile.index.ActiveRuleNormalizer; -import org.sonar.server.qualityprofile.ws.BulkRuleActivationActions; -import org.sonar.server.qualityprofile.ws.ProfilesWs; -import org.sonar.server.qualityprofile.ws.QProfileRecreateBuiltInAction; -import org.sonar.server.qualityprofile.ws.QProfilesWs; -import org.sonar.server.qualityprofile.ws.RuleActivationActions; -import org.sonar.server.rule.DeprecatedRulesDefinition; -import org.sonar.server.rule.RegisterRules; -import org.sonar.server.rule.RubyRuleService; -import org.sonar.server.rule.RuleDefinitionsLoader; -import org.sonar.server.rule.RuleOperations; -import org.sonar.server.rule.RuleRepositories; -import org.sonar.server.rule.RuleService; -import org.sonar.server.rule.RuleUpdater; +import org.sonar.server.qualityprofile.ws.*; +import org.sonar.server.rule.*; import org.sonar.server.rule.db.RuleDao; import org.sonar.server.rule.index.RuleIndex; import org.sonar.server.rule.index.RuleNormalizer; -import org.sonar.server.rule.ws.ActiveRuleCompleter; -import org.sonar.server.rule.ws.AppAction; -import org.sonar.server.rule.ws.RuleMapping; -import org.sonar.server.rule.ws.RulesWebService; -import org.sonar.server.rule.ws.SearchAction; -import org.sonar.server.rule.ws.TagsAction; -import org.sonar.server.rule.ws.UpdateAction; -import org.sonar.server.search.ESNode; -import org.sonar.server.search.IndexClient; -import org.sonar.server.search.IndexQueue; -import org.sonar.server.search.IndexQueueWorker; -import org.sonar.server.search.IndexSynchronizer; +import org.sonar.server.rule.ws.*; +import org.sonar.server.search.*; import org.sonar.server.source.CodeColorizers; import org.sonar.server.source.DeprecatedSourceDecorator; import org.sonar.server.source.HtmlSourceDecorator; @@ -226,27 +139,9 @@ import org.sonar.server.source.ws.ScmAction; import org.sonar.server.source.ws.ScmWriter; import org.sonar.server.source.ws.ShowAction; import org.sonar.server.source.ws.SourcesWs; -import org.sonar.server.startup.CleanPreviewAnalysisCache; -import org.sonar.server.startup.CopyRequirementsFromCharacteristicsToRules; -import org.sonar.server.startup.GeneratePluginIndex; -import org.sonar.server.startup.GwtPublisher; -import org.sonar.server.startup.JdbcDriverDeployer; -import org.sonar.server.startup.LogServerId; -import org.sonar.server.startup.RegisterDashboards; -import org.sonar.server.startup.RegisterDebtModel; -import org.sonar.server.startup.RegisterMetrics; -import org.sonar.server.startup.RegisterNewMeasureFilters; -import org.sonar.server.startup.RegisterPermissionTemplates; -import org.sonar.server.startup.RegisterServletFilters; -import org.sonar.server.startup.RenameDeprecatedPropertyKeys; -import org.sonar.server.startup.ServerMetadataPersister; +import org.sonar.server.startup.*; import org.sonar.server.test.CoverageService; -import org.sonar.server.test.ws.CoverageShowAction; -import org.sonar.server.test.ws.CoverageWs; -import org.sonar.server.test.ws.TestsPlanAction; -import org.sonar.server.test.ws.TestsShowAction; -import org.sonar.server.test.ws.TestsTestableAction; -import org.sonar.server.test.ws.TestsWs; +import org.sonar.server.test.ws.*; import org.sonar.server.text.MacroInterpreter; import org.sonar.server.text.RubyTextService; import org.sonar.server.ui.JRubyI18n; @@ -254,20 +149,9 @@ import org.sonar.server.ui.JRubyProfiling; import org.sonar.server.ui.PageDecorations; import org.sonar.server.ui.Views; import org.sonar.server.updatecenter.ws.UpdateCenterWs; -import org.sonar.server.user.DefaultUserService; -import org.sonar.server.user.DoPrivileged; -import org.sonar.server.user.GroupMembershipFinder; -import org.sonar.server.user.GroupMembershipService; -import org.sonar.server.user.NewUserNotifier; -import org.sonar.server.user.SecurityRealmFactory; +import org.sonar.server.user.*; import org.sonar.server.user.ws.UsersWs; -import org.sonar.server.util.BooleanTypeValidation; -import org.sonar.server.util.FloatTypeValidation; -import org.sonar.server.util.IntegerTypeValidation; -import org.sonar.server.util.StringListTypeValidation; -import org.sonar.server.util.StringTypeValidation; -import org.sonar.server.util.TextTypeValidation; -import org.sonar.server.util.TypeValidations; +import org.sonar.server.util.*; import org.sonar.server.ws.ListingWs; import org.sonar.server.ws.WebServiceEngine; @@ -603,8 +487,8 @@ class ServerComponents { pico.addSingleton(CoverageWs.class); pico.addSingleton(CoverageShowAction.class); pico.addSingleton(TestsWs.class); - pico.addSingleton(TestsTestableAction.class); - pico.addSingleton(TestsPlanAction.class); + pico.addSingleton(TestsTestCasesAction.class); + pico.addSingleton(TestsCoveredFilesAction.class); pico.addSingleton(TestsShowAction.class); // graphs and perspective related classes diff --git a/sonar-server/src/main/java/org/sonar/server/test/ws/TestsPlanAction.java b/sonar-server/src/main/java/org/sonar/server/test/ws/TestsCoveredFilesAction.java similarity index 93% rename from sonar-server/src/main/java/org/sonar/server/test/ws/TestsPlanAction.java rename to sonar-server/src/main/java/org/sonar/server/test/ws/TestsCoveredFilesAction.java index 33d6cfaaf1b..d18f57b34a8 100644 --- a/sonar-server/src/main/java/org/sonar/server/test/ws/TestsPlanAction.java +++ b/sonar-server/src/main/java/org/sonar/server/test/ws/TestsCoveredFilesAction.java @@ -32,19 +32,19 @@ import org.sonar.api.web.UserRole; import org.sonar.core.component.SnapshotPerspectives; import org.sonar.server.user.UserSession; -public class TestsPlanAction implements RequestHandler { +public class TestsCoveredFilesAction implements RequestHandler { private static final String KEY = "key"; private static final String TEST = "test"; private final SnapshotPerspectives snapshotPerspectives; - public TestsPlanAction(SnapshotPerspectives snapshotPerspectives) { + public TestsCoveredFilesAction(SnapshotPerspectives snapshotPerspectives) { this.snapshotPerspectives = snapshotPerspectives; } void define(WebService.NewController controller) { - WebService.NewAction action = controller.createAction("plan") + WebService.NewAction action = controller.createAction("covered_files") .setDescription("Get the list of files covered by a test plan. Require Browse permission on file's project") .setSince("4.4") .setResponseExample(Resources.getResource(getClass(), "tests-example-plan.json")) diff --git a/sonar-server/src/main/java/org/sonar/server/test/ws/TestsTestableAction.java b/sonar-server/src/main/java/org/sonar/server/test/ws/TestsTestCasesAction.java similarity index 95% rename from sonar-server/src/main/java/org/sonar/server/test/ws/TestsTestableAction.java rename to sonar-server/src/main/java/org/sonar/server/test/ws/TestsTestCasesAction.java index 3b919b7ec89..ca381b4e438 100644 --- a/sonar-server/src/main/java/org/sonar/server/test/ws/TestsTestableAction.java +++ b/sonar-server/src/main/java/org/sonar/server/test/ws/TestsTestCasesAction.java @@ -38,19 +38,19 @@ import java.util.Map; import static com.google.common.collect.Maps.newHashMap; -public class TestsTestableAction implements RequestHandler { +public class TestsTestCasesAction implements RequestHandler { private static final String KEY = "key"; private static final String LINE = "line"; private final SnapshotPerspectives snapshotPerspectives; - public TestsTestableAction(SnapshotPerspectives snapshotPerspectives) { + public TestsTestCasesAction(SnapshotPerspectives snapshotPerspectives) { this.snapshotPerspectives = snapshotPerspectives; } void define(WebService.NewController controller) { - WebService.NewAction action = controller.createAction("testable") + WebService.NewAction action = controller.createAction("test_cases") .setDescription("Get the list of test cases covering a given file and line. Require Browse permission on file's project") .setSince("4.4") .setResponseExample(Resources.getResource(getClass(), "tests-example-testable.json")) diff --git a/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java b/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java index 93f47a913d3..274e56ade2a 100644 --- a/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java +++ b/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java @@ -25,10 +25,10 @@ import org.sonar.api.server.ws.WebService; public class TestsWs implements WebService { private final TestsShowAction showAction; - private final TestsTestableAction testableAction; - private final TestsPlanAction planAction; + private final TestsTestCasesAction testableAction; + private final TestsCoveredFilesAction planAction; - public TestsWs(TestsShowAction showAction, TestsTestableAction testableAction, TestsPlanAction planAction) { + public TestsWs(TestsShowAction showAction, TestsTestCasesAction testableAction, TestsCoveredFilesAction planAction) { this.showAction = showAction; this.testableAction = testableAction; this.planAction = planAction; diff --git a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsPlanActionTest.java b/sonar-server/src/test/java/org/sonar/server/test/ws/TestsCoveredFilesActionTest.java similarity index 96% rename from sonar-server/src/test/java/org/sonar/server/test/ws/TestsPlanActionTest.java rename to sonar-server/src/test/java/org/sonar/server/test/ws/TestsCoveredFilesActionTest.java index 8e576b47fd9..b44254ee790 100644 --- a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsPlanActionTest.java +++ b/sonar-server/src/test/java/org/sonar/server/test/ws/TestsCoveredFilesActionTest.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) -public class TestsPlanActionTest { +public class TestsCoveredFilesActionTest { static final String TEST_PLAN_KEY = "src/test/java/org/foo/BarTest.java"; @@ -55,7 +55,7 @@ public class TestsPlanActionTest { public void setUp() throws Exception { SnapshotPerspectives snapshotPerspectives = mock(SnapshotPerspectives.class); when(snapshotPerspectives.as(MutableTestPlan.class, TEST_PLAN_KEY)).thenReturn(testPlan); - tester = new WsTester(new TestsWs(mock(TestsShowAction.class), mock(TestsTestableAction.class), new TestsPlanAction(snapshotPerspectives))); + tester = new WsTester(new TestsWs(mock(TestsShowAction.class), mock(TestsTestCasesAction.class), new TestsCoveredFilesAction(snapshotPerspectives))); } @Test diff --git a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsShowActionTest.java b/sonar-server/src/test/java/org/sonar/server/test/ws/TestsShowActionTest.java index 7567064c8de..80e9617d6ca 100644 --- a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsShowActionTest.java +++ b/sonar-server/src/test/java/org/sonar/server/test/ws/TestsShowActionTest.java @@ -53,7 +53,7 @@ public class TestsShowActionTest { public void setUp() throws Exception { SnapshotPerspectives snapshotPerspectives = mock(SnapshotPerspectives.class); when(snapshotPerspectives.as(MutableTestPlan.class, TEST_PLAN_KEY)).thenReturn(testPlan); - tester = new WsTester(new TestsWs(new TestsShowAction(snapshotPerspectives), mock(TestsTestableAction.class), mock(TestsPlanAction.class))); + tester = new WsTester(new TestsWs(new TestsShowAction(snapshotPerspectives), mock(TestsTestCasesAction.class), mock(TestsCoveredFilesAction.class))); } @Test diff --git a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsTestableActionTest.java b/sonar-server/src/test/java/org/sonar/server/test/ws/TestsTestCasesActionTest.java similarity index 96% rename from sonar-server/src/test/java/org/sonar/server/test/ws/TestsTestableActionTest.java rename to sonar-server/src/test/java/org/sonar/server/test/ws/TestsTestCasesActionTest.java index 2b21d0caf44..fa39a3c1d2d 100644 --- a/sonar-server/src/test/java/org/sonar/server/test/ws/TestsTestableActionTest.java +++ b/sonar-server/src/test/java/org/sonar/server/test/ws/TestsTestCasesActionTest.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) -public class TestsTestableActionTest { +public class TestsTestCasesActionTest { static final String FILE_KEY = "src/main/java/org/foo/Foo.java"; @@ -52,7 +52,7 @@ public class TestsTestableActionTest { public void setUp() throws Exception { SnapshotPerspectives snapshotPerspectives = mock(SnapshotPerspectives.class); when(snapshotPerspectives.as(MutableTestable.class, FILE_KEY)).thenReturn(testable); - tester = new WsTester(new TestsWs(mock(TestsShowAction.class), new TestsTestableAction(snapshotPerspectives), mock(TestsPlanAction.class))); + tester = new WsTester(new TestsWs(mock(TestsShowAction.class), new TestsTestCasesAction(snapshotPerspectives), mock(TestsCoveredFilesAction.class))); } @Test 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 f51d18168d6..cb14b174a29 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 @@ -36,7 +36,7 @@ public class TestsWsTest { @Before public void setUp() throws Exception { SnapshotPerspectives snapshotPerspectives = mock(SnapshotPerspectives.class); - WsTester tester = new WsTester(new TestsWs(new TestsShowAction(snapshotPerspectives), new TestsTestableAction(snapshotPerspectives), new TestsPlanAction(snapshotPerspectives))); + WsTester tester = new WsTester(new TestsWs(new TestsShowAction(snapshotPerspectives), new TestsTestCasesAction(snapshotPerspectives), new TestsCoveredFilesAction(snapshotPerspectives))); controller = tester.controller("api/tests"); } diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/test/TestClient.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/test/TestClient.java index adf070c7151..14d575f645c 100644 --- a/sonar-ws-client/src/main/java/org/sonar/wsclient/test/TestClient.java +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/test/TestClient.java @@ -37,10 +37,10 @@ public interface TestClient { /** * Return list of test cases covering a files' line */ - TestableTestCases testable(String fileKey, Integer line); + TestableTestCases testCases(String fileKey, Integer line); /** * Return the list of files covered by a test plan's test case */ - List plan(String testPlanKey, String testCase); + List coveredFiles(String testPlanKey, String testCase); } diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/test/internal/DefaultTestClient.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/test/internal/DefaultTestClient.java index c65df73a97e..c6c1f055462 100644 --- a/sonar-ws-client/src/main/java/org/sonar/wsclient/test/internal/DefaultTestClient.java +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/test/internal/DefaultTestClient.java @@ -78,9 +78,9 @@ public class DefaultTestClient implements TestClient { } @Override - public List plan(String testPlanKey, String testCase) { + public List coveredFiles(String testPlanKey, String testCase) { Map params = EncodingUtils.toMap("key", testPlanKey, "test", testCase); - String jsonResult = requestFactory.get("/api/tests/plan", params); + String jsonResult = requestFactory.get("/api/tests/covered_files", params); List files = new ArrayList(); Map jRoot = (Map) JSONValue.parse(jsonResult); @@ -109,10 +109,10 @@ public class DefaultTestClient implements TestClient { } @Override - public TestableTestCases testable(String fileKey, Integer line) { + public TestableTestCases testCases(String fileKey, Integer line) { Map params = EncodingUtils.toMap("key", fileKey); params.put("line", line); - String jsonResult = requestFactory.get("/api/tests/testable", params); + String jsonResult = requestFactory.get("/api/tests/test_cases", params); Map jRoot = (Map) JSONValue.parse(jsonResult); final DefaultTestableTestCases testableTestCases = new DefaultTestableTestCases(); diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/test/internal/DefaultTestClientTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/test/internal/DefaultTestClientTest.java index bb88852e144..9c3d9178694 100644 --- a/sonar-ws-client/src/test/java/org/sonar/wsclient/test/internal/DefaultTestClientTest.java +++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/test/internal/DefaultTestClientTest.java @@ -42,7 +42,7 @@ public class DefaultTestClientTest { public MockHttpServerInterceptor httpServer = new MockHttpServerInterceptor(); @Test - public void show_test_cases() throws IOException { + public void show_test_case() throws IOException { HttpRequestFactory requestFactory = new HttpRequestFactory(httpServer.url()); httpServer.stubResponseBody(Resources.toString(Resources.getResource(this.getClass(), "DefaultTestClientTest/show_test_case.json"), Charsets.UTF_8)); @@ -58,14 +58,14 @@ public class DefaultTestClientTest { } @Test - public void show_testable() throws IOException { + public void test_cases() throws IOException { HttpRequestFactory requestFactory = new HttpRequestFactory(httpServer.url()); - httpServer.stubResponseBody(Resources.toString(Resources.getResource(this.getClass(), "DefaultTestClientTest/show_testable.json"), Charsets.UTF_8)); + httpServer.stubResponseBody(Resources.toString(Resources.getResource(this.getClass(), "DefaultTestClientTest/test_cases.json"), Charsets.UTF_8)); TestClient client = new DefaultTestClient(requestFactory); - TestableTestCases coveringTestCases = client.testable("MyFile", 10); + TestableTestCases coveringTestCases = client.testCases("MyFile", 10); - assertThat(httpServer.requestedPath()).isEqualTo("/api/tests/testable?key=MyFile&line=10"); + assertThat(httpServer.requestedPath()).isEqualTo("/api/tests/test_cases?key=MyFile&line=10"); assertThat(coveringTestCases.tests()).hasSize(1); assertThat(coveringTestCases.files()).hasSize(1); @@ -80,14 +80,14 @@ public class DefaultTestClientTest { } @Test - public void show_plan() throws IOException { + public void covered_files() throws IOException { HttpRequestFactory requestFactory = new HttpRequestFactory(httpServer.url()); - httpServer.stubResponseBody(Resources.toString(Resources.getResource(this.getClass(), "DefaultTestClientTest/show_plan.json"), Charsets.UTF_8)); + httpServer.stubResponseBody(Resources.toString(Resources.getResource(this.getClass(), "DefaultTestClientTest/covered_files.json"), Charsets.UTF_8)); TestClient client = new DefaultTestClient(requestFactory); - List files = client.plan("MyTestFile", "find_by_params"); + List files = client.coveredFiles("MyTestFile", "find_by_params"); - assertThat(httpServer.requestedPath()).isEqualTo("/api/tests/plan?key=MyTestFile&test=find_by_params"); + assertThat(httpServer.requestedPath()).isEqualTo("/api/tests/covered_files?key=MyTestFile&test=find_by_params"); assertThat(files).hasSize(2); CoveredFile file = files.get(0); diff --git a/sonar-ws-client/src/test/resources/org/sonar/wsclient/test/internal/DefaultTestClientTest/show_plan.json b/sonar-ws-client/src/test/resources/org/sonar/wsclient/test/internal/DefaultTestClientTest/covered_files.json similarity index 100% rename from sonar-ws-client/src/test/resources/org/sonar/wsclient/test/internal/DefaultTestClientTest/show_plan.json rename to sonar-ws-client/src/test/resources/org/sonar/wsclient/test/internal/DefaultTestClientTest/covered_files.json diff --git a/sonar-ws-client/src/test/resources/org/sonar/wsclient/test/internal/DefaultTestClientTest/show_testable.json b/sonar-ws-client/src/test/resources/org/sonar/wsclient/test/internal/DefaultTestClientTest/test_cases.json similarity index 100% rename from sonar-ws-client/src/test/resources/org/sonar/wsclient/test/internal/DefaultTestClientTest/show_testable.json rename to sonar-ws-client/src/test/resources/org/sonar/wsclient/test/internal/DefaultTestClientTest/test_cases.json -- 2.39.5