Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change display name format #123

Merged
merged 1 commit into from
Dec 22, 2023
Merged

Change display name format #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 6 additions & 34 deletions plugin/src/main/java/com/microsoft/java/bs/gradle/plugin/SourceSetsModelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ public Object buildAll(String modelName, Project rootProject) {
sourceSetMap.put(sourceSet, gradleSourceSet);
gradleSourceSet.setSourceSetName(sourceSet.getName());
gradleSourceSet.setClassesTaskName(sourceSet.getClassesTaskName());
String projectName = stripPathPrefix(gradleSourceSet.getProjectPath());
if (projectName == null || projectName.length() == 0) {
projectName = gradleSourceSet.getProjectName();
}
String displayName = projectName + " [" + gradleSourceSet.getSourceSetName() + ']';
gradleSourceSet.setDisplayName(displayName);

// source
Set<File> srcDirs = sourceSet.getJava().getSrcDirs();
Expand Down Expand Up @@ -147,19 +153,6 @@ public Object buildAll(String modelName, Project rootProject) {
});
}

// run through twice to cope with any name clashes
for (DefaultGradleSourceSet sourceSet : sourceSetMap.values()) {
if ("main".equals(sourceSet.getSourceSetName())) {
sourceSet.setDisplayName(stripPathPrefix(sourceSet.getProjectPath()));
}
}
for (DefaultGradleSourceSet sourceSet : sourceSetMap.values()) {
if (!"main".equals(sourceSet.getSourceSetName())) {
String uniqueName = createUniqueDisplayName(sourceSet, sourceSetMap);
sourceSet.setDisplayName(uniqueName);
}
}

// map all output dirs to their source sets
Map<File, DefaultGradleSourceSet> outputsToSourceSet = new HashMap<>();
for (DefaultGradleSourceSet sourceSet : sourceSetMap.values()) {
Expand Down Expand Up @@ -245,27 +238,6 @@ private String stripPathPrefix(String projectPath) {
return projectPath;
}

private String createUniqueDisplayName(DefaultGradleSourceSet sourceSet,
Map<SourceSet, DefaultGradleSourceSet> sourceSetMap) {

String fullName = stripPathPrefix(sourceSet.getProjectPath()) + "-"
+ sourceSet.getSourceSetName();
// has the suffix caused a clash - apply a numbered suffix
String usedName = fullName;
int i = 2;
boolean found = true;
while (found) {
String nameToTest = usedName;
if (sourceSetMap.values().stream().noneMatch(ss -> nameToTest.equals(ss.getDisplayName()))) {
found = false;
} else {
usedName = fullName + i;
i++;
}
}
return usedName;
}

private Set<Object> getArchiveSourcePaths(CopySpec copySpec) {
Set<Object> sourcePaths = new HashSet<>();
if (copySpec instanceof DefaultCopySpec) {
Expand Down
92 changes: 39 additions & 53 deletions server/src/test/java/com/microsoft/java/bs/core/internal/gradle/GradleApiConnectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,12 @@ void testGetGradleSourceSets() {
assertEquals(":", gradleSourceSet.getProjectPath());
assertEquals(projectDir, gradleSourceSet.getProjectDir());
assertEquals(projectDir, gradleSourceSet.getRootDir());
assertTrue(gradleSourceSet.getSourceSetName().equals("main")
|| gradleSourceSet.getSourceSetName().equals("test"));
}

assertEquals("main", findSourceSet(gradleSourceSets,
"junit5-jupiter-starter-gradle [main]").getSourceSetName());
assertEquals("test", findSourceSet(gradleSourceSets,
"junit5-jupiter-starter-gradle [test]").getSourceSetName());
}

private GradleSourceSet findSourceSet(GradleSourceSets gradleSourceSets, String displayName) {
Expand All @@ -74,24 +77,7 @@ private GradleSourceSet findSourceSet(GradleSourceSets gradleSourceSets, String
String availableSourceSets = gradleSourceSets.getGradleSourceSets().stream()
.map(ss -> ss.getDisplayName())
.collect(Collectors.joining(", "));
return "SourceSet not found " + displayName + ". Available: " + availableSourceSets;
});
return sourceSet;
}

private GradleSourceSet findSourceSet(GradleSourceSets gradleSourceSets, String projectName,
String sourceSetName) {
GradleSourceSet sourceSet = gradleSourceSets.getGradleSourceSets().stream()
.filter(ss -> ss.getProjectName().equals(projectName)
&& ss.getSourceSetName().equals(sourceSetName))
.findFirst()
.orElse(null);
assertNotNull(sourceSet, () -> {
String availableSourceSets = gradleSourceSets.getGradleSourceSets().stream()
.map(ss -> ss.getProjectName() + ' ' + ss.getSourceSetName())
.collect(Collectors.joining(", "));
return "SourceSet not found " + projectName + ' ' + sourceSetName + ". Available: "
+ availableSourceSets;
return "DisplayName not found " + displayName + ". Available: " + availableSourceSets;
});
return sourceSet;
}
Expand All @@ -104,18 +90,18 @@ void testGetGradleDuplicateNestedProjectNames() {
GradleApiConnector connector = new GradleApiConnector(preferenceManager);
GradleSourceSets gradleSourceSets = connector.getGradleSourceSets(projectDir.toURI());
assertEquals(12, gradleSourceSets.getGradleSourceSets().size());
findSourceSet(gradleSourceSets, "a");
findSourceSet(gradleSourceSets, "a-test");
findSourceSet(gradleSourceSets, "b");
findSourceSet(gradleSourceSets, "b-test2");
findSourceSet(gradleSourceSets, "b-test");
findSourceSet(gradleSourceSets, "b-test-test");
findSourceSet(gradleSourceSets, "c");
findSourceSet(gradleSourceSets, "c-test");
findSourceSet(gradleSourceSets, "d");
findSourceSet(gradleSourceSets, "d-test");
findSourceSet(gradleSourceSets, "e");
findSourceSet(gradleSourceSets, "e-test");
findSourceSet(gradleSourceSets, "a [main]");
findSourceSet(gradleSourceSets, "a [test]");
findSourceSet(gradleSourceSets, "b [main]");
findSourceSet(gradleSourceSets, "b [test]");
findSourceSet(gradleSourceSets, "b-test [main]");
findSourceSet(gradleSourceSets, "b-test [test]");
findSourceSet(gradleSourceSets, "c [main]");
findSourceSet(gradleSourceSets, "c [test]");
findSourceSet(gradleSourceSets, "d [main]");
findSourceSet(gradleSourceSets, "d [test]");
findSourceSet(gradleSourceSets, "e [main]");
findSourceSet(gradleSourceSets, "e [test]");
}

@Test
Expand All @@ -126,11 +112,11 @@ void testGetGradleHasTests() {
GradleApiConnector connector = new GradleApiConnector(preferenceManager);
GradleSourceSets gradleSourceSets = connector.getGradleSourceSets(projectDir.toURI());
assertEquals(5, gradleSourceSets.getGradleSourceSets().size());
assertFalse(findSourceSet(gradleSourceSets, "test-tag", "main").hasTests());
assertTrue(findSourceSet(gradleSourceSets, "test-tag", "test").hasTests());
assertFalse(findSourceSet(gradleSourceSets, "test-tag", "noTests").hasTests());
assertTrue(findSourceSet(gradleSourceSets, "test-tag", "intTest").hasTests());
assertFalse(findSourceSet(gradleSourceSets, "test-tag", "testFixtures").hasTests());
assertFalse(findSourceSet(gradleSourceSets, "test-tag [main]").hasTests());
assertTrue(findSourceSet(gradleSourceSets, "test-tag [test]").hasTests());
assertFalse(findSourceSet(gradleSourceSets, "test-tag [noTests]").hasTests());
assertTrue(findSourceSet(gradleSourceSets, "test-tag [intTest]").hasTests());
assertFalse(findSourceSet(gradleSourceSets, "test-tag [testFixtures]").hasTests());
}

private void assertHasBuildTargetDependency(GradleSourceSet sourceSet,
Expand All @@ -155,15 +141,15 @@ void testGetGradleDependenciesWithTestFixtures() {
GradleApiConnector connector = new GradleApiConnector(preferenceManager);
GradleSourceSets gradleSourceSets = connector.getGradleSourceSets(projectDir.toURI());
assertEquals(5, gradleSourceSets.getGradleSourceSets().size());
GradleSourceSet mainA = findSourceSet(gradleSourceSets, "a", "main");
GradleSourceSet mainA = findSourceSet(gradleSourceSets, "a [main]");
assertEquals(0, mainA.getBuildTargetDependencies().size());
GradleSourceSet testFixturesA = findSourceSet(gradleSourceSets, "a", "testFixtures");
GradleSourceSet testFixturesA = findSourceSet(gradleSourceSets, "a [testFixtures]");
assertEquals(1, testFixturesA.getBuildTargetDependencies().size());
GradleSourceSet testA = findSourceSet(gradleSourceSets, "a", "test");
GradleSourceSet testA = findSourceSet(gradleSourceSets, "a [test]");
assertEquals(2, testA.getBuildTargetDependencies().size());
GradleSourceSet mainB = findSourceSet(gradleSourceSets, "b", "main");
GradleSourceSet mainB = findSourceSet(gradleSourceSets, "b [main]");
assertEquals(0, mainB.getBuildTargetDependencies().size());
GradleSourceSet testB = findSourceSet(gradleSourceSets, "b", "test");
GradleSourceSet testB = findSourceSet(gradleSourceSets, "b [test]");
assertEquals(3, testB.getBuildTargetDependencies().size());
assertHasBuildTargetDependency(testFixturesA, mainA);
assertHasBuildTargetDependency(testA, mainA);
Expand All @@ -182,9 +168,9 @@ void testGetGradleDependenciesWithTestToMain() {
GradleSourceSets gradleSourceSets = connector.getGradleSourceSets(projectDir.toURI());
assertEquals(2, gradleSourceSets.getGradleSourceSets().size());
GradleSourceSet main = findSourceSet(gradleSourceSets,
"project-dependency-test-to-main", "main");
"project-dependency-test-to-main [main]");
GradleSourceSet test = findSourceSet(gradleSourceSets,
"project-dependency-test-to-main", "test");
"project-dependency-test-to-main [test]");
assertEquals(0, main.getBuildTargetDependencies().size());
assertHasBuildTargetDependency(test, main);
assertEquals(1, test.getBuildTargetDependencies().size());
Expand All @@ -198,11 +184,11 @@ void testGetGradleDependenciesWithSourceSetOutput() {
GradleApiConnector connector = new GradleApiConnector(preferenceManager);
GradleSourceSets gradleSourceSets = connector.getGradleSourceSets(projectDir.toURI());
assertEquals(4, gradleSourceSets.getGradleSourceSets().size());
GradleSourceSet testA = findSourceSet(gradleSourceSets, "a", "test");
GradleSourceSet testA = findSourceSet(gradleSourceSets, "a [test]");
assertEquals(1, testA.getBuildTargetDependencies().size());
GradleSourceSet mainB = findSourceSet(gradleSourceSets, "b", "main");
GradleSourceSet mainB = findSourceSet(gradleSourceSets, "b [main]");
assertEquals(0, mainB.getBuildTargetDependencies().size());
GradleSourceSet testB = findSourceSet(gradleSourceSets, "b", "test");
GradleSourceSet testB = findSourceSet(gradleSourceSets, "b [test]");
assertEquals(2, testB.getBuildTargetDependencies().size());
assertHasBuildTargetDependency(testB, testA);
assertHasBuildTargetDependency(testB, mainB);
Expand All @@ -216,8 +202,8 @@ void testGetGradleDependenciesWithConfiguration() {
GradleApiConnector connector = new GradleApiConnector(preferenceManager);
GradleSourceSets gradleSourceSets = connector.getGradleSourceSets(projectDir.toURI());
assertEquals(4, gradleSourceSets.getGradleSourceSets().size());
GradleSourceSet mainA = findSourceSet(gradleSourceSets, "a", "main");
GradleSourceSet mainB = findSourceSet(gradleSourceSets, "b", "main");
GradleSourceSet mainA = findSourceSet(gradleSourceSets, "a [main]");
GradleSourceSet mainB = findSourceSet(gradleSourceSets, "b [main]");
assertHasBuildTargetDependency(mainB, mainA);
}

Expand All @@ -229,8 +215,8 @@ void testGetGradleDependenciesWithTestConfiguration() {
GradleApiConnector connector = new GradleApiConnector(preferenceManager);
GradleSourceSets gradleSourceSets = connector.getGradleSourceSets(projectDir.toURI());
assertEquals(4, gradleSourceSets.getGradleSourceSets().size());
GradleSourceSet testA = findSourceSet(gradleSourceSets, "a", "test");
GradleSourceSet testB = findSourceSet(gradleSourceSets, "b", "test");
GradleSourceSet testA = findSourceSet(gradleSourceSets, "a [test]");
GradleSourceSet testB = findSourceSet(gradleSourceSets, "b [test]");
assertHasBuildTargetDependency(testB, testA);
}

Expand All @@ -242,8 +228,8 @@ void testGetGradleDependenciesWithLazyArchive() {
GradleApiConnector connector = new GradleApiConnector(preferenceManager);
GradleSourceSets gradleSourceSets = connector.getGradleSourceSets(projectDir.toURI());
assertEquals(4, gradleSourceSets.getGradleSourceSets().size());
GradleSourceSet testA = findSourceSet(gradleSourceSets, "a", "test");
GradleSourceSet testB = findSourceSet(gradleSourceSets, "b", "test");
GradleSourceSet testA = findSourceSet(gradleSourceSets, "a [test]");
GradleSourceSet testB = findSourceSet(gradleSourceSets, "b [test]");
assertHasBuildTargetDependency(testB, testA);
}
}
Loading