This is an automated email from the ASF dual-hosted git repository.
mbien 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 5bfb054eeb Repair openjdk.project tests and add them to CI
new ae873e04cf Merge pull request #6194 from
mbien/fix-openjdk-project-tests
5bfb054eeb is described below
commit 5bfb054eeb85fdb58cbbe46c797afff2821bc159
Author: Michael Bien <[email protected]>
AuthorDate: Thu Jul 13 22:03:52 2023 +0200
Repair openjdk.project tests and add them to CI
j2seplatform dependency fixes
"java.net.MalformedURLException: unknown protocol: nbjrt"
ClassPathProviderImplTest#checkCompileClassPath has to open the
project now before asking for the class path.
tested on JDK 11 and 21
Co-authored-by: Matthias Bläsing <[email protected]>
---
.github/workflows/main.yml | 4 ++--
java/java.openjdk.project/nbproject/project.properties | 6 ++++++
java/java.openjdk.project/nbproject/project.xml | 9 +++++++++
.../java/openjdk/project/ClassPathProviderImplTest.java | 13 ++++++++++---
4 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 92082eb7e2..6985a82ba0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1311,8 +1311,8 @@ jobs:
- name: java.navigation
run: ant $OPTS -f java/java.navigation test
-# - name: java.openjdk.project
-# run: ant $OPTS -f java/java.openjdk.project test
+ - name: java.openjdk.project
+ run: ant $OPTS -f java/java.openjdk.project test
- name: java.platform
run: ant $OPTS -f java/java.platform test
diff --git a/java/java.openjdk.project/nbproject/project.properties
b/java/java.openjdk.project/nbproject/project.properties
index 23582afbad..9e592633d4 100644
--- a/java/java.openjdk.project/nbproject/project.properties
+++ b/java/java.openjdk.project/nbproject/project.properties
@@ -22,3 +22,9 @@ cp.extra=${tools.jar}
requires.nb.javac=true
extra.module.files=\
modules/ext/fakeJdkClasses.zip
+
+# high CI failure rate; throws exceptions even when passing
+test.config.default.excludes=**/ModulesHintTest.class
+
+# remove default compiler JMS flags to fix "WARNING: Unknown module:
jdk.compiler specified to --add-opens" warnings
+jms-compiler.flags.jvm=
diff --git a/java/java.openjdk.project/nbproject/project.xml
b/java/java.openjdk.project/nbproject/project.xml
index dcbf9178d0..52f92e18ab 100644
--- a/java/java.openjdk.project/nbproject/project.xml
+++ b/java/java.openjdk.project/nbproject/project.xml
@@ -127,6 +127,15 @@
<specification-version>1.49</specification-version>
</run-dependency>
</dependency>
+ <dependency>
+
<code-name-base>org.netbeans.modules.java.j2seplatform</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.64</specification-version>
+ </run-dependency>
+ </dependency>
<dependency>
<code-name-base>org.netbeans.modules.java.lexer</code-name-base>
<build-prerequisite/>
diff --git
a/java/java.openjdk.project/test/unit/src/org/netbeans/modules/java/openjdk/project/ClassPathProviderImplTest.java
b/java/java.openjdk.project/test/unit/src/org/netbeans/modules/java/openjdk/project/ClassPathProviderImplTest.java
index 8e9e872e3b..88d4fb0e6f 100644
---
a/java/java.openjdk.project/test/unit/src/org/netbeans/modules/java/openjdk/project/ClassPathProviderImplTest.java
+++
b/java/java.openjdk.project/test/unit/src/org/netbeans/modules/java/openjdk/project/ClassPathProviderImplTest.java
@@ -97,12 +97,19 @@ public class ClassPathProviderImplTest extends NbTestCase {
FileObject src = BuildUtils.getFileObject(prj, "share/classes");
Project project = FileOwnerQuery.getOwner(src);
+ ((JDKProject) project).moduleRepository.projectOpened(project);
- assertNotNull(project);
+ try {
+ assertNotNull(project);
- String actual = ClassPath.getClassPath(src,
ClassPath.COMPILE).toString(PathConversionMode.PRINT).replace(getWorkDirPath(),
"${wd}");
+ String actual = ClassPath.getClassPath(src, ClassPath.COMPILE).
+ toString(PathConversionMode.PRINT).
+ replace(getWorkDirPath(), "${wd}");
- assertEquals(expected, actual);
+ assertEquals(expected, actual);
+ } finally {
+ ((JDKProject) project).moduleRepository.projectClosed(project);
+ }
}
private void setupModuleXMLJDK(FileObject jdkRoot) throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
