You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by he...@apache.org on 2020/04/17 19:18:49 UTC
[netbeans] branch apisupport-ant-tests created (now 4766679)
This is an automated email from the ASF dual-hosted git repository.
hectorespert pushed a change to branch apisupport-ant-tests
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
at 4766679 Fix apisupport.ant tests
This branch includes the following new commits:
new 4766679 Fix apisupport.ant tests
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] 01/01: Fix apisupport.ant tests
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hectorespert pushed a commit to branch apisupport-ant-tests
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 4766679eb3a8db936d4116277b8b1f6e36dbba3c
Author: Hector Espert <he...@gmail.com>
AuthorDate: Fri Apr 17 20:36:54 2020 +0200
Fix apisupport.ant tests
---
.gitignore | 2 +-
.travis.yml | 2 +-
.../html4j/nbproject/project.properties | 2 +-
.../javafx/nbproject/project.properties | 2 +-
.../suite3/nbplatform/.gitkeep | 1 +
.../apisupport/project/ApisupportAntUtilsTest.java | 4 +-
.../AvoidModuleListInProjectConstructorTest.java | 2 +-
.../apisupport/project/DialogDisplayerImpl.java | 70 ++++++++++++++++++++++
.../modules/apisupport/project/EvaluatorTest.java | 6 +-
.../apisupport/project/ModuleDependencyTest.java | 5 +-
.../apisupport/project/NbModuleProjectTest.java | 5 +-
.../project/NbModuleProviderImplTest.java | 2 -
.../apisupport/project/ProjectXMLManagerTest.java | 4 +-
.../modules/apisupport/project/UseFxTest.java | 1 -
.../apisupport/project/UseHtml4JavaTest.java | 1 -
.../queries/AccessibilityQueryImplTest.java | 14 ++---
.../queries/AntArtifactProviderImplTest.java | 7 ++-
.../project/queries/ClassPathProviderImplTest.java | 4 +-
.../queries/GlobalJavadocForBinaryImplTest.java | 3 +-
.../project/queries/JavadocForBinaryImplTest.java | 2 +-
.../project/queries/SourceForBinaryImplTest.java | 22 +++----
.../project/queries/SourceLevelQueryImplTest.java | 2 +-
.../queries/SubprojectProviderImplTest.java | 4 +-
.../queries/UnitTestForSourceQueryImplTest.java | 20 +++----
.../project/spi/BrandingSupportTest.java | 3 +-
.../project/suite/BuildZipDistributionTest.java | 1 -
.../apisupport/project/ui/ModuleActionsTest.java | 4 +-
.../ui/wizard/LibraryStartVisualPanelTest.java | 2 +-
.../project/universe/ModuleListTest.java | 9 +--
29 files changed, 136 insertions(+), 70 deletions(-)
diff --git a/.gitignore b/.gitignore
index 35528c1..0245b1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,4 +100,4 @@ derby.log
/groovy/gradle/netbeans-gradle-tooling/.gradle/
/groovy/gradle/netbeans-gradle-tooling/gradle/wrapper/gradle-wrapper.jar
/groovy/gradle/release/modules/gradle/daemon-loader/.gradle/
-/nbbuild/misc/prepare-bundles/target/
\ No newline at end of file
+/nbbuild/misc/prepare-bundles/target/
diff --git a/.travis.yml b/.travis.yml
index 348e149..b115979 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -459,7 +459,7 @@ matrix:
- ant $OPTS clean
- ant $OPTS build
script:
- #- ant $OPTS -f apisupport/apisupport.ant test
+ - ant $OPTS -f apisupport/apisupport.ant test
- ant $OPTS -f apisupport/apisupport.project test
- ant $OPTS -f apisupport/apisupport.refactoring test
- ant $OPTS -f apisupport/apisupport.wizards test
diff --git a/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties
index 8c80113..5137752 100644
--- a/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties
+++ b/apisupport/apisupport.ant/test/unit/data/example-external-projects/html4j/nbproject/project.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties
index 8c80113..5137752 100644
--- a/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties
+++ b/apisupport/apisupport.ant/test/unit/data/example-external-projects/javafx/nbproject/project.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/.gitkeep b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/.gitkeep
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/apisupport/apisupport.ant/test/unit/data/example-external-projects/suite3/nbplatform/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ApisupportAntUtilsTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ApisupportAntUtilsTest.java
index e2a25cc..01680b2 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ApisupportAntUtilsTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ApisupportAntUtilsTest.java
@@ -49,7 +49,7 @@ public class ApisupportAntUtilsTest extends TestBase {
}
public void testFindLocalizedBundleInfoFromNetBeansOrgModule() throws Exception {
- FileObject dir = nbRoot().getFileObject("apisupport.project");
+ FileObject dir = nbRoot().getFileObject("apisupport/apisupport.project");
assertNotNull("have apisupport.project checked out", dir);
NbModuleProject apisupport = (NbModuleProject) ProjectManager.getDefault().findProject(dir);
LocalizedBundleInfo info = ApisupportAntUtils.findLocalizedBundleInfo(
@@ -58,7 +58,7 @@ public class ApisupportAntUtilsTest extends TestBase {
}
public void testFindLocalizedBundleInfoFromSourceDirectory() throws Exception {
- LocalizedBundleInfo info = ApisupportAntUtils.findLocalizedBundleInfo(file("apisupport.project"));
+ LocalizedBundleInfo info = ApisupportAntUtils.findLocalizedBundleInfo(file("apisupport/apisupport.project"));
assertApiSupportInfo(info);
}
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/AvoidModuleListInProjectConstructorTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/AvoidModuleListInProjectConstructorTest.java
index 235749e..26088fa 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/AvoidModuleListInProjectConstructorTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/AvoidModuleListInProjectConstructorTest.java
@@ -40,7 +40,7 @@ public class AvoidModuleListInProjectConstructorTest extends TestBase {
// XXX cannot be run in binary dist, requires sources; test against fake platform
public void testNetBeansOrgModules() throws Exception {
assertEquals("no scans of netbeans.org initially", 0, ModuleList.getKnownEntries(file("nbbuild/netbeans/extide/org-apache-tools-ant-module.jar")).size());
- FileObject fo = nbRoot().getFileObject("o.apache.tools.ant.module");
+ FileObject fo = nbRoot().getFileObject("extide/o.apache.tools.ant.module");
Project p = ProjectManager.getDefault().findProject(fo);
assertNotNull(p);
assertEquals("still no scans", 0, ModuleList.getKnownEntries(file("nbbuild/netbeans/" + "extide" + "/modules/org-apache-tools-ant-module.jar")).size());
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/DialogDisplayerImpl.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/DialogDisplayerImpl.java
new file mode 100644
index 0000000..ac5f938
--- /dev/null
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/DialogDisplayerImpl.java
@@ -0,0 +1,70 @@
+/*
+ * 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.apisupport.project;
+
+import java.awt.Dialog;
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNotNull;
+import org.openide.DialogDescriptor;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.util.lookup.ServiceProvider;
+
+/** Test ready implementation of DialogDisplayer.
+ *
+ * @author Jaroslav Tulach
+ */
+@ServiceProvider(service=DialogDisplayer.class)
+public class DialogDisplayerImpl extends DialogDisplayer {
+
+ private static Object toReturn;
+
+ private NotifyDescriptor lastNotifyDescriptor;
+
+ public static void returnFromNotify(Object value) {
+ Object o = DialogDisplayer.getDefault();
+ assertEquals("My class", DialogDisplayerImpl.class, o.getClass());
+ toReturn = value;
+ }
+
+ @Override
+ public Object notify(NotifyDescriptor descriptor) {
+ lastNotifyDescriptor = descriptor;
+ Object r = toReturn;
+ toReturn = null;
+
+ assertNotNull("We are supposed to return a value", r);
+ return r;
+ }
+
+ @Override
+ public Dialog createDialog(DialogDescriptor descriptor) {
+ throw new UnsupportedOperationException();
+ }
+
+ public NotifyDescriptor getLastNotifyDescriptor() {
+ return lastNotifyDescriptor;
+ }
+
+ public void reset() {
+ this.lastNotifyDescriptor = null;
+ }
+
+}
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/EvaluatorTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/EvaluatorTest.java
index 0cf9850..45d02ca 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/EvaluatorTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/EvaluatorTest.java
@@ -63,12 +63,12 @@ public class EvaluatorTest extends TestBase {
clearWorkDir();
super.setUp();
userPropertiesFile = TestBase.initializeBuildProperties(getWorkDir(), getDataDir());
- FileObject dir = nbRoot().getFileObject("java.project");
+ FileObject dir = nbRoot().getFileObject("java/java.project");
assertNotNull("have java.project checked out", dir);
ProjectManagerTest.resetProjectManager(ProjectManager.getDefault());
Project p = ProjectManager.getDefault().findProject(dir);
javaProjectProject = (NbModuleProject)p;
- dir = nbRoot().getFileObject("openide.loaders");
+ dir = nbRoot().getFileObject("platform/openide.loaders");
assertNotNull("have openide.loaders checked out", dir);
p = ProjectManager.getDefault().findProject(dir);
loadersProject = (NbModuleProject)p;
@@ -76,7 +76,7 @@ public class EvaluatorTest extends TestBase {
public void testEvaluator() throws Exception {
PropertyEvaluator eval = javaProjectProject.evaluator();
- assertEquals("right basedir", file("java.project"),
+ assertEquals("right basedir", file("java/java.project"),
javaProjectProject.getHelper().resolveFile(eval.getProperty("basedir")));
assertEquals("right nb_all", nbRootFile(),
javaProjectProject.getHelper().resolveFile(eval.getProperty("nb_all")));
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ModuleDependencyTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ModuleDependencyTest.java
index 6f5541e..d5decd1 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ModuleDependencyTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ModuleDependencyTest.java
@@ -58,8 +58,8 @@ public class ModuleDependencyTest extends TestBase {
ModuleDependency d5 = new ModuleDependency(antME, antME.getReleaseVersion(), null, true, false);
// test hash code and equals
- Set<ModuleDependency> set = new HashSet<ModuleDependency>();
- Set<ModuleDependency> sorted = new TreeSet<ModuleDependency>();
+ Set<ModuleDependency> set = new HashSet<>();
+ Set<ModuleDependency> sorted = new TreeSet<>();
set.add(d1);
sorted.add(d1);
assertFalse("already there", set.add(sameAsD1));
@@ -93,7 +93,6 @@ public class ModuleDependencyTest extends TestBase {
new ModuleDependency(ml.getEntry("org.openide.loaders")),
new ModuleDependency(ml.getEntry("org.apache.tools.ant.module")),
new ModuleDependency(ml.getEntry("org.openide.io")),
- new ModuleDependency(ml.getEntry("org.jdesktop.layout")),
new ModuleDependency(ml.getEntry("org.openide.filesystems")),
new ModuleDependency(ml.getEntry("org.openide.execution")),
};
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProjectTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProjectTest.java
index 4d22385..d0e6e3e 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProjectTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProjectTest.java
@@ -26,7 +26,6 @@ import java.util.logging.LogManager;
import org.netbeans.api.java.project.JavaProjectConstants;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
-import org.netbeans.api.project.SourceGroup;
import org.netbeans.api.project.SourceGroupModifier;
import org.netbeans.junit.MemoryFilter;
import org.netbeans.modules.apisupport.project.api.Util;
@@ -59,7 +58,7 @@ public class NbModuleProjectTest extends TestBase {
super.setUp();
clearWorkDir();
TestBase.initializeBuildProperties(getWorkDir(), getDataDir());
- FileObject dir = nbRoot().getFileObject("java.project");
+ FileObject dir = nbRoot().getFileObject("java/java.project");
assertNotNull("have java.project checked out", dir);
Project p = ProjectManager.getDefault().findProject(dir);
javaProjectProject = (NbModuleProject)p;
@@ -98,7 +97,7 @@ public class NbModuleProjectTest extends TestBase {
public void testSupportsJavadoc() throws Exception {
assertTrue(javaProjectProject.supportsJavadoc());
- FileObject dir = nbRoot().getFileObject("beans");
+ FileObject dir = nbRoot().getFileObject("java/beans");
assertNotNull("have beans checked out", dir);
Project p = ProjectManager.getDefault().findProject(dir);
NbModuleProject beansProject = (NbModuleProject) p;
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProviderImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProviderImplTest.java
index dfcd0b3..ceb8f68 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProviderImplTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/NbModuleProviderImplTest.java
@@ -19,9 +19,7 @@
package org.netbeans.modules.apisupport.project;
import java.io.File;
-import java.util.Collections;
import java.util.logging.Level;
-import static org.junit.Assert.*;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.modules.apisupport.project.spi.NbModuleProvider;
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ProjectXMLManagerTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ProjectXMLManagerTest.java
index bcffb2c..88b8694 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ProjectXMLManagerTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ProjectXMLManagerTest.java
@@ -72,7 +72,7 @@ public class ProjectXMLManagerTest extends TestBase {
private final static Set<String> ASSUMED_CNBS;
static {
- Set<String> assumedCNBs = new HashSet<String>(2, 1.0f);
+ Set<String> assumedCNBs = new HashSet<>(2, 1.0f);
assumedCNBs.add(ANT_PROJECT_SUPPORT);
assumedCNBs.add(DIALOGS);
ASSUMED_CNBS = Collections.unmodifiableSet(assumedCNBs);
@@ -90,7 +90,7 @@ public class ProjectXMLManagerTest extends TestBase {
private ProjectXMLManager createXercesPXM() throws IOException {
NbModuleProject xercesPrj = (NbModuleProject) ProjectManager.getDefault().
- findProject(nbRoot().getFileObject("libs.xerces"));
+ findProject(nbRoot().getFileObject("ide/libs.xerces"));
return new ProjectXMLManager(xercesPrj);
}
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseFxTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseFxTest.java
index 65a8bef..8a842b0 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseFxTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseFxTest.java
@@ -19,7 +19,6 @@
package org.netbeans.modules.apisupport.project;
import java.io.File;
-import static junit.framework.Assert.assertNotNull;
import org.apache.tools.ant.module.api.support.ActionUtils;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseHtml4JavaTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseHtml4JavaTest.java
index 540845c..5fbc8de 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseHtml4JavaTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/UseHtml4JavaTest.java
@@ -19,7 +19,6 @@
package org.netbeans.modules.apisupport.project;
import java.io.File;
-import static junit.framework.Assert.assertNotNull;
import org.apache.tools.ant.module.api.support.ActionUtils;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AccessibilityQueryImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AccessibilityQueryImplTest.java
index 7632994..7f75acf 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AccessibilityQueryImplTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AccessibilityQueryImplTest.java
@@ -33,24 +33,24 @@ public class AccessibilityQueryImplTest extends TestBase {
}
public void testPublicPackages() throws Exception {
- assertEquals(Boolean.TRUE, AccessibilityQuery.isPubliclyAccessible(nbRoot().getFileObject("project.ant/src/org/netbeans/spi/project/support/ant")));
- assertEquals(Boolean.FALSE, AccessibilityQuery.isPubliclyAccessible(nbRoot().getFileObject("project.ant/src/org/netbeans/modules/project/ant")));
+ assertEquals(Boolean.TRUE, AccessibilityQuery.isPubliclyAccessible(nbRoot().getFileObject("ide/project.ant/src/org/netbeans/spi/project/support/ant")));
+ assertEquals(Boolean.FALSE, AccessibilityQuery.isPubliclyAccessible(nbRoot().getFileObject("ide/project.ant/src/org/netbeans/modules/project/ant")));
}
public void testFriendPackages() throws Exception {
- assertEquals(Boolean.TRUE, AccessibilityQuery.isPubliclyAccessible(nbRoot().getFileObject("ant.freeform/src/org/netbeans/modules/ant/freeform/spi")));
- assertEquals(Boolean.FALSE, AccessibilityQuery.isPubliclyAccessible(nbRoot().getFileObject("ant.freeform/src/org/netbeans/modules/ant/freeform")));
+ assertEquals(Boolean.TRUE, AccessibilityQuery.isPubliclyAccessible(nbRoot().getFileObject("java/ant.freeform/src/org/netbeans/modules/ant/freeform/spi")));
+ assertEquals(Boolean.FALSE, AccessibilityQuery.isPubliclyAccessible(nbRoot().getFileObject("java/ant.freeform/src/org/netbeans/modules/ant/freeform")));
}
// XXX testSubpackages - would need to generate a new module to test
public void testTestRoots() throws Exception {
- assertEquals(null, AccessibilityQuery.isPubliclyAccessible(nbRoot().getFileObject("project.ant/test/unit/src/org/netbeans/api/project/ant")));
- assertEquals(null, AccessibilityQuery.isPubliclyAccessible(nbRoot().getFileObject("j2ee.kit/test/qa-functional/src/org/netbeans/test/j2ee")));
+ assertEquals(null, AccessibilityQuery.isPubliclyAccessible(nbRoot().getFileObject("ide/project.ant/test/unit/src/org/netbeans/api/project/ant")));
+ assertEquals(null, AccessibilityQuery.isPubliclyAccessible(nbRoot().getFileObject("enterprise/j2ee.kit/test/qa-functional/src/org/netbeans/test/j2ee")));
}
public void testOtherSourceRoots() throws Exception {
- assertEquals(null, AccessibilityQuery.isPubliclyAccessible(nbRoot().getFileObject("o.apache.tools.ant.module/src-bridge/org/apache/tools/ant/module/bridge/impl")));
+ assertEquals(null, AccessibilityQuery.isPubliclyAccessible(nbRoot().getFileObject("extide/o.apache.tools.ant.module/src-bridge/org/apache/tools/ant/module/bridge/impl")));
}
}
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AntArtifactProviderImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AntArtifactProviderImplTest.java
index f0313d1..f024b16 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AntArtifactProviderImplTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/AntArtifactProviderImplTest.java
@@ -44,12 +44,13 @@ public class AntArtifactProviderImplTest extends TestBase {
private NbModuleProject javaProjectProject;
private NbModuleProject loadersProject;
+ @Override
protected void setUp() throws Exception {
super.setUp();
- FileObject dir = nbRoot().getFileObject("java.project");
+ FileObject dir = nbRoot().getFileObject("java/java.project");
assertNotNull("have java.project checked out", dir);
javaProjectProject = (NbModuleProject) ProjectManager.getDefault().findProject(dir);
- dir = nbRoot().getFileObject("openide.loaders");
+ dir = nbRoot().getFileObject("platform/openide.loaders");
assertNotNull("have openide.loaders checked out", dir);
loadersProject = (NbModuleProject) ProjectManager.getDefault().findProject(dir);
}
@@ -63,7 +64,7 @@ public class AntArtifactProviderImplTest extends TestBase {
assertEquals("correct location",
Collections.singletonList(URI.create("../../nbbuild/netbeans/" + TestBase.CLUSTER_PLATFORM + "/modules/org-openide-loaders.jar")),
Arrays.asList(arts[0].getArtifactLocations()));
- assertEquals("correct script", nbRoot().getFileObject("openide.loaders/build.xml"), arts[0].getScriptFile());
+ assertEquals("correct script", nbRoot().getFileObject("platform/openide.loaders/build.xml"), arts[0].getScriptFile());
assertEquals("correct build target", "netbeans", arts[0].getTargetName());
assertEquals("correct clean target", "clean", arts[0].getCleanTargetName());
assertEquals("no properties", new Properties(), arts[0].getProperties());
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImplTest.java
index d6bc5e5..8784d5b 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImplTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/ClassPathProviderImplTest.java
@@ -649,8 +649,8 @@ public class ClassPathProviderImplTest extends TestBase {
// XXX fails without NB sources
public void testRecursiveScanOptimization() throws Exception {
- FileObject src = nbRoot().getFileObject("apisupport.project/test/unit/src");
- assertNotNull("apisupport.project/test/unit/src", src);
+ FileObject src = nbRoot().getFileObject("apisupport/apisupport.project/test/unit/src");
+ assertNotNull("apisupport/apisupport.project/test/unit/src", src);
Logger logger = Logger.getLogger("org.netbeans.modules.apisupport.project.Evaluator");
MyHandler h = new MyHandler();
logger.addHandler(h);
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/GlobalJavadocForBinaryImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/GlobalJavadocForBinaryImplTest.java
index 9ff5710..3aef81b 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/GlobalJavadocForBinaryImplTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/GlobalJavadocForBinaryImplTest.java
@@ -25,7 +25,6 @@ import java.net.URL;
import java.util.Arrays;
import org.netbeans.api.java.queries.JavadocForBinaryQuery.Result;
import org.netbeans.modules.apisupport.project.TestBase;
-import org.netbeans.modules.apisupport.project.api.Util;
import org.netbeans.modules.apisupport.project.universe.NbPlatform;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.test.TestFileUtils;
@@ -41,7 +40,7 @@ public class GlobalJavadocForBinaryImplTest extends TestBase {
File nbDocZip = generateNbDocZip();
URL nbDocZipURL = FileUtil.urlForArchiveOrDir(nbDocZip);
NbPlatform.getDefaultPlatform().addJavadocRoot(nbDocZipURL);
- doTestFindJavadoc(Utilities.toURI(file("openide.loaders/src")).toURL(), nbDocZipURL);
+ doTestFindJavadoc(Utilities.toURI(file("platform/openide.loaders/src")).toURL(), nbDocZipURL);
doTestFindJavadoc(FileUtil.urlForArchiveOrDir(file("nbbuild/netbeans/platform/modules/org-openide-loaders.jar")), nbDocZipURL);
}
private void doTestFindJavadoc(URL binRoot, URL nbDocZipURL) throws Exception {
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/JavadocForBinaryImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/JavadocForBinaryImplTest.java
index 20f55ee..055336b 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/JavadocForBinaryImplTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/JavadocForBinaryImplTest.java
@@ -53,7 +53,7 @@ public class JavadocForBinaryImplTest extends TestBase {
public void testJavadocForNetBeansOrgModules() throws Exception {
// Have to load at least one module to get the scan going.
- ClassPath.getClassPath(nbRoot().getFileObject("classfile/src"), ClassPath.COMPILE);
+ ClassPath.getClassPath(nbRoot().getFileObject("java/classfile/src"), ClassPath.COMPILE);
File classfileJar = file("nbbuild/netbeans/" + TestBase.CLUSTER_JAVA + "/modules/org-netbeans-modules-classfile.jar");
URL[] roots = JavadocForBinaryQuery.findJavadoc(FileUtil.urlForArchiveOrDir(classfileJar)).getRoots();
URL[] expectedRoots = {
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImplTest.java
index 43cd6b9..1707418 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImplTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceForBinaryImplTest.java
@@ -50,10 +50,10 @@ public class SourceForBinaryImplTest extends TestBase {
}
public void testFindSourceRootForCompiledClasses() throws Exception {
- doTestFindSourceRootForCompiledClasses("java.project/src", "java.project/build/classes");
- doTestFindSourceRootForCompiledClasses("java.project/test/unit/src", "java.project/build/test/unit/classes");
- doTestFindSourceRootForCompiledClasses("ant.freeform/src", "ant.freeform/build/classes");
- doTestFindSourceRootForCompiledClasses("ant.freeform/test/unit/src", "ant.freeform/build/test/unit/classes");
+ doTestFindSourceRootForCompiledClasses("java/java.project/src", "java/java.project/build/classes");
+ doTestFindSourceRootForCompiledClasses("java/java.project/test/unit/src", "java/java.project/build/test/unit/classes");
+ doTestFindSourceRootForCompiledClasses("java/ant.freeform/src", "java/ant.freeform/build/classes");
+ doTestFindSourceRootForCompiledClasses("java/ant.freeform/test/unit/src", "java/ant.freeform/build/test/unit/classes");
}
/* XXX fails because o.n.m.a.p.queries.UpdateTrackingFileOwnerQuery does not scan extra-compilation-units
@@ -66,13 +66,13 @@ public class SourceForBinaryImplTest extends TestBase {
*/
public void testFindSourceRootForModuleJar() throws Exception {
- check("java.project/src", TestBase.CLUSTER_JAVA + "/modules/org-netbeans-modules-java-project.jar");
- check("openide.loaders/src", TestBase.CLUSTER_PLATFORM + "/modules/org-openide-loaders.jar");
- check("o.n.bootstrap/src", TestBase.CLUSTER_PLATFORM + "/lib/boot.jar");
- check("diff/src", TestBase.CLUSTER_IDE + "/modules/org-netbeans-modules-diff.jar");
- check("editor.lib/src", TestBase.CLUSTER_IDE + "/modules/org-netbeans-modules-editor-lib.jar");
- check("nbjunit/src", "harness/modules/org-netbeans-modules-nbjunit.jar");
- check("apisupport.project/test/unit/src",file("nbbuild/build/testdist/unit/" + TestBase.CLUSTER_APISUPPORT + "/org-netbeans-modules-apisupport-project/tests.jar"));
+ check("java/java.project/src", TestBase.CLUSTER_JAVA + "/modules/org-netbeans-modules-java-project.jar");
+ check("platform/openide.loaders/src", TestBase.CLUSTER_PLATFORM + "/modules/org-openide-loaders.jar");
+ check("platform/o.n.bootstrap/src", TestBase.CLUSTER_PLATFORM + "/lib/boot.jar");
+ check("ide/diff/src", TestBase.CLUSTER_IDE + "/modules/org-netbeans-modules-diff.jar");
+ check("ide/editor.lib/src", TestBase.CLUSTER_IDE + "/modules/org-netbeans-modules-editor-lib.jar");
+ check("harness/nbjunit/src", "harness/modules/org-netbeans-modules-nbjunit.jar");
+ check("apisupport/apisupport.project/test/unit/src",file("nbbuild/build/testdist/unit/" + TestBase.CLUSTER_APISUPPORT + "/org-netbeans-modules-apisupport-project/tests.jar"));
}
public void testExternalModules() throws Exception {
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImplTest.java
index 1c8ccf4..dfffbcc 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImplTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SourceLevelQueryImplTest.java
@@ -34,7 +34,7 @@ public class SourceLevelQueryImplTest extends TestBase {
}
public void testGetSourceLevel() {
- String path = "junit/src/org/netbeans/modules/junit/api/JUnitSettings.java";
+ String path = "java/junit/src/org/netbeans/modules/junit/api/JUnitSettings.java";
FileObject f = nbRoot().getFileObject(path);
assertNotNull("found " + path, f);
assertEquals("1.6 used for an average module", "1.6", SourceLevelQuery.getSourceLevel(f));
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SubprojectProviderImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SubprojectProviderImplTest.java
index c4428b9..8083086 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SubprojectProviderImplTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/SubprojectProviderImplTest.java
@@ -77,7 +77,7 @@ public class SubprojectProviderImplTest extends TestBase {
public void testExternalSubprojects() throws Exception {
checkSubprojects(resolveEEPPath("/suite1/action-project"), new String[] {
resolveEEPPath("/suite1/support/lib-project"),
- file("openide.dialogs").getAbsolutePath(),
+ file("platform/openide.dialogs").getAbsolutePath(),
});
checkSubprojects(resolveEEPPath("/suite1/support/lib-project"), new String[0]);
// No sources for beans available, so no subprojects reported:
@@ -99,7 +99,7 @@ public class SubprojectProviderImplTest extends TestBase {
/** @see "#81878" */
public void testInclusionOfHigherBin() throws Exception {
- checkSubprojects("servletapi", new String[0]);
+ checkSubprojects("ide/servletapi", new String[0]);
}
public void testInclusionOfUnresolvedRef() throws Exception {
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/UnitTestForSourceQueryImplTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/UnitTestForSourceQueryImplTest.java
index dccd3f7..6a916c7 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/UnitTestForSourceQueryImplTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/queries/UnitTestForSourceQueryImplTest.java
@@ -45,35 +45,35 @@ public class UnitTestForSourceQueryImplTest extends TestBase {
public void testFindUnitTest() throws Exception {
URL[] testRoots = UnitTestForSourceQuery.findUnitTests(nbRoot());
assertEquals("Test root for non project folder should be null", Collections.EMPTY_LIST, Arrays.asList(testRoots));
- FileObject srcRoot = nbRoot().getFileObject("apisupport.project");
+ FileObject srcRoot = nbRoot().getFileObject("apisupport/apisupport.project");
testRoots = UnitTestForSourceQuery.findUnitTests(srcRoot);
assertEquals("Test root for project should be null", Collections.EMPTY_LIST, Arrays.asList(testRoots));
- srcRoot = nbRoot().getFileObject("apisupport.project/test/unit/src");
+ srcRoot = nbRoot().getFileObject("apisupport/apisupport.project/test/unit/src");
testRoots = UnitTestForSourceQuery.findUnitTests(srcRoot);
assertEquals("Test root for tests should be null", Collections.EMPTY_LIST, Arrays.asList(testRoots));
- srcRoot = nbRoot().getFileObject("apisupport.project/src");
+ srcRoot = nbRoot().getFileObject("apisupport/apisupport.project/src");
testRoots = UnitTestForSourceQuery.findUnitTests(srcRoot);
assertEquals("Test root defined", 1, testRoots.length);
assertTrue("Test root exists", Utilities.toFile(URI.create(testRoots[0].toExternalForm())).exists());
- assertEquals("Test root", URLMapper.findFileObject(testRoots[0]), nbRoot().getFileObject("apisupport.project/test/unit/src"));
- assertEquals("One test for this project", 1, UnitTestForSourceQuery.findUnitTests(nbRoot().getFileObject("openide.windows/src")).length);
+ assertEquals("Test root", URLMapper.findFileObject(testRoots[0]), nbRoot().getFileObject("apisupport/apisupport.project/test/unit/src"));
+ assertEquals("One test for this project", 1, UnitTestForSourceQuery.findUnitTests(nbRoot().getFileObject("platform/openide.windows/src")).length);
}
public void testFindSource() {
URL[] srcRoots = UnitTestForSourceQuery.findSources(nbRoot());
assertEquals("Source root for non project folder should be null", Collections.EMPTY_LIST, Arrays.asList(srcRoots));
- FileObject testRoot = nbRoot().getFileObject("apisupport.project");
+ FileObject testRoot = nbRoot().getFileObject("apisupport/apisupport.project");
srcRoots = UnitTestForSourceQuery.findSources(testRoot);
assertEquals("Source root for project should be null", Collections.EMPTY_LIST, Arrays.asList(srcRoots));
- testRoot = nbRoot().getFileObject("apisupport.project/src");
+ testRoot = nbRoot().getFileObject("apisupport/apisupport.project/src");
srcRoots = UnitTestForSourceQuery.findSources(testRoot);
assertEquals("Source root for sources should be null", Collections.EMPTY_LIST, Arrays.asList(srcRoots));
- assertEquals("No sources for this project's sources", Collections.EMPTY_LIST, Arrays.asList(UnitTestForSourceQuery.findSources(nbRoot().getFileObject("openide.windows/src"))));
- testRoot = nbRoot().getFileObject("apisupport.project/test/unit/src");
+ assertEquals("No sources for this project's sources", Collections.EMPTY_LIST, Arrays.asList(UnitTestForSourceQuery.findSources(nbRoot().getFileObject("platform/openide.windows/src"))));
+ testRoot = nbRoot().getFileObject("apisupport/apisupport.project/test/unit/src");
srcRoots = UnitTestForSourceQuery.findSources(testRoot);
assertEquals("Source root defined", 1, srcRoots.length);
assertTrue("Source root exists", Utilities.toFile(URI.create(srcRoots[0].toExternalForm())).exists());
- assertEquals("Source root", URLMapper.findFileObject(srcRoots[0]), nbRoot().getFileObject("apisupport.project/src"));
+ assertEquals("Source root", URLMapper.findFileObject(srcRoots[0]), nbRoot().getFileObject("apisupport/apisupport.project/src"));
}
public void testCorrectURLForNonexistentFolder143633() throws IOException {
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/spi/BrandingSupportTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/spi/BrandingSupportTest.java
index 9f9cee0..2ee47f4 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/spi/BrandingSupportTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/spi/BrandingSupportTest.java
@@ -50,6 +50,7 @@ public class BrandingSupportTest extends TestBase {
super(testName);
}
+ @Override
protected void setUp() throws Exception {
super.setUp();
File suiteDir = new File(getWorkDir(), "testSuite");
@@ -85,7 +86,7 @@ public class BrandingSupportTest extends TestBase {
public void testBranding4() throws IOException {
assertFalse(instance.getBrandingRoot().exists());
implOfBundleKeyTest("org.netbeans.core.windows",
- "org/netbeans/core/windows/view/ui/Bundle.properties", Collections.singleton("CTL_MainWindow_Title"), "NetBeans Platform {0}", instance.getBrandedBundleKeys());
+ "org/netbeans/core/windows/view/ui/Bundle.properties", Collections.singleton("CTL_MainWindow_Title"), "Apache NetBeans Platform {0}", instance.getBrandedBundleKeys());
}
public void testBrandingFile() throws IOException {
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildZipDistributionTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildZipDistributionTest.java
index 1e88f03..db0309f 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildZipDistributionTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/suite/BuildZipDistributionTest.java
@@ -90,7 +90,6 @@ public class BuildZipDistributionTest extends TestBase {
suite.open();
proj.open();
- LOG.info("Workdir " + getWorkDirPath());
}
public void testBuildTheZipAppWhenAppNamePropIsNotSet() throws Exception {
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleActionsTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleActionsTest.java
index f3f7f20..7d42fe7 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleActionsTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/ModuleActionsTest.java
@@ -45,11 +45,11 @@ public class ModuleActionsTest extends TestBase {
public void testDebugFix() throws Exception {
// Track down #47012.
- Project freeform = ProjectManager.getDefault().findProject(FileUtil.toFileObject(file("ant.freeform")));
+ Project freeform = ProjectManager.getDefault().findProject(FileUtil.toFileObject(file("java/ant.freeform")));
assertNotNull("have project in ant/freeform", freeform);
ActionProvider ap = freeform.getLookup().lookup(ActionProvider.class);
assertNotNull("have ActionProvider", ap);
- FileObject actionsJava = FileUtil.toFileObject(file("ant.freeform/src/org/netbeans/modules/ant/freeform/Actions.java"));
+ FileObject actionsJava = FileUtil.toFileObject(file("java/ant.freeform/src/org/netbeans/modules/ant/freeform/Actions.java"));
assertNotNull("have Actions.java", actionsJava);
assertTrue("Fix enabled on it", ap.isActionEnabled(JavaProjectConstants.COMMAND_DEBUG_FIX, Lookups.singleton(DataObject.find(actionsJava))));
}
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanelTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanelTest.java
index ee11f6a..e99454a 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanelTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/ui/wizard/LibraryStartVisualPanelTest.java
@@ -37,7 +37,7 @@ public class LibraryStartVisualPanelTest extends NbTestCase {
}
public void testPopulateProjectData() throws Exception {
- Map<String, String> contents = new HashMap<String, String>();
+ Map<String, String> contents = new HashMap<>();
contents.put("org/apache/commons/logging/Log.class", "");
contents.put("1.0-beta/X.class", ""); // #72669
contents.put("org/apache/commons/logging/impl/NoOpLog.class", "");
diff --git a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ModuleListTest.java b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ModuleListTest.java
index 8cfae09..d31ca6f 100644
--- a/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ModuleListTest.java
+++ b/apisupport/apisupport.ant/test/unit/src/org/netbeans/modules/apisupport/project/universe/ModuleListTest.java
@@ -61,6 +61,7 @@ public class ModuleListTest extends TestBase {
private File suite1, suite2, standaloneSuite3;
+ @Override
protected void setUp() throws Exception {
super.setUp();
suite1 = resolveEEPFile("suite1");
@@ -307,7 +308,7 @@ public class ModuleListTest extends TestBase {
assertEquals("right codeNameBase", "org.netbeans.examples.modules.action", e.getCodeNameBase());
e = ml.getEntry("org.netbeans.modules.classfile");
assertNotNull("can find nb.org sources too (classfile module must be built)", e);
- assertEquals("correct nb.org source location", file("classfile"), e.getSourceLocation());
+ assertEquals("correct nb.org source location", file("java/classfile"), e.getSourceLocation());
assertNotNull("localized name", e.getLocalizedName());
assertNotNull("display category", e.getCategory());
assertNotNull("short description", e.getShortDescription());
@@ -345,7 +346,7 @@ public class ModuleListTest extends TestBase {
assertEquals("number of public packages for " + e, new Integer(1), new Integer(e.getPublicPackages().length));
e = ml.getEntry("org.netbeans.libs.xerces");
assertNotNull("can find nb.org binary module too", e);
- assertEquals("have sources for that", file("libs.xerces"), e.getSourceLocation());
+ assertEquals("have sources for that", file("ide/libs.xerces"), e.getSourceLocation());
assertEquals("and correct JAR location", file("nbbuild/netbeans/" + TestBase.CLUSTER_IDE + "/modules/org-netbeans-libs-xerces.jar"), e.getJarLocation());
assertEquals("and correct CP exts (using Class-Path only)",
":" + file("nbbuild/netbeans/" + TestBase.CLUSTER_IDE + "/modules/ext/xerces-2.8.0.jar"),
@@ -375,8 +376,8 @@ public class ModuleListTest extends TestBase {
}
public void testFindNetBeansOrg() throws Exception {
- assertEquals(nbRootFile(), ModuleList.findNetBeansOrg(file("xml.tax")));
- assertEquals(null, ModuleList.findNetBeansOrg(file("xml.tax/lib")));
+ assertEquals(nbRootFile(), ModuleList.findNetBeansOrg(file("ide/xml.tax")));
+ assertEquals(null, ModuleList.findNetBeansOrg(file("ide/xml.tax/lib")));
assertEquals(null, ModuleList.findNetBeansOrg(File.listRoots()[0]));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists