[netbeans] branch master updated: move webcommon job to JDK 11 and fix tests where needed.

[mb...@apache.org]

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 fc37451a62 move webcommon job to JDK 11 and fix tests where needed.
     new f2fc68012a Merge pull request #5143 from mbien/webcommon-modules-to-11
fc37451a62 is described below

commit fc37451a625a3665c13641456302e1e93c1ad00e
Author: Michael Bien <mb...@gmail.com>
AuthorDate: Sat Dec 24 00:09:22 2022 +0100

    move webcommon job to JDK 11 and fix tests where needed.
    
    JsDocCodeCompletionTest can't use getTestFile() in overwritten method
    since the method fails the test if the file does not exist. The
    Test file logic in CslTestBase::assertDescriptionMatches has to be able
    to call exists() on a potentially not existing file when it is trying
    to find JDK version specific (golden) test files.
---
 .github/workflows/main.yml                                             | 2 +-
 .../netbeans/modules/javascript2/jsdoc/JsDocCodeCompletionTest.java    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 89d22ad7f7..c0fab78086 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1591,7 +1591,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        java: [ '8' ]
+        java: [ '11' ]
     steps:
 
       - name: Set up JDK ${{ matrix.java }}
diff --git a/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocCodeCompletionTest.java b/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocCodeCompletionTest.java
index 747b02dc02..9f10c9270b 100644
--- a/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocCodeCompletionTest.java
+++ b/webcommon/javascript2.jsdoc/test/unit/src/org/netbeans/modules/javascript2/jsdoc/JsDocCodeCompletionTest.java
@@ -22,7 +22,6 @@ import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import org.netbeans.modules.javascript2.editor.*;
-import org.openide.filesystems.FileUtil;
 
 /**
  *
@@ -49,7 +48,7 @@ public class JsDocCodeCompletionTest extends JsCodeCompletionBase {
         // this breaks our assumption, that we can prepare the JS on-the-fly in the
         // build directory. This redirects the resolution of the reference files
         // to the build directory (they are also copied on test begin)
-        return FileUtil.toFile(getTestFile(relFilePath));
+        return new File(getDataDir(), relFilePath);
     }
 
     public void testAllCompletion() throws Exception {


---------------------------------------------------------------------
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