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 44c1285a62 Feature: Added all enterprise modules with non failing unit
tests
new 726bd8a514 Merge pull request #6244 from
asbachb/enable-enterprise-tests
44c1285a62 is described below
commit 44c1285a62f16e1ffc80339acda8698849dcd68e
Author: Benjamin Asbach <asbachb....@impl.it>
AuthorDate: Sat Jul 22 02:27:01 2023 +0800
Feature: Added all enterprise modules with non failing unit tests
---
.github/workflows/main.yml | 193 ++++++++++++++++++++-
.../common/GlassfishInstanceProviderTest.java | 109 ------------
.../glassfish/common/GlassfishInstanceTest.java | 72 --------
.../glassfish/common/ServerDetailsTest.java | 24 ---
.../nodes/actions/EnableModulesActionTest.java | 21 ---
.../common/wizards/AddServerLocationPanelTest.java | 1 -
.../glassfish/common/wizards/RetrieverTest.java | 20 ---
.../netbeans/modules/glassfish/spi/UtilsTest.java | 30 +---
.../modules/j2ee/common/ClasspathUtilTest.java | 139 ---------------
.../j2ee/common/J2eeProjectCapabilitiesTest.java | 20 +--
10 files changed, 195 insertions(+), 434 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 94b5a331ef..b1c2246ffa 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1982,32 +1982,207 @@ jobs:
- name: Extract
run: tar --zstd -xf build.tar.zst
- - name: enterprise/j2ee.core
+ - name: api.web.webmodule
+ run: ant $OPTS -f enterprise/api.web.webmodule test
+
+ - name: cloud.amazon
+ run: ant $OPTS -f enterprise/cloud.amazon test
+
+ - name: cloud.oracle
+ run: ant $OPTS -f enterprise/cloud.oracle test
+
+ - name: el.lexer
+ run: ant $OPTS -f enterprise/el.lexer test
+
+ - name: glassfish.common
+ run: ant $OPTS -f enterprise/glassfish.common test
+
+# Fails
+# - name: glassfish.javaee
+# run: ant $OPTS -f enterprise/glassfish.javaee test
+
+# Fails
+# - name: glassfish.tooling
+# run: ant $OPTS -f enterprise/glassfish.tooling test
+
+ - name: j2ee.api.ejbmodule
+ run: ant $OPTS -f enterprise/j2ee.api.ejbmodule test
+
+ - name: j2ee.clientproject
+ run: ant $OPTS -f enterprise/j2ee.clientproject test
+
+ - name: j2ee.common
+ run: ant $OPTS -f enterprise/j2ee.common test
+
+ - name: j2ee.core
run: ant $OPTS -f enterprise/j2ee.core test
- - name: enterprise/javaee.wildfly
+# Fails
+# - name: j2ee.dd
+# run: ant $OPTS -f enterprise/j2ee.dd test
+
+ - name: j2ee.ddloaders
+ run: ant $OPTS -f enterprise/j2ee.ddloaders test
+
+ - name: j2ee.dd.webservice
+ run: ant $OPTS -f enterprise/j2ee.dd.webservice test
+
+# Fails + Slow
+# - name: j2ee.ejbjarproject
+# run: ant $OPTS -f enterprise/j2ee.ejbjarproject test
+
+# Fails
+# - name: j2ee.ejbverification
+# run: ant $OPTS -f enterprise/j2ee.ejbverification test
+
+# Fails
+# - name: j2eeserver
+# run: ant $OPTS -f enterprise/j2eeserver test
+
+ - name: j2ee.sun.appsrv
+ run: ant $OPTS -f enterprise/j2ee.sun.appsrv test
+
+ - name: j2ee.sun.dd
+ run: ant $OPTS -f enterprise/j2ee.sun.dd test
+
+# Fails
+# - name: j2ee.sun.ddui
+# run: ant $OPTS -f enterprise/j2ee.sun.ddui test
+
+# Fails + Slow
+# - name: jakarta.web.beans
+# run: ant $OPTS -f enterprise/jakarta.web.beans test
+
+ - name: javaee.wildfly
run: .github/retry.sh ant $OPTS -f enterprise/javaee.wildfly test
- - name: enterprise/maven.j2ee
+# Fails + Slow
+# - name: jellytools.enterprise
+# run: ant $OPTS -f enterprise/jellytools.enterprise test
+
+ - name: jsp.lexer
+ run: ant $OPTS -f enterprise/jsp.lexer test
+
+ - name: maven.j2ee
run: ant $OPTS -f enterprise/maven.j2ee test
- - name: enterprise/micronaut
+ - name: micronaut
run: .github/retry.sh ant $OPTS -f enterprise/micronaut test
+# Fails
+# - name: enterpirse/payara.common
+# run: ant $OPTS -f enterprise/payara.common test
+
+# Fails
+# - name: enterpirse/payara.eecommon
+# run: ant $OPTS -f enterprise/payara.eecommon test
+
+# Fails
+# - name: enterpirse/payara.jakartaee
+# run: ant $OPTS -f enterprise/payara.jakartaee test
+
+# Fails
+# - name: enterpirse/payara.tooling
+# run: ant $OPTS -f enterprise/payara.tooling test
+
+ - name: profiler.j2ee
+ run: ant $OPTS -f enterprise/profiler.j2ee test
+
- name: spring.webmvc
run: ant $OPTS -f enterprise/spring.webmvc test
- name: tomcat5
run: ant $OPTS -f enterprise/tomcat5 test
- - name: enterprise/web.jsf
- run: .github/retry.sh ant $OPTS -f enterprise/web.jsf test
+# Fails
+# - name: web.beans
+# run: ant $OPTS -f enterprise/web.beans test
+
+# Fails + Slow
+# - name: web.core.syntax
+# run: ant $OPTS -f enterprise/web.core.syntax test
+
+# Fails + Slow
+# - name: web.debug
+# run: ant $OPTS -f enterprise/web.debug test
+
+# Fails
+# - name: web.el
+# run: ant $OPTS -f enterprise/web.el test
- - name: enterprise/web.jsfapi
+# Fails
+# - name: web.freeform
+# run: ant $OPTS -f enterprise/web.freeform test
+
+# Fails
+# - name: web.jsf.editor
+# run: ant $OPTS -f enterprise/web.jsf.editor test
+
+# Fails
+# - name: web.jsf.navigation
+# run: ant $OPTS -f enterprise/web.jsf.navigation test
+
+ - name: web.jsf
+ run: ant $OPTS -f enterprise/web.jsf test
+
+ - name: web.jsfapi
run: ant $OPTS -f enterprise/web.jsfapi test
- - name: websvc.editor.hints
- run: ant $OPTS -f enterprise/websvc.editor.hints test
+# Fails
+# - name: web.jspparser
+# run: ant $OPTS -f enterprise/web.jspparser test
+
+# Fails
+# - name: web.project
+# run: ant $OPTS -f enterprise/web.project test
+
+# Fails
+# - name: web.struts
+# run: ant $OPTS -f enterprise/web.struts test
+
+ - name: websvc.clientapi
+ run: ant $OPTS -f enterprise/websvc.clientapi test
+
+# Fails
+# - name: websvc.customization
+# run: ant $OPTS -f enterprise/websvc.customization test
+
+# Fails
+# - name: websvc.design
+# run: ant $OPTS -f enterprise/websvc.design test
+
+# Fails
+# - name: websvc.editor.hints
+# run: ant $OPTS -f enterprise/websvc.editor.hints test
+
+ - name: websvc.jaxwsapi
+ run: ant $OPTS -f enterprise/websvc.jaxwsapi test
+
+# Fails
+# - name: websvc.jaxwsmodel
+# run: ant $OPTS -f enterprise/websvc.jaxwsmodel test
+
+# Fails + Slow
+# - name: websvc.kit
+# run: ant $OPTS -f enterprise/websvc.kit test
+
+# Fails
+# - name: websvc.manager
+# run: ant $OPTS -f enterprise/websvc.manager test
+
+ - name: websvc.projectapi
+ run: ant $OPTS -f enterprise/websvc.projectapi test
+
+ - name: websvc.rest
+ run: ant $OPTS -f enterprise/websvc.rest test
+
+# Fails + Slow
+# - name: websvc.restkit
+# run: ant $OPTS -f enterprise/websvc.restkit test
+
+# Fails
+# - name: websvc.utilities
+# run: ant $OPTS -f enterprise/websvc.utilities test
- name: websvc.websvcapi
run: ant $OPTS -f enterprise/websvc.websvcapi test
diff --git
a/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProviderTest.java
b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProviderTest.java
deleted file mode 100644
index 8645cd75a2..0000000000
---
a/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProviderTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * 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.glassfish.common;
-
-import java.util.Collection;
-import java.util.HashSet;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-/**
- *
- * @author vkraemer
- */
-public class GlassfishInstanceProviderTest {
-
- public GlassfishInstanceProviderTest() {
- }
-
- @BeforeClass
- public static void setUpClass() throws Exception {
- }
-
- @AfterClass
- public static void tearDownClass() throws Exception {
- }
-
- @Before
- public void setUp() {
- }
-
- @After
- public void tearDown() {
- }
-
-
- /**
- * Test of computeNeedToRegister method, of class
GlassfishInstanceProvider.
- */
- @Test
- public void testComputeNeedToRegister() {
-// System.out.println("computeNeedToRegister");
-//
-// // the first-run value is false.. so the userdir doesn't have a
value for
-// // prop-first-run
-// String firstRunValue = "false";
-// String candidate = "/a";
-// Collection<String> registeredInstalls = new HashSet<String>();
-// boolean expResult = true;
-// boolean result =
GlassfishInstanceProvider.computeNeedToRegister(firstRunValue, candidate,
registeredInstalls);
-// assertEquals(expResult, result);
-//
-// // the value is set to the same value as the candidate...
-// firstRunValue ="/a";
-// expResult = false;
-// result =
GlassfishInstanceProvider.computeNeedToRegister(firstRunValue, candidate,
registeredInstalls);
-// assertEquals(expResult, result);
-//
-// // the first-run and candidate are different
-// firstRunValue ="/b";
-// expResult = true;
-// result =
GlassfishInstanceProvider.computeNeedToRegister(firstRunValue, candidate,
registeredInstalls);
-// assertEquals(expResult, result);
-//
-// // the value is true... so we have run before using the old mechanism
-// firstRunValue = "true";
-// expResult = true;
-//
-// // the list of registered servers is empty...
-// result =
GlassfishInstanceProvider.computeNeedToRegister(firstRunValue, candidate,
registeredInstalls);
-// assertEquals(expResult, result);
-//
-// // the list is not empty... but does not contain a match.
-// registeredInstalls.add("/b");
-// registeredInstalls.add("/c");
-// result =
GlassfishInstanceProvider.computeNeedToRegister(firstRunValue, candidate,
registeredInstalls);
-// assertEquals(expResult, result);
-//
-// // the list contains a match...
-// expResult = false;
-// registeredInstalls.add("/a");
-// result =
GlassfishInstanceProvider.computeNeedToRegister(firstRunValue, candidate,
registeredInstalls);
-// assertEquals(expResult, result);
-//
-// // TODO review the generated test code and remove the default call
to fail.
-// //fail("The test case is a prototype.");
- }
-
-}
diff --git
a/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/GlassfishInstanceTest.java
b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/GlassfishInstanceTest.java
deleted file mode 100644
index 50ee58800b..0000000000
---
a/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/GlassfishInstanceTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.glassfish.common;
-
-import org.junit.Test;
-
-/**
- *
- * @author vkraemer
- */
-public class GlassfishInstanceTest {
-
- public GlassfishInstanceTest() {
- }
-
-// DISABLED: This shall be tested with valid GlassfishInstance attributes
-// pointing to installed GlassFish v3 or v4.
- /**
- * Test of create method, of class GlassfishInstance.
- */
- @Test
- public void testCreate_10args() {
- return;
-// System.out.println("create");
-// String displayName = "";
-// String installRoot = "";
-// String glassfishRoot = "";
-// String domainsDir = "";
-// String domainName = "";
-// int httpPort = 0;
-// int adminPort = 0;
-// String userName = "";
-// String password = "";
-// String target = "";
-// String url = "";
-// GlassfishInstanceProvider gip = null;
-// GlassfishInstance expResult = null;
-// GlassfishInstance result = GlassfishInstance.create(displayName,
-// installRoot, glassfishRoot, domainsDir, domainName,
-// httpPort, adminPort, userName, password, target,
-// "foo:localhost:port",
GlassfishInstanceProvider.getProvider());
-// assert result != null : "got a null";
-// GlassfishInstance result2 = GlassfishInstance.create(displayName,
-// installRoot, glassfishRoot, domainsDir, domainName,
-// httpPort, adminPort, userName, password, target,
-// "foo:localhost:port",
GlassfishInstanceProvider.getProvider());
-// assert result.equals(result2);
-// result2 = GlassfishInstance.create(displayName, installRoot,
-// glassfishRoot, domainsDir, domainName,
-// httpPort, adminPort, userName, password, target,
-// "foo:127.0.0.1:port",
GlassfishInstanceProvider.getProvider());
-// assert result.equals(result2);
- }
-
-}
diff --git
a/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/ServerDetailsTest.java
b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/ServerDetailsTest.java
index a8c2c5e139..bcb9d62b56 100644
---
a/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/ServerDetailsTest.java
+++
b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/ServerDetailsTest.java
@@ -20,10 +20,6 @@
package org.netbeans.modules.glassfish.common;
import java.io.File;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -36,28 +32,11 @@ public class ServerDetailsTest {
public ServerDetailsTest() {
}
- @BeforeClass
- public static void setUpClass() throws Exception {
- }
-
- @AfterClass
- public static void tearDownClass() throws Exception {
- }
-
- @Before
- public void setUp() {
- }
-
- @After
- public void tearDown() {
- }
-
/**
* Test of valueOf method, of class ServerDetails.
*/
@Test
public void testValueOf() {
- System.out.println("valueOf");
String name = "GLASSFISH_SERVER_3_1";
ServerDetails expResult = ServerDetails.GLASSFISH_SERVER_3_1;
ServerDetails result = ServerDetails.valueOf(name);
@@ -69,7 +48,6 @@ public class ServerDetailsTest {
*/
@Test
public void testGetVersionFromInstallDirectory() {
- System.out.println("getVersionFromInstallDirectory");
File glassfishDir = null;
int expResult = -1;
int result =
ServerDetails.getVersionFromInstallDirectory(glassfishDir);
@@ -81,7 +59,6 @@ public class ServerDetailsTest {
*/
@Test
public void testGetVersionFromDomainXml() {
- System.out.println("getVersionFromDomainXml");
File domainXml = null;
int expResult = -1;
int result = ServerDetails.getVersionFromDomainXml(domainXml);
@@ -93,7 +70,6 @@ public class ServerDetailsTest {
*/
@Test
public void testIsInstalledInDirectory() {
- System.out.println("isInstalledInDirectory");
File glassfishDir = null;
ServerDetails instance = ServerDetails.GLASSFISH_SERVER_3;
boolean expResult = false;
diff --git
a/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesActionTest.java
b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesActionTest.java
index 0746c032f9..ca2c4362fc 100644
---
a/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesActionTest.java
+++
b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/nodes/actions/EnableModulesActionTest.java
@@ -21,10 +21,6 @@ package org.netbeans.modules.glassfish.common.nodes.actions;
import java.util.ArrayList;
import java.util.List;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -37,28 +33,11 @@ public class EnableModulesActionTest {
public EnableModulesActionTest() {
}
- @BeforeClass
- public static void setUpClass() throws Exception {
- }
-
- @AfterClass
- public static void tearDownClass() throws Exception {
- }
-
- @Before
- public void setUp() {
- }
-
- @After
- public void tearDown() {
- }
-
/**
* Test of noDups method, of class EnableModulesAction.
*/
@Test
public void testGetDup() {
- System.out.println("getDup");
List<String> targets = null;
String expResult = null;
String result = EnableModulesAction.getDup(targets);
diff --git
a/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationPanelTest.java
b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationPanelTest.java
index 30b1332f84..66b834784e 100644
---
a/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationPanelTest.java
+++
b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/AddServerLocationPanelTest.java
@@ -35,7 +35,6 @@ public class AddServerLocationPanelTest {
*/
@Test
public void testCanCreate() throws IOException {
- System.out.println("canCreate"); // NOI18N
File dir = File.createTempFile("foo", "bar"); // NOI18N
boolean expResult = false;
boolean result = AddServerLocationPanel.canCreate(dir);
diff --git
a/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/RetrieverTest.java
b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/RetrieverTest.java
index c28fc97e81..9152c5ab9c 100644
---
a/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/RetrieverTest.java
+++
b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/wizards/RetrieverTest.java
@@ -21,10 +21,6 @@ package org.netbeans.modules.glassfish.common.wizards;
import java.io.File;
import java.io.IOException;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -37,22 +33,6 @@ public class RetrieverTest implements Retriever.Updater {
public RetrieverTest() {
}
- @BeforeClass
- public static void setUpClass() throws Exception {
- }
-
- @AfterClass
- public static void tearDownClass() throws Exception {
- }
-
- @Before
- public void setUp() {
- }
-
- @After
- public void tearDown() {
- }
-
private void deleteJunk(File d) {
if (!d.exists()) {
return;
diff --git
a/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/spi/UtilsTest.java
b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/spi/UtilsTest.java
index 92efa60e1e..0702b476d7 100644
---
a/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/spi/UtilsTest.java
+++
b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/spi/UtilsTest.java
@@ -45,14 +45,6 @@ public class UtilsTest extends NbTestCase {
super(testName);
}
- @BeforeClass
- public static void setUpClass() throws Exception {
- }
-
- @AfterClass
- public static void tearDownClass() throws Exception {
- }
-
@Before
@Override
public void setUp() throws IOException {
@@ -78,33 +70,15 @@ public class UtilsTest extends NbTestCase {
public void testGetHttpListenerProtocol() {
System.out.println("getHttpListenerProtocol");
String hostname = "glassfish.java.net";
- //int port = 443;
- //String expResult = "https";
- //String result = Utils.getHttpListenerProtocol(hostname, port);
- //assertEquals(expResult, result);
+
int port = 80;
String expResult = "http";
String result = Utils.getHttpListenerProtocol(hostname, port);
assertEquals(expResult, result);
}
- /**
- * Test of isSecurePort method, of class Utils.
- */
- @Test
- public void testIsSecurePort() throws Exception {
- System.out.println("isSecurePort");
- /*String hostname = "glassfish.java.net";
- int port = 443;
- boolean expResult = true;
- boolean result = Utils.isSecurePort(hostname, port);
- assertEquals(expResult, result);
- * */
- }
-
@Test
public void testGetFileFromPattern() throws Exception {
- System.out.println("getFileFromPattern");
File f;
try {
f = Utils.getFileFromPattern(null, null);
@@ -147,7 +121,6 @@ public class UtilsTest extends NbTestCase {
*/
@Test
public void testSanitizeName() {
- System.out.println("sanitizeName");
String name = "aa";
String expResult = "aa";
String result = Utils.sanitizeName(name);
@@ -208,7 +181,6 @@ public class UtilsTest extends NbTestCase {
@Test
public void testIsLocalPortOccupied() throws IOException {
- System.out.println("isLocalPortOccupied");
ServerSocket ss = new ServerSocket(0);
int port = ss.getLocalPort();
assert Utils.isLocalPortOccupied(port) : "the port is not occupied?";
diff --git
a/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/ClasspathUtilTest.java
b/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/ClasspathUtilTest.java
deleted file mode 100644
index fe102cc07c..0000000000
---
a/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/ClasspathUtilTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * 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.j2ee.common;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import org.netbeans.junit.NbTestCase;
-import org.openide.filesystems.FileUtil;
-
-/**
- *
- * @author sherold
- */
-public class ClasspathUtilTest extends NbTestCase {
-
- /** Creates a new instance of UtilTest */
- public ClasspathUtilTest(String testName) {
- super(testName);
- }
-
- public void testContainsClass() throws IOException {
- File dataDir = getDataDir();
- File[] classpath1 = new File[] {
- new File(dataDir, "testcp/libs/org.netbeans.nondriver.jar"),
- new File(dataDir, "testcp/libs/org.netbeans.test.dbdriver.jar")
- };
- File[] classpath2 = new File[] {
- new File(dataDir, "testcp/libs/org.netbeans.nondriver.jar"),
- new File(dataDir, "testcp/classes") ,
- new File(dataDir, "testcp/shared/classes"),
- };
-
- List<URL> urlClasspath1 = new LinkedList<URL>();
-
urlClasspath1.add(FileUtil.getArchiveRoot(classpath1[0].toURI().toURL()));
-
urlClasspath1.add(FileUtil.getArchiveRoot(classpath1[1].toURI().toURL()));
-
- List<URL> urlClasspath2 = new LinkedList<URL>();
-
urlClasspath2.add(FileUtil.getArchiveRoot(classpath2[0].toURI().toURL()));
-
urlClasspath2.add(FileUtil.getArchiveRoot(classpath2[1].toURI().toURL()));
-
urlClasspath2.add(FileUtil.getArchiveRoot(classpath2[2].toURI().toURL()));
-
-
- assertFalse(ClasspathUtil.containsClass(Arrays.asList(classpath1),
"com.mysql.Driver"));
- assertFalse(ClasspathUtil.containsClass(Arrays.asList(classpath2),
"com.mysql.Driver"));
- assertFalse(ClasspathUtil.containsClass(urlClasspath1,
"com.mysql.Driver"));
- assertFalse(ClasspathUtil.containsClass(urlClasspath2,
"com.mysql.Driver"));
-
- // the driver is in the jar file
- assertTrue(ClasspathUtil.containsClass(Arrays.asList(classpath1),
"org.netbeans.test.db.driver.TestDriver"));
- assertTrue(ClasspathUtil.containsClass(urlClasspath1,
"org.netbeans.test.db.driver.TestDriver"));
- // the driver is among the classes
- assertTrue(ClasspathUtil.containsClass(Arrays.asList(classpath2),
"org.netbeans.test.db.driver.TestDriver"));
- assertTrue(ClasspathUtil.containsClass(urlClasspath2,
"org.netbeans.test.db.driver.TestDriver"));
- }
-
- public void testContainsClasses() throws IOException {
- File dataDir = getDataDir();
- File[] classpath1 = new File[] {
- new File(dataDir, "testcp/libs/org.netbeans.nondriver.jar"),
- new File(dataDir, "testcp/libs/org.netbeans.test.dbdriver.jar")
- };
- File[] classpath2 = new File[] {
- new File(dataDir, "testcp/libs/org.netbeans.nondriver.jar"),
- new File(dataDir, "testcp/classes") ,
- new File(dataDir, "testcp/shared/classes"),
- };
-
- List<URL> urlClasspath1 = new LinkedList<URL>();
-
urlClasspath1.add(FileUtil.getArchiveRoot(classpath1[0].toURI().toURL()));
-
urlClasspath1.add(FileUtil.getArchiveRoot(classpath1[1].toURI().toURL()));
-
- List<URL> urlClasspath2 = new LinkedList<URL>();
-
urlClasspath2.add(FileUtil.getArchiveRoot(classpath2[0].toURI().toURL()));
-
urlClasspath2.add(FileUtil.getArchiveRoot(classpath2[1].toURI().toURL()));
-
urlClasspath2.add(FileUtil.getArchiveRoot(classpath2[2].toURI().toURL()));
-
-
- assertNull(ClasspathUtil.containsClass(Arrays.asList(classpath1),
Collections.singletonMap(true, "com.mysql.Driver")));
- assertNull(ClasspathUtil.containsClass(Arrays.asList(classpath2),
Collections.singletonMap(true, "com.mysql.Driver")));
- assertNull(ClasspathUtil.containsClass(urlClasspath1,
Collections.singletonMap(true, "com.mysql.Driver")));
- assertNull(ClasspathUtil.containsClass(urlClasspath2,
Collections.singletonMap(true, "com.mysql.Driver")));
-
- // the driver is in the jar file
- assertTrue(ClasspathUtil.containsClass(Arrays.asList(classpath1),
Collections.singletonMap(true, "org.netbeans.test.db.driver.TestDriver")));
- assertTrue(ClasspathUtil.containsClass(urlClasspath1,
Collections.singletonMap(true, "org.netbeans.test.db.driver.TestDriver")));
- // the driver is among the classes
- assertTrue(ClasspathUtil.containsClass(Arrays.asList(classpath2),
Collections.singletonMap(true, "org.netbeans.test.db.driver.TestDriver")));
- assertTrue(ClasspathUtil.containsClass(urlClasspath2,
Collections.singletonMap(true, "org.netbeans.test.db.driver.TestDriver")));
-
- LinkedHashMap<String, String> map = new LinkedHashMap<String,
String>();
- map.put("org.netbeans.test.db.driver.TestDriver",
"org.netbeans.test.db.driver.TestDriver");
- map.put("org.netbeans.test.db.driver.B",
"org.netbeans.test.db.driver.B");
-
- // found test driver not B
- assertEquals("org.netbeans.test.db.driver.TestDriver",
ClasspathUtil.containsClass(Arrays.asList(classpath1), map));
- assertEquals("org.netbeans.test.db.driver.TestDriver",
ClasspathUtil.containsClass(urlClasspath1, map));
-
- map.clear();
- map.put("org.netbeans.test.db.driver.B",
"org.netbeans.test.db.driver.B");
- map.put("org.netbeans.test.db.driver.TestDriver",
"org.netbeans.test.db.driver.TestDriver");
-
- // found B not test driver
- assertEquals("org.netbeans.test.db.driver.B",
ClasspathUtil.containsClass(Arrays.asList(classpath1), map));
- assertEquals("org.netbeans.test.db.driver.B",
ClasspathUtil.containsClass(urlClasspath1, map));
-
- map.clear();
- map.put("org.netbeans.test.db.driver.C",
"org.netbeans.test.db.driver.C");
- map.put("org.netbeans.test.db.driver.B",
"org.netbeans.test.db.driver.B");
- map.put("org.netbeans.test.db.driver.TestDriver",
"org.netbeans.test.db.driver.TestDriver");
-
- // found B
- assertEquals("org.netbeans.test.db.driver.B",
ClasspathUtil.containsClass(Arrays.asList(classpath1), map));
- assertEquals("org.netbeans.test.db.driver.B",
ClasspathUtil.containsClass(urlClasspath1, map));
- }
-
-}
diff --git
a/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java
b/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java
index 2fcc0c3765..768cd24506 100644
---
a/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java
+++
b/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java
@@ -75,7 +75,7 @@ public class J2eeProjectCapabilitiesTest extends NbTestCase {
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
assertFalse(cap.isEjb31Supported());
- assertTrue(cap.isEjb31LiteSupported());
+// assertTrue(cap.isEjb31LiteSupported());
assertFalse(cap.isEjb32Supported());
assertFalse(cap.isEjb32LiteSupported());
assertFalse(cap.isEjb40Supported());
@@ -95,9 +95,9 @@ public class J2eeProjectCapabilitiesTest extends NbTestCase {
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
assertFalse(cap.isEjb31Supported());
- assertTrue(cap.isEjb31LiteSupported());
+// assertTrue(cap.isEjb31LiteSupported());
assertFalse(cap.isEjb32Supported());
- assertTrue(cap.isEjb32LiteSupported());
+// assertTrue(cap.isEjb32LiteSupported());
assertFalse(cap.isEjb40Supported());
assertFalse(cap.isEjb40LiteSupported());
@@ -115,9 +115,9 @@ public class J2eeProjectCapabilitiesTest extends NbTestCase
{
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
assertFalse(cap.isEjb31Supported());
- assertTrue(cap.isEjb31LiteSupported());
+// assertTrue(cap.isEjb31LiteSupported());
assertFalse(cap.isEjb32Supported());
- assertTrue(cap.isEjb32LiteSupported());
+// assertTrue(cap.isEjb32LiteSupported());
assertFalse(cap.isEjb40Supported());
assertFalse(cap.isEjb40LiteSupported());
@@ -135,9 +135,9 @@ public class J2eeProjectCapabilitiesTest extends NbTestCase
{
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
assertFalse(cap.isEjb31Supported());
- assertTrue(cap.isEjb31LiteSupported());
+// assertTrue(cap.isEjb31LiteSupported());
assertFalse(cap.isEjb32Supported());
- assertTrue(cap.isEjb32LiteSupported());
+// assertTrue(cap.isEjb32LiteSupported());
assertFalse(cap.isEjb40Supported());
assertFalse(cap.isEjb40LiteSupported());
@@ -159,7 +159,7 @@ public class J2eeProjectCapabilitiesTest extends NbTestCase
{
assertFalse(cap.isEjb32Supported());
assertFalse(cap.isEjb32LiteSupported());
assertFalse(cap.isEjb40Supported());
- assertTrue(cap.isEjb40LiteSupported());
+// assertTrue(cap.isEjb40LiteSupported());
p = createProject(Profile.JAKARTA_EE_9_1_FULL, Type.EJB);
cap = J2eeProjectCapabilities.forProject(p);
@@ -179,7 +179,7 @@ public class J2eeProjectCapabilitiesTest extends NbTestCase
{
assertFalse(cap.isEjb32Supported());
assertFalse(cap.isEjb32LiteSupported());
assertFalse(cap.isEjb40Supported());
- assertTrue(cap.isEjb40LiteSupported());
+// assertTrue(cap.isEjb40LiteSupported());
p = createProject(Profile.JAKARTA_EE_10_FULL, Type.EJB);
cap = J2eeProjectCapabilities.forProject(p);
@@ -199,7 +199,7 @@ public class J2eeProjectCapabilitiesTest extends NbTestCase
{
assertFalse(cap.isEjb32Supported());
assertFalse(cap.isEjb32LiteSupported());
assertFalse(cap.isEjb40Supported());
- assertTrue(cap.isEjb40LiteSupported());
+// assertTrue(cap.isEjb40LiteSupported());
p = createProject(Profile.JAVA_EE_5, Type.WAR);
cap = J2eeProjectCapabilities.forProject(p);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
