From 0bc2180be6cc7dea6f2bb74b573818af1f121389 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Fri, 4 Sep 2015 15:00:13 +0200 Subject: [PATCH] fix ComponentTesting: Subview in table PROJECTS have no path --- .../step/ViewsFillMeasuresWithVariationsStepTest.java | 2 +- .../computation/step/ViewsPersistSnapshotsStepTest.java | 4 ++-- .../java/org/sonar/db/component/ComponentTesting.java | 9 ++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsFillMeasuresWithVariationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsFillMeasuresWithVariationsStepTest.java index e1b21956cf6..5b5bbc8028f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsFillMeasuresWithVariationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsFillMeasuresWithVariationsStepTest.java @@ -134,7 +134,7 @@ public class ViewsFillMeasuresWithVariationsStepTest { dbClient.measureDao().insert(session, newMeasureDto(ISSUES_METRIC.getId(), VIEW_DTO.getId(), period1ViewSnapshot.getId(), 60d)); // SubView - ComponentDto subviewDto = ComponentTesting.newSubView(VIEW_DTO, "dir", "who cares?"); + ComponentDto subviewDto = ComponentTesting.newSubView(VIEW_DTO, "dir", "key"); dbClient.componentDao().insert(session, subviewDto); SnapshotDto period1SubviewSnapshot = createForComponent(subviewDto, period1ViewSnapshot); dbClient.snapshotDao().insert(session, period1SubviewSnapshot); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsPersistSnapshotsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsPersistSnapshotsStepTest.java index fe258b93caa..432f5cc8777 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsPersistSnapshotsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ViewsPersistSnapshotsStepTest.java @@ -111,7 +111,7 @@ public class ViewsPersistSnapshotsStepTest extends BaseStepTest { public void persist_snapshots() { ComponentDto projectDto = save(newProjectDto("proj")); ComponentDto viewDto = save(newView("ABCD").setKey(valueOf(PROJECT_KEY)).setName("Project")); - ComponentDto subViewDto = save(newSubView(viewDto, "CDEF", "MODULE_KEY:src/main/java/dir").setKey("2")); + ComponentDto subViewDto = save(newSubView(viewDto, "CDEF", "key").setKey("2")); ComponentDto projectViewDto = save(newProjectCopy("DEFG", projectDto, subViewDto).setKey("3")); dbTester.getSession().commit(); @@ -181,7 +181,7 @@ public class ViewsPersistSnapshotsStepTest extends BaseStepTest { @Test public void persist_snapshots_with_periods() { ComponentDto viewDto = save(newView("ABCD").setKey(valueOf(PROJECT_KEY)).setName("Project")); - ComponentDto subViewDto = save(newSubView(viewDto, "CDEF", "MODULE_KEY:src/main/java/dir").setKey("2")); + ComponentDto subViewDto = save(newSubView(viewDto, "CDEF", "key").setKey("2")); SnapshotDto viewSnapshotDto = save(createForProject(viewDto).setCreatedAt(DateUtils.parseDateQuietly("2015-01-01").getTime())); SnapshotDto subViewSnapshotDto = save(createForProject(subViewDto).setCreatedAt(DateUtils.parseDateQuietly("2015-01-01").getTime())); dbTester.getSession().commit(); diff --git a/sonar-db/src/test/java/org/sonar/db/component/ComponentTesting.java b/sonar-db/src/test/java/org/sonar/db/component/ComponentTesting.java index 043608fe0a9..11c3cebbc8c 100644 --- a/sonar-db/src/test/java/org/sonar/db/component/ComponentTesting.java +++ b/sonar-db/src/test/java/org/sonar/db/component/ComponentTesting.java @@ -55,12 +55,11 @@ public class ComponentTesting { .setQualifier(Qualifiers.DIRECTORY); } - public static ComponentDto newSubView(ComponentDto viewOrSubView, String uuid, String path) { + public static ComponentDto newSubView(ComponentDto viewOrSubView, String uuid, String key) { return newChildComponent(uuid, viewOrSubView) - .setKey(!path.equals("/") ? viewOrSubView.getKey() + ":" + path : viewOrSubView.getKey() + ":/") - .setName(path) - .setLongName(path) - .setPath(path) + .setKey(key) + .setName(key) + .setLongName(key) .setScope(Scopes.PROJECT) .setQualifier(Qualifiers.SUBVIEW); } -- 2.39.5