This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 89fa99b Fixed ProjectUtils.parentOf() for gradle subprojects.
new 8897045 Merge pull request #2815 from sdedic/gradle/parentProviderFix
89fa99b is described below
commit 89fa99b91369ccc84e14bcbd4e06a60fdf06097a
Author: Svata Dedic <svatopluk.de...@oracle.com>
AuthorDate: Thu Mar 18 15:10:07 2021 +0100
Fixed ProjectUtils.parentOf() for gradle subprojects.
---
.../gradle/queries/ParentRootProviderImpl.java | 28 ++--
.../gradle/queries/ParentRootProviderTest.java | 173 +++++++++++++++++++++
2 files changed, 189 insertions(+), 12 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/queries/ParentRootProviderImpl.java
b/extide/gradle/src/org/netbeans/modules/gradle/queries/ParentRootProviderImpl.java
index 1883b2e..9d2611a 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/queries/ParentRootProviderImpl.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/queries/ParentRootProviderImpl.java
@@ -51,18 +51,22 @@ public class ParentRootProviderImpl implements
ParentProjectProvider, RootProjec
GradleBaseProject gbp = GradleBaseProject.get(project);
if ((gbp != null) && !gbp.isRoot()) {
int lastcol = gbp.getPath().lastIndexOf(':');
- if (lastcol > 0) {
- String parentPath = gbp.getPath().substring(0, lastcol);
- Project root = getRootProject();
- GradleBaseProject rbp = GradleBaseProject.get(root);
- File parentDir = rbp.getSubProjects().get(parentPath);
- if (parentDir != null) {
- FileObject fo = FileUtil.toFileObject(parentDir);
- try {
- ret = ProjectManager.getDefault().findProject(fo);
- } catch (IllegalArgumentException | IOException ex) {
- ErrorManager.getDefault().notify(ex);
- }
+ if (lastcol == -1) {
+ return null;
+ }
+ String parentPath = gbp.getPath().substring(0, lastcol);
+ Project root = getRootProject();
+ if (parentPath.isEmpty()) {
+ return root;
+ }
+ GradleBaseProject rbp = GradleBaseProject.get(root);
+ File parentDir = rbp.getSubProjects().get(parentPath);
+ if (parentDir != null) {
+ FileObject fo = FileUtil.toFileObject(parentDir);
+ try {
+ ret = ProjectManager.getDefault().findProject(fo);
+ } catch (IllegalArgumentException | IOException ex) {
+ ErrorManager.getDefault().notify(ex);
}
}
}
diff --git
a/extide/gradle/test/unit/src/org/netbeans/modules/gradle/queries/ParentRootProviderTest.java
b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/queries/ParentRootProviderTest.java
new file mode 100644
index 0000000..6a6460d
--- /dev/null
+++
b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/queries/ParentRootProviderTest.java
@@ -0,0 +1,173 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.gradle.queries;
+
+import java.io.IOException;
+import java.util.Random;
+import java.util.Set;
+import static junit.framework.TestCase.assertNotNull;
+import org.netbeans.api.project.Project;
+import org.netbeans.api.project.ProjectManager;
+import org.netbeans.api.project.ProjectUtils;
+import org.netbeans.modules.gradle.AbstractGradleProjectTestCase;
+import org.netbeans.modules.gradle.ProjectTrust;
+import org.netbeans.modules.project.uiapi.ProjectOpenedTrampoline;
+import org.netbeans.spi.project.ui.ProjectOpenedHook;
+import org.openide.filesystems.FileObject;
+
+/**
+ *
+ * @author sdedic
+ */
+public class ParentRootProviderTest extends AbstractGradleProjectTestCase {
+ /**
+ * The root project, usually
+ */
+ private Project projectA;
+ private Project projectB;
+ private Project projectFolder;
+ private Project projectC;
+
+ public ParentRootProviderTest(String name) {
+ super(name);
+ }
+
+ private boolean trustRootProject = true;
+
+ private void setupComplexMultiProject(boolean openRoot) throws IOException
{
+ int rnd = new Random().nextInt(1000000);
+ FileObject a = createGradleProject("projectA-" + rnd,
+ "", "include ':projectB'\n include ':folder:projectC'");
+ FileObject b = createGradleProject("projectA-" + rnd + "/projectB",
+ "apply plugin: 'java'\ndependencies {implementation
project(':folder:projectC')}", null);
+ FileObject c = createGradleProject("projectA-" + rnd +
"/folder/projectC",
+ "apply plugin: 'java'", null);
+
+ projectA = ProjectManager.getDefault().findProject(a);
+ if (trustRootProject) {
+ ProjectTrust.getDefault().trustProject(projectA);
+ }
+
+ // must open projectA, otherwise projectFolder won't be recognized as
a project.
+ if (openRoot) {
+ openProject(projectA);
+ }
+ projectFolder = ProjectManager.getDefault().findProject(c.getParent());
+ projectB = ProjectManager.getDefault().findProject(b);
+ projectC = ProjectManager.getDefault().findProject(c);
+
+ }
+
+ private void setupSimpleMultiProject(boolean openRoot) throws IOException {
+ int rnd = new Random().nextInt(1000000);
+ FileObject a = createGradleProject("projectA-" + rnd,
+ "", "include ':projectB'\n include ':projectC'");
+ FileObject b = createGradleProject("projectA-" + rnd + "/projectB",
+ "apply plugin: 'java'\ndependencies {implementation
project(':projectC')}", null);
+ FileObject c = createGradleProject("projectA-" + rnd + "/projectC",
+ "apply plugin: 'java'", null);
+
+ projectA = ProjectManager.getDefault().findProject(a);
+ if (trustRootProject) {
+ ProjectTrust.getDefault().trustProject(projectA);
+ }
+
+ // must open projectA, otherwise projectFolder won't be recognized as
a project.
+ if (openRoot) {
+ openProject(projectA);
+ }
+ projectFolder = ProjectManager.getDefault().findProject(c.getParent());
+ projectB = ProjectManager.getDefault().findProject(b);
+ projectC = ProjectManager.getDefault().findProject(c);
+
+ }
+
+ private void assertParent(Project parent, Project child) {
+ assertSame(parent, ProjectUtils.parentOf(child));
+ }
+
+ protected Project openProject(Project prj) throws IOException {
+ return openProject(prj.getProjectDirectory());
+ }
+
+ protected Project openProject(FileObject projectDir) throws IOException {
+ Project prj = ProjectManager.getDefault().findProject(projectDir);
+ assertNotNull(prj);
+
ProjectOpenedTrampoline.DEFAULT.projectOpened(prj.getLookup().lookup(ProjectOpenedHook.class));
+ return prj;
+ }
+
+ public void testComplexMultiProjectClosed() throws IOException {
+ setupComplexMultiProject(false);
+
+ assertParent(projectA, projectB);
+
+ // folders are not recognized as projects unless their parent opens,
see NETBEANS-5468
+ assertNull(projectFolder);
+ assertParent(projectFolder, projectC);
+ assertParent(null, projectA);
+
+
+ Set<Project> subprojects = ProjectUtils.getContainedProjects(projectA,
true);
+
+ // unopened projects do not enumerate the contents; see NETBEANS-5468
+ assertFalse(subprojects.contains(projectB));
+ assertFalse(subprojects.contains(projectC));
+ }
+
+ public void testComplexMultiProjectOpened() throws IOException {
+ setupComplexMultiProject(true);
+
+ assertParent(projectA, projectB);
+ assertParent(projectFolder, projectC);
+ assertParent(null, projectA);
+
+ Set<Project> subprojects = ProjectUtils.getContainedProjects(projectA,
true);
+ assertTrue(subprojects.contains(projectB));
+ assertTrue(subprojects.contains(projectC));
+ }
+
+ public void testSimpleMultiProjectClosed() throws IOException {
+ setupSimpleMultiProject(false);
+
+ assertParent(projectA, projectB);
+ assertParent(projectA, projectC);
+ assertParent(null, projectA);
+
+
+ Set<Project> subprojects = ProjectUtils.getContainedProjects(projectA,
true);
+
+ // unopened projects do not enumerate the contents; see NETBEANS-5468
+ assertFalse(subprojects.contains(projectB));
+ assertFalse(subprojects.contains(projectC));
+ }
+
+ public void testSimpleMultiProjectOpened() throws IOException {
+ setupSimpleMultiProject(true);
+
+ assertParent(projectA, projectB);
+ assertParent(projectA, projectC);
+ assertParent(null, projectA);
+
+ Set<Project> subprojects = ProjectUtils.getContainedProjects(projectA,
true);
+ assertTrue(subprojects.contains(projectB));
+ assertTrue(subprojects.contains(projectC));
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
