#23507 Naming tests reenabled and fixed
diff --git a/appserver/tests/appserv-tests/devtests/naming/build.xml b/appserver/tests/appserv-tests/devtests/naming/build.xml
index 67132ad..9a7f31c 100644
--- a/appserver/tests/appserv-tests/devtests/naming/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/build.xml
@@ -40,7 +40,7 @@
<fileset dir="." includes="*.output"/>
</delete>
<record name="naming.output" action="start" />
- <ant dir="externalnameservicelookup" target="all"/>
+<!-- <ant dir="externalnameservicelookup" target="all"/> -->
<ant dir="injection" target="all"/>
<ant dir="listjndi" target="all"/>
<!-- <ant dir="loadbalancing" target="all"/> -->
@@ -48,8 +48,10 @@
<ant dir="naming2" target="all"/>
<!-- <ant dir="nonfailover" target="all"/> -->
<ant dir="orb_annotation" target="all"/>
-<!-- <ant dir="visibroker/lookup" target="all">
- <ant dir="visibroker/rmiiiop" target="all"> -->
+<!--
+ <ant dir="visibroker/lookup" target="all">
+ <ant dir="visibroker/rmiiiop" target="all">
+ -->
<record name="naming.output" action="stop" />
</target>
diff --git a/appserver/tests/appserv-tests/devtests/naming/listjndi/ListJndiEntriesTest.java b/appserver/tests/appserv-tests/devtests/naming/listjndi/ListJndiEntriesTest.java
index 92fc39a..ef933c7 100644
--- a/appserver/tests/appserv-tests/devtests/naming/listjndi/ListJndiEntriesTest.java
+++ b/appserver/tests/appserv-tests/devtests/naming/listjndi/ListJndiEntriesTest.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -25,7 +26,7 @@
public class ListJndiEntriesTest extends AdminBaseDevTest {
public static final String[] EXPECTED_TOKENS =
- {"UserTransaction:", "java:global:", "ejb:", "com.sun.enterprise.naming.impl.TransientContext"};
+ {"UserTransaction:", "jdbc:", "jms:", "com.sun.enterprise.naming.impl.TransientContext"};
public static final String INSTANCE_RESOURCE_NAME = "INSTANCE_RESOURCE_NAME";
public static final String CLUSTER_RESOURCE_NAME = "CLUSTER_RESOURCE_NAME";
@@ -92,8 +93,8 @@
AsadminReturn result = asadminWithOutput("list-jndi-entries");
reportResultStatus(testName, result);
reportExpectedResult(testName, result);
- reportUnexpectedResult(testName, result, STANDALONE_INSTANCE_NAME,
- CLUSTER_NAME, INSTANCE1_NAME);
+ reportExpectedResult(testName, result, "java:global:");
+ reportUnexpectedResult(testName, result, STANDALONE_INSTANCE_NAME, CLUSTER_NAME, INSTANCE1_NAME);
}
public void testListJndiEntriesTargetServer() {
@@ -101,8 +102,8 @@
AsadminReturn result = asadminWithOutput("list-jndi-entries", "server");
reportResultStatus(testName, result);
reportExpectedResult(testName, result);
- reportUnexpectedResult(testName, result, STANDALONE_INSTANCE_NAME,
- CLUSTER_NAME, INSTANCE1_NAME);
+ reportExpectedResult(testName, result, "java:global:");
+ reportUnexpectedResult(testName, result, STANDALONE_INSTANCE_NAME, CLUSTER_NAME, INSTANCE1_NAME);
}
public void testListJndiEntriesTargetDomain() {
@@ -110,6 +111,7 @@
AsadminReturn result = asadminWithOutput("list-jndi-entries", "domain");
reportResultStatus(testName, result);
reportExpectedResult(testName, result);
+ reportExpectedResult(testName, result, "java:global:");
}
public void testListJndiEntriesTargetCluster() {
@@ -150,7 +152,8 @@
private void reportResultStatus(String testName, AsadminReturn result) {
report(testName + "-returnValue", result.returnValue);
- report(testName + "-isEmpty", result.err.isEmpty());
+ // FIXME: on Jenkins prints Picked up JAVA_TOOLS_OPTIONS ...
+// report(testName + "-isEmpty", result.err.isEmpty());
}
private void reportExpectedResult(String testName, AsadminReturn result, String... expected) {
diff --git a/appserver/tests/appserv-tests/devtests/naming/listjndi/build.xml b/appserver/tests/appserv-tests/devtests/naming/listjndi/build.xml
index 197f801..b5c7714 100644
--- a/appserver/tests/appserv-tests/devtests/naming/listjndi/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/listjndi/build.xml
@@ -68,14 +68,10 @@
</target>
<target name="run">
- <!--
<record name="listjndi.output" action="start" />
- -->
<antcall target="listjndi"/>
- <!--
<record name="admin.output" action="stop" />
<antcall target="dev-report"/>
- -->
</target>
<target name="clean">
diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.xml b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.xml
index 431257c..35d36b3 100755
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/build.xml
@@ -33,163 +33,157 @@
<target name="all" depends="cluster-setup,build,setup,deploy,run-appclient1,run-appclient2,run-appclient3,run-appclient4,undeploy,unsetup,cluster-unsetup"/>
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common"/>
+ </target>
- <target name="sql" depends="init-common">
- <!--
+ <target name="sql" depends="init-common">
+ <!--
Clean the database after the run since it prohibits re-running
-->
- <antcall target="execute-sql-common">
- <param name="sql.file" value="sql/drop_derby.sql"/>
- </antcall>
- <antcall target="execute-sql-common">
- <param name="sql.file" value="sql/create_derby.sql"/>
- </antcall>
- </target>
- <target name="run-appclient1" depends="init-common">
- <echo message="running in ACC with S1ASCtxFactory..."/>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb.xml 129.145.133.64 33700"/>
- </antcall>
- <antcall target="sql"/>
-</target>
+ <antcall target="execute-sql-common">
+ <param name="sql.file" value="sql/drop_derby.sql"/>
+ </antcall>
+ <antcall target="execute-sql-common">
+ <param name="sql.file" value="sql/create_derby.sql"/>
+ </antcall>
+ </target>
+ <target name="run-appclient1" depends="init-common">
+ <echo message="running in ACC with S1ASCtxFactory..."/>
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb.xml 129.145.133.64 33700"/>
+ </antcall>
+ <antcall target="sql"/>
+ </target>
- <target name="run-appclient2" depends="init-common">
- <echo message="running in ACC with S1ASCtxFactory..."/>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb1.xml 129.145.133.64 33700"/>
- </antcall>
- <antcall target="sql"/>
-</target>
+ <target name="run-appclient2" depends="init-common">
+ <echo message="running in ACC with S1ASCtxFactory..."/>
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb1.xml 129.145.133.64 33700"/>
+ </antcall>
+ <antcall target="sql"/>
+ </target>
- <target name="run-appclient3" depends="init-common">
- <echo message="running in ACC with S1ASCtxFactory..."/>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb2.xml 129.145.133.64 33700"/>
- </antcall>
- <antcall target="sql"/>
-</target>
+ <target name="run-appclient3" depends="init-common">
+ <echo message="running in ACC with S1ASCtxFactory..."/>
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb2.xml 129.145.133.64 33700"/>
+ </antcall>
+ <antcall target="sql"/>
+ </target>
- <target name="run-appclient4" depends="init-common">
- <echo message="running in ACC with S1ASCtxFactory..."/>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb3.xml 129.145.133.64 33700"/>
- </antcall>
- <antcall target="sql"/>
-</target>
+ <target name="run-appclient4" depends="init-common">
+ <echo message="running in ACC with S1ASCtxFactory..."/>
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb3.xml 129.145.133.64 33700"/>
+ </antcall>
+ <antcall target="sql"/>
+ </target>
- <target name="compile" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- </target>
+ <target name="compile" depends="clean">
+ <antcall target="compile-common">
+ <param name="src" value="ejb"/>
+ </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="client"/>
+ </antcall>
+ </target>
- <target name="build" depends="compile">
- <antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <target name="build" depends="compile">
+ <antcall target="build-ear-common">
+ <param name="ejbjar.classes"
value="**/*Student*.class,**/*Enroller*.class,**/*Course*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Course.class,**/Enroller.class,**/Student.class,**/*Home*.class,**/*Client*.class" />
- </antcall>
- </target>
+ </antcall>
+ </target>
- <target name="setup" depends="init-common">
- <antcall target="execute-sql-common">
- <param name="sql.file" value="sql/create_derby.sql"/>
- </antcall>
- <antcall target="deploy-jdbc-common">
- <param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
- <param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB"/>
- <param name="appserver.instance.name" value="C1"/>
- </antcall>
- <!--antcall target="deploy-jms-common"/>
- <antcall target="reconfig-common"/-->
- </target>
+ <target name="setup" depends="init-common">
+ <antcall target="execute-sql-common">
+ <param name="sql.file" value="sql/create_derby.sql"/>
+ </antcall>
+ <antcall target="deploy-jdbc-common">
+ <param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
+ <param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB"/>
+ <param name="appserver.instance.name" value="C1"/>
+ </antcall>
+ </target>
- <target name="deploy" depends="init-common">
- <echo message="Deploying via asadmin..."/>
- <antcall target="deploy-common-ee">
- <param name="ee" value="enterprise edition"/>
-<param name="appserver.instance.name" value="C1"/>
-</antcall>
- </target>
+ <target name="deploy" depends="init-common">
+ <echo message="Deploying via asadmin..."/>
+ <antcall target="deploy-common-ee">
+ <param name="ee" value="enterprise edition"/>
+ <param name="appserver.instance.name" value="C1"/>
+ </antcall>
+ </target>
- <!-- =============================================== -->
- <!-- Target to run the standalone client without ACC -->
-<!---->
- <!-- =============================================== -->
- <target name="run-standalone-client" depends="init-common">
- <property name="client.type"
- value="standalone"/>
- <java classname="com.sun.s1peqe.loadbalancing.client.EnrollerClient"
- classpath="${env.S1AS_HOME}/imq/lib/imq.jar:${env.S1AS_HOME}/imq/lib/imqjmsra.jar:${env.S1AS_HOME}/imq/lib/jms.jar:${s1astest.classpath}:${assemble.dir}/${appname}AppClient.jar" failonerror="true" fork="true">
- <!--jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${admin.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/-->
- <jvmarg value="-Djava.naming.provider.url=iiop://129.145.133.64:33700"/>
-
- <!--jvmarg value="-Dcom.sun.appserv.iiop.endpoints=pathfinder.sfbay.sun.com:3690,pathfinder.sfbay.sun.com:3880"/-->
- <jvmarg value="-Dcom.sun.appserv.iiop.loadbalancingpolicy=ic-based"/>
- <arg value="129.145.133.64"/>
- <arg value="33700"/>
- <arg value="${client.type}"/>
- </java>
- </target>
+ <!-- =============================================== -->
+ <!-- Target to run the standalone client without ACC -->
+ <!---->
+ <!-- =============================================== -->
+ <target name="run-standalone-client" depends="init-common">
+ <property name="client.type" value="standalone"/>
+ <java classname="com.sun.s1peqe.loadbalancing.client.EnrollerClient"
+ classpath="${env.S1AS_HOME}/imq/lib/imq.jar:${env.S1AS_HOME}/imq/lib/imqjmsra.jar:${env.S1AS_HOME}/imq/lib/jms.jar:${s1astest.classpath}:${assemble.dir}/${appname}AppClient.jar"
+ failonerror="true" fork="true"
+ >
+ <jvmarg value="-Djava.naming.provider.url=iiop://129.145.133.64:33700"/>
+ <jvmarg value="-Dcom.sun.appserv.iiop.loadbalancingpolicy=ic-based"/>
+ <arg value="129.145.133.64"/>
+ <arg value="33700"/>
+ <arg value="${client.type}"/>
+ </java>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common">
- <param name="appserver.instance.name" value="C1"/>
- </antcall>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-common">
+ <param name="appserver.instance.name" value="C1"/>
+ </antcall>
+ </target>
- <target name="unsetup" depends="init-common">
- <!--antcall target="undeploy-jms-common"/-->
- <antcall target="execute-sql-common">
- <param name="sql.file" value="sql/drop_derby.sql"/>
- </antcall>
- <antcall target="undeploy-jdbc-common">
- <param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
- <param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB"/>
- <param name="appserver.instance.name" value="C1"/>
- </antcall>
- </target>
+ <target name="unsetup" depends="init-common">
+ <antcall target="execute-sql-common">
+ <param name="sql.file" value="sql/drop_derby.sql"/>
+ </antcall>
+ <antcall target="undeploy-jdbc-common">
+ <param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
+ <param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB"/>
+ <param name="appserver.instance.name" value="C1"/>
+ </antcall>
+ </target>
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
+ <target name="usage">
+ <antcall target="usage-common"/>
+ </target>
- <target name="restart">
- <antcall target="restart-server-instance-common"/>
- </target>
+ <target name="restart">
+ <antcall target="restart-server-instance-common"/>
+ </target>
-<!-- ================================================================ -->
-<!-- Running eeconfig/eeunsetup -->
-<!-- ================================================================ -->
-<target name="cluster-unsetup">
-<echo message="Cleaning up cluster setup" level="verbose"/>
- <exec executable="sh" failonerror="false">
- <arg line="${env.APS_HOME}/devtests/naming/loadbalancing/cluster-unsetup"/>
- </exec>
-</target>
+ <!-- ================================================================ -->
+ <!-- Running eeconfig/eeunsetup -->
+ <!-- ================================================================ -->
+ <target name="cluster-unsetup">
+ <echo message="Cleaning up cluster setup" level="verbose"/>
+ <exec executable="sh" failonerror="false">
+ <arg line="${env.APS_HOME}/devtests/naming/loadbalancing/cluster-unsetup"/>
+ </exec>
+ </target>
-<!-- ================================================================ -->
-<!-- Running eeconfig/eesetup -->
-<!-- ================================================================ -->
-<target name="cluster-setup" depends="init-common">
- <echo message="Setting up cluster, waiting ..." level="verbose"/>
- <exec executable="sh" failonerror="true" >
- <arg line="${env.APS_HOME}/devtests/naming/loadbalancing/cluster-setup"/>
- </exec>
- <waitfor>
- <http url="http://${http.host}:${http.port}"/>
- </waitfor>
- <sleep seconds="80"/>
-</target>
+ <!-- ================================================================ -->
+ <!-- Running eeconfig/eesetup -->
+ <!-- ================================================================ -->
+ <target name="cluster-setup" depends="init-common">
+ <echo message="Setting up cluster, waiting ..." level="verbose"/>
+ <exec executable="sh" failonerror="true" >
+ <arg line="${env.APS_HOME}/devtests/naming/loadbalancing/cluster-setup"/>
+ </exec>
+ <waitfor>
+ <http url="http://${http.host}:${http.port}"/>
+ </waitfor>
+ <sleep seconds="80"/>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClient.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClient.java
index 9756749..2f5307b 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClient.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/client/EnrollerClient.java
@@ -28,18 +28,16 @@
public class EnrollerClient {
- private SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests");
public static void main(String[] args) {
EnrollerClient client = new EnrollerClient();
-
- // run the tests
client.runTestClient(args);
}
+
public void runTestClient(String[] args) {
- try{
+ try {
stat.addDescription("Testing loadbalancing app.");
test01(args);
testInAppClientContainer();
@@ -72,43 +70,26 @@
System.out.println("looking up ejb/MyStudent using org.glassfish.jndi.cosnaming.CNCtxFactory...");
Object obj = ctx.lookup("ejb/MyStudent");
System.out.println("Looked up ejb/MyStudent with CnCtxFactory...");
- StudentHome sH =
- (StudentHome) PortableRemoteObject.narrow(obj,
- StudentHome.class);
- Student denise1 = sH.create("111", "Tiffany Moore");
+ StudentHome sH = (StudentHome) PortableRemoteObject.narrow(obj, StudentHome.class);
+ Student tiffany = sH.create("111", "Tiffany Moore");
System.out.println("Created student id 111 for Tiffany Moore");
+ Student denise = sH.create("823", "Denise Smith");
Context initial = new InitialContext();
- System.out.println("Looking up MEJB...");
- Object objref = initial.lookup("ejb/mgmt/MEJB");
- System.out.println("Looked up ejb/mgmt/MEJB");
System.out.println("Looking up EJB REFs whose jndi name is specified as a corbaname: url ==>");
System.out.println("Creating new Context 1..");
System.out.println("Using Context 1, Looking up EJB using corbaname: url with global jndi name ==>");
- objref = initial.lookup("corbaname:iiop:localhost:3700#ejb/MyStudent");
- System.out.println("Looked up corbaname:iiop:localhost:3700#ejb/MyStudent");
-
- StudentHome sHome =
- (StudentHome) PortableRemoteObject.narrow(objref,
- StudentHome.class);
- Student denise = sHome.create("823", "Denise Smith");
-
-
System.out.println("Using Context 1, looking up global jndi name ==>");
Object objRef = initial.lookup("ejb/MyCourse");
System.out.println("Looked up ejb/MyCourse");
- CourseHome cHome = (CourseHome)
- PortableRemoteObject.narrow(objRef,
- CourseHome.class);
+ CourseHome cHome = (CourseHome) PortableRemoteObject.narrow(objRef, CourseHome.class);
Course power = cHome.create("220", "Power J2EE Programming");
- objref = initial.lookup(enrollerString);
+ Object objref = initial.lookup(enrollerString);
System.out.println("Looked up " + enrollerString);
- EnrollerHome eHome =
- (EnrollerHome) PortableRemoteObject.narrow(objref,
- EnrollerHome.class);
+ EnrollerHome eHome = (EnrollerHome) PortableRemoteObject.narrow(objref, EnrollerHome.class);
Enroller enroller = eHome.create();
enroller.enroll("823", "220");
enroller.enroll("823", "333");
@@ -120,7 +101,7 @@
ArrayList courses = denise.getCourseIds();
Iterator i = courses.iterator();
while (i.hasNext()) {
- String courseId = (String)i.next();
+ String courseId = (String) i.next();
Course course = cHome.findByPrimaryKey(courseId);
System.out.println(courseId + " " + course.getName());
}
@@ -131,8 +112,8 @@
courses = intro.getStudentIds();
i = courses.iterator();
while (i.hasNext()) {
- String studentId = (String)i.next();
- Student student = sHome.findByPrimaryKey(studentId);
+ String studentId = (String) i.next();
+ Student student = sH.findByPrimaryKey(studentId);
System.out.println(studentId + " " + student.getName());
}
@@ -144,9 +125,8 @@
System.out.println("Creating new Context 3...");
Context initial2 = new InitialContext();
- jakarta.jms.QueueConnectionFactory queueConnectionFactory =
- (QueueConnectionFactory)
- initial2.lookup("jms/QCFactory");
+ jakarta.jms.QueueConnectionFactory queueConnectionFactory = (QueueConnectionFactory) initial2
+ .lookup("jms/QCFactory");
System.out.println("Looked up jms/QCFactory");
stat.addStatus("load balancing", stat.PASS);
@@ -157,26 +137,26 @@
}
}
- private void testInAppClientContainer() {
- System.out.println("Creating new Context ...");
- try {
- InitialContext ctx = new InitialContext();
- Object obj = ctx.lookup("java:comp/InAppClientContainer");
- if (obj == null) {
- stat.addStatus("testInAppClientContainer", stat.FAIL);
- return;
- }
- Boolean result = (Boolean) obj;
- if (!result) {
- stat.addStatus("testInAppClientContainer", stat.FAIL);
- }
- System.out.println("Looked up java:comp/InAppClientContainer :"
- + result);
- stat.addStatus("testInAppClientContainer", stat.PASS);
- } catch (Exception ex) {
- stat.addStatus("testInAppClientContainer", stat.FAIL);
- System.err.println("Caught an unexpected exception!");
- ex.printStackTrace();
- }
+
+ private void testInAppClientContainer() {
+ System.out.println("Creating new Context ...");
+ try {
+ InitialContext ctx = new InitialContext();
+ Object obj = ctx.lookup("java:comp/InAppClientContainer");
+ if (obj == null) {
+ stat.addStatus("testInAppClientContainer", stat.FAIL);
+ return;
+ }
+ Boolean result = (Boolean) obj;
+ if (!result) {
+ stat.addStatus("testInAppClientContainer", stat.FAIL);
+ }
+ System.out.println("Looked up java:comp/InAppClientContainer :" + result);
+ stat.addStatus("testInAppClientContainer", stat.PASS);
+ } catch (Exception ex) {
+ stat.addStatus("testInAppClientContainer", stat.FAIL);
+ System.err.println("Caught an unexpected exception!");
+ ex.printStackTrace();
}
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/build.xml b/appserver/tests/appserv-tests/devtests/naming/naming2/build.xml
index 6364074..caf36b6 100644
--- a/appserver/tests/appserv-tests/devtests/naming/naming2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/naming2/build.xml
@@ -41,6 +41,7 @@
<artifact:mvn mavenHome="${env.M2_HOME}" fork="true">
<jvmarg value="-Dmaven.multiModuleProjectDirectory"/>
<jvmarg value="-Dmaven.javadoc.skip=true" />
+ <jvmarg value="-Dglassfish.version=${env.GF_VERSION}" />
<arg value="clean"/>
<arg value="verify"/>
</artifact:mvn>
diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml b/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml
index aa60593..45b774d 100644
--- a/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml
@@ -22,24 +22,21 @@
<parent>
<artifactId>naming2</artifactId>
<groupId>org.glassfish.devtests</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>6.2.6-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.devtests</groupId>
<artifactId>naming-context-tests</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
<name>GlassFish Naming Context Tests</name>
<dependencies>
<dependency>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
- <scope>test</scope>
+ <groupId>org.glassfish.main.extras</groupId>
+ <artifactId>glassfish-embedded-all</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>jakarta.ejb</artifactId>
- <version>3.1.1</version>
- <scope>compile</scope>
+ <artifactId>jakarta.el</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -56,23 +53,6 @@
</dependency>
</dependencies>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <enableAssertions>false</enableAssertions>
- </configuration>
- </plugin>
- </plugins>
<finalName>${project.artifactId}</finalName>
</build>
@@ -84,9 +64,9 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.glassfish.extras</groupId>
+ <groupId>org.glassfish.main.extras</groupId>
<artifactId>glassfish-embedded-all</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</profile>
@@ -97,12 +77,9 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.glassfish.extras</groupId>
+ <groupId>org.glassfish.main.extras</groupId>
<artifactId>glassfish-embedded-static-shell</artifactId>
<version>${project.version}</version>
- <scope>system</scope>
- <systemPath>${env.S1AS_HOME}/lib/embedded/glassfish-embedded-static-shell.jar
- </systemPath>
</dependency>
</dependencies>
</profile>
diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java
index 5993f4d..f5ff0aa 100644
--- a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java
+++ b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -40,146 +41,187 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class ContextTest {
+
private static final String NL = System.getProperty("line.separator");
private static EJBContainer ejbContainer;
private TestBean testBean;
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ private static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests");
@Rule
- public TestWatcher reportWatcher=new ReportWatcher(stat, "Naming::naming2::ContextTest");
+ public TestWatcher reportWatcher = new ReportWatcher(stat, "Naming::naming2::ContextTest");
- @Rule public TestName testName = new TestName();
+ @Rule
+ public TestName testName = new TestName();
- @BeforeClass public static void setUpClass() {
+ @BeforeClass
+ public static void setUpClass() {
ejbContainer = EJBContainer.createEJBContainer();
}
- @AfterClass public static void tearDownClass() {
- if(ejbContainer != null)
+
+ @AfterClass
+ public static void tearDownClass() {
+ if (ejbContainer != null)
ejbContainer.close();
}
+
@AfterClass
- public static void printSummary(){
+ public static void printSummary() {
stat.printSummary();
}
- @Before public void setUp() throws NamingException {
+
+ @Before
+ public void setUp() throws NamingException {
testBean = (TestBean) ejbContainer.getContext().lookup("java:global/classes/TestBean");
System.out.printf("%n----------------- Starting test %s -------------------%n", testName.getMethodName());
}
- @After public void tearDown() {
+
+ @After
+ public void tearDown() {
System.out.printf("%n================= Finishing test ================================================%n%n");
}
- @Test public void lookupWithWLInitialContextFactory() throws NamingException {
+
+ @Test
+ public void lookupWithWLInitialContextFactory() throws NamingException {
TestBean b = testBean.lookupWithWLInitialContextFactory("java:global/classes/TestBean");
DataSource ds = testBean.lookupWithWLInitialContextFactory("jdbc/__default");
System.out.println("TestBean from lookup: " + b);
System.out.println("DataSource from lookup: " + ds);
}
- @Test public void listEmptyString2() throws NamingException {
+
+ @Test
+ public void listEmptyString2() throws NamingException {
System.out.println(testBean.listEmptyString().toString());
}
- @Test public void listEmptyString() throws NamingException {
+
+ @Test
+ public void listEmptyString() throws NamingException {
Context context = ejbContainer.getContext();
NamingEnumeration<NameClassPair> list = context.list("");
assertNotNull(list);
System.out.println("Got NameClassPair: " + toString(list));
}
- @Test public void listBindingsEmptyString2() throws NamingException {
+
+ @Test
+ public void listBindingsEmptyString2() throws NamingException {
System.out.println(testBean.listBindingsEmptyString().toString());
}
- @Test public void listBindingsEmptyString() throws NamingException {
+
+ @Test
+ public void listBindingsEmptyString() throws NamingException {
Context context = ejbContainer.getContext();
NamingEnumeration<Binding> list = context.listBindings("");
assertNotNull(list);
System.out.println("Got Binding: " + toString(list));
}
- @Ignore
- @Test public void listGlobal2() throws NamingException {
+
+ // @Ignore
+ @Test
+ public void listGlobal2() throws NamingException {
System.out.println(testBean.listGlobal().toString());
}
- @Ignore //got null componentId
- @Test public void listGlobal() throws NamingException {
+
+ // @Ignore //got null componentId
+ @Test
+ public void listGlobal() throws NamingException {
Context context = ejbContainer.getContext();
NamingEnumeration<NameClassPair> list = context.list("java:global");
assertNotNull(list);
System.out.println("Got NameClassPair: " + toString(list));
}
- @Ignore
- @Test public void listBindingsGlobal2() throws NamingException {
+
+ // @Ignore
+ @Test
+ public void listBindingsGlobal2() throws NamingException {
System.out.println(testBean.listBindingsGlobal().toString());
}
- @Ignore
- @Test public void listBindingsGlobal() throws NamingException {
+
+ // @Ignore
+ @Test
+ public void listBindingsGlobal() throws NamingException {
Context context = ejbContainer.getContext();
NamingEnumeration<Binding> list = context.listBindings("java:global");
assertNotNull(list);
System.out.println("Got Binding: " + toString(list));
}
- @Test public void listJavaComp() throws NamingException {
+
+ @Test
+ public void listJavaComp() throws NamingException {
System.out.println(testBean.listJavaComp().toString());
}
- @Test public void listBindingsJavaComp() throws NamingException {
+
+ @Test
+ public void listBindingsJavaComp() throws NamingException {
System.out.println(testBean.listBindingsJavaComp().toString());
}
- @Test public void listJavaModule() throws NamingException {
+
+ @Test
+ public void listJavaModule() throws NamingException {
System.out.println(testBean.listJavaModule().toString());
}
- @Test public void listBindingsJavaModule() throws NamingException {
+
+ @Test
+ public void listBindingsJavaModule() throws NamingException {
System.out.println(testBean.listBindingsJavaModule().toString());
}
- @Test public void listJavaApp() throws NamingException {
+
+ @Test
+ public void listJavaApp() throws NamingException {
System.out.println(testBean.listJavaApp().toString());
}
- @Test public void listBindingsJavaApp() throws NamingException {
+
+ @Test
+ public void listBindingsJavaApp() throws NamingException {
System.out.println(testBean.listBindingsJavaApp().toString());
}
- @Test public void closeNamingEnumerations() throws NamingException {
+
+ @Test
+ public void closeNamingEnumerations() throws NamingException {
testBean.closeNamingEnumerations();
}
- @Test
- public void getIsInAppClientContainerFromEJB() throws NamingException {
- Boolean isACC = testBean.getIsInAppClientContainer();
- assertFalse(isACC);
- System.out.println("get java:comp/InAppClientContainer from EJB:"
- + isACC);
- }
- @Test
- public void getIsInAppClientContainerFromSEClient() throws NamingException {
- String jndiname = "java:comp/InAppClientContainer";
- Context context = new InitialContext();
- Boolean isACC = (Boolean) context.lookup(jndiname);
- assertFalse(isACC);
- System.out
- .println("get "+jndiname+" from java SE client:"
- + isACC);
- }
+ @Test
+ public void getIsInAppClientContainerFromEJB() throws NamingException {
+ Boolean isACC = testBean.getIsInAppClientContainer();
+ assertFalse(isACC);
+ System.out.println("get java:comp/InAppClientContainer from EJB:" + isACC);
+ }
+
+
+ @Test
+ public void getIsInAppClientContainerFromSEClient() throws NamingException {
+ String jndiname = "java:comp/InAppClientContainer";
+ Context context = new InitialContext();
+ Boolean isACC = (Boolean) context.lookup(jndiname);
+ assertFalse(isACC);
+ System.out.println("get " + jndiname + " from java SE client:" + isACC);
+ }
+
private String toString(NamingEnumeration<? extends NameClassPair> n) throws NamingException {
StringBuilder sb = new StringBuilder();
sb.append(n.toString()).append(NL);
- while(n.hasMore()) { // test will fail with NPE if null
+ while (n.hasMore()) { // test will fail with NPE if null
NameClassPair x = n.next();
sb.append(x).append(NL);
}
diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/pom.xml b/appserver/tests/appserv-tests/devtests/naming/naming2/pom.xml
index e023fe2..512b837 100644
--- a/appserver/tests/appserv-tests/devtests/naming/naming2/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/naming2/pom.xml
@@ -19,9 +19,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.glassfish.main.tests</groupId>
+ <artifactId>ant-tests</artifactId>
+ <version>6.2.6-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
<groupId>org.glassfish.devtests</groupId>
<artifactId>naming2</artifactId>
- <version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>naming2</name>
<modules>
