You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/03/06 05:56:32 UTC
[GitHub] jlahoda closed pull request #439: [JDK18_3] nb-javac-x jars change and test case issue fixes
jlahoda closed pull request #439: [JDK18_3] nb-javac-x jars change and test case issue fixes
URL: https://github.com/apache/incubator-netbeans/pull/439
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/java.source.base/test/unit/src/org/netbeans/modules/java/source/PostFlowAnalysisTest.java b/java.source.base/test/unit/src/org/netbeans/modules/java/source/PostFlowAnalysisTest.java
index 23bcde9c0..104118c5b 100644
--- a/java.source.base/test/unit/src/org/netbeans/modules/java/source/PostFlowAnalysisTest.java
+++ b/java.source.base/test/unit/src/org/netbeans/modules/java/source/PostFlowAnalysisTest.java
@@ -59,7 +59,7 @@ public void test225887sl18() throws Exception {
public void test225887sl17() throws Exception {
performErrorsCorrectTest("package test; public class Test implements I { public void test() { I.super.test(); } } interface I { public default void test() { } }",
"1.7",
- "109:compiler.err.default.methods.not.supported.in.source");
+ "109:compiler.err.feature.not.supported.in.source.plural");
}
private void performErrorsCorrectTest(String code, String sourceLevel, String... errors) throws Exception {
diff --git a/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/JavacParserTest.java b/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/JavacParserTest.java
index 0a3fd93f4..b2acdc890 100644
--- a/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/JavacParserTest.java
+++ b/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/JavacParserTest.java
@@ -60,6 +60,7 @@
import org.openide.loaders.DataObject;
import org.openide.util.Lookup;
import org.openide.util.lookup.Lookups;
+import org.netbeans.modules.java.source.base.SourceLevelUtils;
/**
*
@@ -326,12 +327,12 @@ public void testIfObjectPresentOnBootDontUseCPToGuessSourceLevel() throws Except
public void testIfMissingObjectOnBootCPUseCPToGuessSourceLevelWithStringBuilder() throws Exception {
Source ret = guessSourceLevel(false, true, false);
- assertEquals("Keeps 1.7, as Object and StringBuilder on bootCP, but no AutoCloseable", Source.JDK1_7, ret);
+ assertEquals("Keeps 1.7, as Object and StringBuilder on bootCP, but no AutoCloseable", SourceLevelUtils.JDK1_7, ret);
}
public void testIfMissingObjectOnBootCPUseCPToGuessSourceLevelWithStringBuilderAndAutoCloseable() throws Exception {
Source ret = guessSourceLevel(false, true, true);
- assertEquals("Kept to 1.7", Source.JDK1_7, ret);
+ assertEquals("Kept to 1.7", SourceLevelUtils.JDK1_7, ret);
}
private Source guessSourceLevel(boolean objectOnBCP, boolean sbOnCP, boolean acOnCP) throws Exception {
diff --git a/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/MRJARCachingFileManagerTest.java b/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/MRJARCachingFileManagerTest.java
index b07e9130f..ba05fb4fc 100644
--- a/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/MRJARCachingFileManagerTest.java
+++ b/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/MRJARCachingFileManagerTest.java
@@ -50,6 +50,7 @@
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.openide.filesystems.FileUtil;
import org.openide.util.Pair;
+import org.netbeans.modules.java.source.base.SourceLevelUtils;
/**
*
@@ -80,7 +81,7 @@ public void testList() {
CachingFileManager fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
bCp,
- Source.JDK1_8,
+ SourceLevelUtils.JDK1_8,
false,
true);
Iterable<JavaFileObject> res = fm.list(StandardLocation.CLASS_PATH, "org.me", EnumSet.of(JavaFileObject.Kind.CLASS), false); //NOI18N
@@ -90,7 +91,7 @@ public void testList() {
fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
mvCp,
- Source.JDK1_8,
+ SourceLevelUtils.JDK1_8,
false,
true);
res = fm.list(StandardLocation.CLASS_PATH, "org.me", EnumSet.of(JavaFileObject.Kind.CLASS), false); //NOI18N
@@ -100,7 +101,7 @@ public void testList() {
fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
bCp,
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
false,
true);
res = fm.list(StandardLocation.CLASS_PATH, "org.me", EnumSet.of(JavaFileObject.Kind.CLASS), false); //NOI18N
@@ -110,7 +111,7 @@ public void testList() {
fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
mvCp,
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
false,
true);
res = fm.list(StandardLocation.CLASS_PATH, "org.me", EnumSet.of(JavaFileObject.Kind.CLASS), false); //NOI18N
@@ -123,7 +124,7 @@ public void testListRecursive() {
CachingFileManager fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
bCp,
- Source.JDK1_8,
+ SourceLevelUtils.JDK1_8,
false,
true);
Iterable<JavaFileObject> res = fm.list(StandardLocation.CLASS_PATH, "", EnumSet.of(JavaFileObject.Kind.CLASS), true); //NOI18N
@@ -133,7 +134,7 @@ public void testListRecursive() {
fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
mvCp,
- Source.JDK1_8,
+ SourceLevelUtils.JDK1_8,
false,
true);
res = fm.list(StandardLocation.CLASS_PATH, "", EnumSet.of(JavaFileObject.Kind.CLASS), true); //NOI18N
@@ -143,7 +144,7 @@ public void testListRecursive() {
fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
bCp,
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
false,
true);
res = fm.list(StandardLocation.CLASS_PATH, "", EnumSet.of(JavaFileObject.Kind.CLASS), true); //NOI18N
@@ -153,7 +154,7 @@ public void testListRecursive() {
fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
mvCp,
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
false,
true);
res = fm.list(StandardLocation.CLASS_PATH, "", EnumSet.of(JavaFileObject.Kind.CLASS), true); //NOI18N
@@ -183,7 +184,7 @@ public void testGetFileForInput() {
CachingFileManager fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
bCp,
- Source.JDK1_8,
+ SourceLevelUtils.JDK1_8,
false,
true);
JavaFileObject res = (JavaFileObject) fm.getFileForInput(StandardLocation.CLASS_PATH, "org.me", "A.class");
@@ -193,7 +194,7 @@ public void testGetFileForInput() {
fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
mvCp,
- Source.JDK1_8,
+ SourceLevelUtils.JDK1_8,
false,
true);
res = (JavaFileObject) fm.getFileForInput(StandardLocation.CLASS_PATH, "org.me", "A.class");
@@ -203,7 +204,7 @@ public void testGetFileForInput() {
fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
bCp,
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
false,
true);
res = (JavaFileObject) fm.getFileForInput(StandardLocation.CLASS_PATH, "org.me", "A.class");
@@ -213,7 +214,7 @@ public void testGetFileForInput() {
fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
mvCp,
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
false,
true);
res = (JavaFileObject) fm.getFileForInput(StandardLocation.CLASS_PATH, "org.me", "A.class");
@@ -226,7 +227,7 @@ public void testGetJavaFileForInput() {
CachingFileManager fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
bCp,
- Source.JDK1_8,
+ SourceLevelUtils.JDK1_8,
false,
true);
JavaFileObject res = fm.getJavaFileForInput(StandardLocation.CLASS_PATH, "org.me.A", JavaFileObject.Kind.CLASS);
@@ -236,7 +237,7 @@ public void testGetJavaFileForInput() {
fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
mvCp,
- Source.JDK1_8,
+ SourceLevelUtils.JDK1_8,
false,
true);
res = fm.getJavaFileForInput(StandardLocation.CLASS_PATH, "org.me.A", JavaFileObject.Kind.CLASS);
@@ -246,7 +247,7 @@ public void testGetJavaFileForInput() {
fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
bCp,
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
false,
true);
res = fm.getJavaFileForInput(StandardLocation.CLASS_PATH, "org.me.A", JavaFileObject.Kind.CLASS);
@@ -256,7 +257,7 @@ public void testGetJavaFileForInput() {
fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
mvCp,
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
false,
true);
res = fm.getJavaFileForInput(StandardLocation.CLASS_PATH, "org.me.A", JavaFileObject.Kind.CLASS);
@@ -270,7 +271,7 @@ public void testGetFileForOutput() throws IOException {
CachingArchiveProvider.getDefault(),
bCp,
null,
- Source.JDK1_8,
+ SourceLevelUtils.JDK1_8,
false,
true);
JavaFileObject res = (JavaFileObject) fm.getFileForOutput(StandardLocation.CLASS_PATH, "org.me", "A.class", null);
@@ -281,7 +282,7 @@ public void testGetFileForOutput() throws IOException {
CachingArchiveProvider.getDefault(),
mvCp,
null,
- Source.JDK1_8,
+ SourceLevelUtils.JDK1_8,
false,
true);
res = (JavaFileObject) fm.getFileForOutput(StandardLocation.CLASS_PATH, "org.me", "A.class", null);
@@ -292,7 +293,7 @@ public void testGetFileForOutput() throws IOException {
CachingArchiveProvider.getDefault(),
bCp,
null,
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
false,
true);
res = (JavaFileObject) fm.getFileForOutput(StandardLocation.CLASS_PATH, "org.me", "A.class", null);
@@ -303,7 +304,7 @@ public void testGetFileForOutput() throws IOException {
CachingArchiveProvider.getDefault(),
mvCp,
null,
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
false,
true);
res = (JavaFileObject) fm.getFileForOutput(StandardLocation.CLASS_PATH, "org.me", "A.class", null);
@@ -326,7 +327,7 @@ public void testHidesForeignPackage() throws IOException {
CachingFileManager fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
cp,
- Source.JDK1_8,
+ SourceLevelUtils.JDK1_8,
false,
true);
Iterable<JavaFileObject> res = fm.list(
@@ -339,7 +340,7 @@ public void testHidesForeignPackage() throws IOException {
fm = new CachingFileManager(
CachingArchiveProvider.getDefault(),
cp,
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
false,
true);
res = fm.list(
diff --git a/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/MRJARModuleFileManagerTest.java b/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/MRJARModuleFileManagerTest.java
index e4e0c0f11..0940d2120 100644
--- a/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/MRJARModuleFileManagerTest.java
+++ b/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/MRJARModuleFileManagerTest.java
@@ -49,6 +49,7 @@
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.junit.NbTestCase;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
+import org.netbeans.modules.java.source.base.SourceLevelUtils;
import org.openide.filesystems.FileUtil;
import org.openide.util.Pair;
@@ -82,7 +83,7 @@ public void testList() throws IOException {
CachingArchiveProvider.getDefault(),
bCp,
(u)->Collections.singleton(u),
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
StandardLocation.MODULE_PATH,
false);
JavaFileManager.Location l = StreamSupport.stream(fm.listLocationsForModules(StandardLocation.MODULE_PATH).spliterator(), true)
@@ -98,7 +99,7 @@ public void testList() throws IOException {
CachingArchiveProvider.getDefault(),
mvCp,
(u)->Collections.singleton(u),
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
StandardLocation.MODULE_PATH,
false);
l = StreamSupport.stream(fm.listLocationsForModules(StandardLocation.MODULE_PATH).spliterator(), true)
@@ -117,7 +118,7 @@ public void testListRecursive() throws IOException {
CachingArchiveProvider.getDefault(),
bCp,
(u)->Collections.singleton(u),
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
StandardLocation.MODULE_PATH,
false);
JavaFileManager.Location l = StreamSupport.stream(fm.listLocationsForModules(StandardLocation.MODULE_PATH).spliterator(), true)
@@ -133,7 +134,7 @@ public void testListRecursive() throws IOException {
CachingArchiveProvider.getDefault(),
mvCp,
(u)->Collections.singleton(u),
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
StandardLocation.MODULE_PATH,
false);
l = StreamSupport.stream(fm.listLocationsForModules(StandardLocation.MODULE_PATH).spliterator(), true)
@@ -152,7 +153,7 @@ public void testGetFileForInput() throws IOException {
CachingArchiveProvider.getDefault(),
bCp,
(u)->Collections.singleton(u),
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
StandardLocation.MODULE_PATH,
false);
JavaFileManager.Location l = StreamSupport.stream(fm.listLocationsForModules(StandardLocation.MODULE_PATH).spliterator(), true)
@@ -168,7 +169,7 @@ public void testGetFileForInput() throws IOException {
CachingArchiveProvider.getDefault(),
mvCp,
(u)->Collections.singleton(u),
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
StandardLocation.MODULE_PATH,
false);
l = StreamSupport.stream(fm.listLocationsForModules(StandardLocation.MODULE_PATH).spliterator(), true)
@@ -187,7 +188,7 @@ public void testGetJavaFileForInput() throws IOException {
CachingArchiveProvider.getDefault(),
bCp,
(u)->Collections.singleton(u),
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
StandardLocation.MODULE_PATH,
false);
JavaFileManager.Location l = StreamSupport.stream(fm.listLocationsForModules(StandardLocation.MODULE_PATH).spliterator(), true)
@@ -203,7 +204,7 @@ public void testGetJavaFileForInput() throws IOException {
CachingArchiveProvider.getDefault(),
mvCp,
(u)->Collections.singleton(u),
- Source.JDK1_9,
+ SourceLevelUtils.JDK1_9,
StandardLocation.MODULE_PATH,
false);
l = StreamSupport.stream(fm.listLocationsForModules(StandardLocation.MODULE_PATH).spliterator(), true)
diff --git a/libs.javacapi/external/binaries-list b/libs.javacapi/external/binaries-list
index b64ae0816..8f48fabb3 100644
--- a/libs.javacapi/external/binaries-list
+++ b/libs.javacapi/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-184D809687180CF321C724B8E8EA1C3945E8C208 nb-javac-9-api.jar
+1FD58C0401F7F012CE366CFE9E1BB9DA7AB7768F nb-javac-9-api.jar
diff --git a/libs.javacimpl/external/binaries-list b/libs.javacimpl/external/binaries-list
index dfc235cf9..0a3d59014 100644
--- a/libs.javacimpl/external/binaries-list
+++ b/libs.javacimpl/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-EA8670918AF969E28B53ABA8574A661BA36A402A nb-javac-9-impl.jar
+B0715954783E5F4909E329FA39E8BC50E161B1ED nb-javac-9-impl.jar
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists