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/08/16 08:21:30 UTC
[GitHub] geertjanw closed pull request #690: [NETBEANS-1074] Review of the
ergonomics cluster
geertjanw closed pull request #690: [NETBEANS-1074] Review of the ergonomics cluster
URL: https://github.com/apache/incubator-netbeans/pull/690
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/.travis.yml b/.travis.yml
index 746c4ca482..5b6a0e675c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,4 +22,5 @@ script:
- ant -quiet build -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false
- ant -quiet test -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dtest.includes=NoTestsJustBuild
- ant -quiet verify-libs-and-licenses -Dverify-libs-and-licenses.haltonfailure=true
+ - ant -quiet -f ide.ergonomics/ test -Dtest.config=commit
- ./travis-check-line-endings.sh
diff --git a/ide.ergonomics/nbproject/project.properties b/ide.ergonomics/nbproject/project.properties
index 19e7179eb8..52f5fbdd38 100644
--- a/ide.ergonomics/nbproject/project.properties
+++ b/ide.ergonomics/nbproject/project.properties
@@ -23,6 +23,9 @@ release.dir=${basedir}/build/release
src-ant.build=build/classes/
src-ant.cp=${ant.core.lib}
+requires.nb.javac=true
+requires.nb.javac.impl=true
+
test.config.commit.includes=\
org/netbeans/modules/ide/ergonomics/DynamicVerifyTest.class,\
org/netbeans/modules/ide/ergonomics/CachingPreventsLoadingOfModuleManifestsTest.class
diff --git a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/ProjectConvertorCheck.java b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/ProjectConvertorCheck.java
index ec6df3108d..5f6c12b3ca 100644
--- a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/ProjectConvertorCheck.java
+++ b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/ProjectConvertorCheck.java
@@ -34,6 +34,10 @@ public ProjectConvertorCheck(String name) {
public void testGetConvertors() throws Exception {
FileObject fo = FileUtil.getConfigFile("Services/ProjectConvertors");
+ if (fo == null) {
+ // basic IDE may not provide any convertors
+ return;
+ }
assertNotNull("Convertor folder found found", fo);
assertTrue("Convertor folder is not empty found", fo.getChildren().length > 0);
StringBuilder sb = new StringBuilder();
diff --git a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/DisableJ2EEKeepsMobilityEnabledTest.java b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/DisableJ2EEKeepsMobilityEnabledTest.java
index e5e9529e10..f512d4ab81 100644
--- a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/DisableJ2EEKeepsMobilityEnabledTest.java
+++ b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/DisableJ2EEKeepsMobilityEnabledTest.java
@@ -71,8 +71,9 @@ protected void setUp() throws Exception {
mobility = f;
}
}
- assertNotNull("j2ee feature found", j2ee);
- assertNotNull("mobility feature found", mobility);
+ if (j2ee == null || mobility == null) {
+ return;
+ }
assertFalse("j2ee disabled", j2ee.isEnabled());
assertFalse("mobility disabled", mobility.isEnabled());
@@ -103,6 +104,9 @@ protected void setUp() throws Exception {
}
public void testEnablingJ2EEEnablesJavaViaAutoUpdateManager() throws Exception {
+ if (j2ee == null || mobility == null) {
+ return;
+ }
OperationContainer<OperationSupport> cc = OperationContainer.createForDisable();
OperationInfo<OperationSupport> info;
info = cc.add(j2eeUE);
diff --git a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/EnableJ2EEEnablesJavaTest.java b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/EnableJ2EEEnablesJavaTest.java
index 6999de92b9..ce823c824b 100644
--- a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/EnableJ2EEEnablesJavaTest.java
+++ b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/EnableJ2EEEnablesJavaTest.java
@@ -72,7 +72,9 @@ public void testEnablingJ2EEEnablesJavaViaAutoUpdateManager() throws Exception {
java = f;
}
}
- assertNotNull("j2ee feature found", j2ee);
+ if (j2ee == null) {
+ return;
+ }
assertNotNull("java feature found", java);
List<UpdateUnit> units = UpdateManager.getDefault().getUpdateUnits(UpdateManager.TYPE.FEATURE);
diff --git a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FeatureInfoTest.xml b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FeatureInfoTest.xml
index 7bd5f262f4..2102da7b2e 100644
--- a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FeatureInfoTest.xml
+++ b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FeatureInfoTest.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
<filesystem>
<folder name="Loaders">
diff --git a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FoDURLStreamHandlerFactoryTest.html b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FoDURLStreamHandlerFactoryTest.html
index 335eec5ad5..93cf58d24a 100644
--- a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FoDURLStreamHandlerFactoryTest.html
+++ b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FoDURLStreamHandlerFactoryTest.html
@@ -1 +1,21 @@
+<!--
+
+ 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.
+
+-->
<body>
diff --git a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FoDURLStreamHandlerFactoryTest.java b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FoDURLStreamHandlerFactoryTest.java
index 66a32aff65..582fda6ee9 100644
--- a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FoDURLStreamHandlerFactoryTest.java
+++ b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FoDURLStreamHandlerFactoryTest.java
@@ -46,7 +46,7 @@ public void testWorksOnHTML() throws Exception {
InputStream is = u.openStream();
assertNotNull("Stream found", is);
- byte[] arr = new byte[100];
+ byte[] arr = new byte[1024];
int len = is.read(arr);
String s = new String(arr, 0, len, "UTF-8");
assertTrue("contains body: " + s, s.contains("<body>"));
@@ -58,7 +58,7 @@ public void testWorksOnlyOnHTML() throws Exception {
InputStream is = u.openStream();
assertNotNull("Stream found", is);
- byte[] arr = new byte[100];
+ byte[] arr = new byte[1024];
int len = is.read(arr);
String s = new String(arr, 0, len, "UTF-8");
assertTrue("contains body: " + s, s.contains("<body>"));
diff --git a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FoDURLStreamHandlerFactoryTest.nonhtml b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FoDURLStreamHandlerFactoryTest.nonhtml
index 335eec5ad5..93cf58d24a 100644
--- a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FoDURLStreamHandlerFactoryTest.nonhtml
+++ b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FoDURLStreamHandlerFactoryTest.nonhtml
@@ -1 +1,21 @@
+<!--
+
+ 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.
+
+-->
<body>
diff --git a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/test-layer.xml b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/test-layer.xml
index c16a8a0fed..f3fa3555ab 100644
--- a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/test-layer.xml
+++ b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/test-layer.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
<filesystem>
</filesystem>
diff --git a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/newproject/smpl.xml b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/newproject/smpl.xml
index ef878342d0..d34f696ef4 100644
--- a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/newproject/smpl.xml
+++ b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/newproject/smpl.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
<filesystem>
<file name="smpl.tmp"/>
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 4cc5f7d80c..e1e6313cd8 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -26,10 +26,13 @@ clusters.config.platform.list=\
clusters.config.basic.list=\
${clusters.config.java.list},\
- nb.cluster.apisupport
+ nb.cluster.apisupport,\
+ nb.cluster.ergonomics
+# ergonomics must be last
clusters.config.standard.list=\
- ${clusters.config.basic.list},\
+ ${clusters.config.java.list},\
+ nb.cluster.apisupport,\
nb.cluster.webcommon,\
nb.cluster.enterprise
----------------------------------------------------------------
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