#23507 EJB tests cleanup

- still used j2ee.jar - mixed tabs and spaces - removed dead tests
eclipse-ee4j · Mar 3, 2022 · bb5b9bd · bb5b9bd
1 parent d7afb80
commit bb5b9bd
Show file tree

Hide file tree

Showing 44 changed files with 55 additions and 2,996 deletions.
diff --git a/appserver/tests/appserv-tests/devtests/ejb/run_test.sh b/appserver/tests/appserv-tests/devtests/ejb/run_test.sh
@@ -98,19 +98,19 @@ test_run_ejb_web(){
         rm -rf $S1AS_HOME/domains/domain1
 
         export ADMIN_PORT=45707 \
-                                 JMS_PORT=45708 \
-                                 JMX_PORT=45709 \
-                                 ORB_PORT=45710 \
-                                 SSL_PORT=45711 \
-                                 INSTANCE_PORT=45712 \
-                                 INSTANCE_HTTPS_PORT=45718 \
-                                 INSTANCE_PORT_2=45719 \
-                                 INSTANCE_PORT_3=45720 \
-                                 ALTERNATE_PORT=45713 \
-                                 ORB_SSL_PORT=45714 \
-                                 ORB_SSL_MUTUALAUTH_PORT=45715 \
-                                 DB_PORT=45716 \
-                                 DB_PORT_2=45717
+               JMS_PORT=45708 \
+               JMX_PORT=45709 \
+               ORB_PORT=45710 \
+               SSL_PORT=45711 \
+               INSTANCE_PORT=45712 \
+               INSTANCE_HTTPS_PORT=45718 \
+               INSTANCE_PORT_2=45719 \
+               INSTANCE_PORT_3=45720 \
+               ALTERNATE_PORT=45713 \
+               ORB_SSL_PORT=45714 \
+               ORB_SSL_MUTUALAUTH_PORT=45715 \
+               DB_PORT=45716 \
+               DB_PORT_2=45717
         env
 
         cd ${APS_HOME}
@@ -182,20 +182,20 @@ test_run_ejb_timer_cluster(){
         rm -rf ${S1AS_HOME}/domains/domain1
 
         export ADMIN_PORT=45707 \
-                                 JMS_PORT=45708 \
-                                 JMX_PORT=45709 \
-                                 ORB_PORT=45710 \
-                                 SSL_PORT=45711 \
-                                 INSTANCE_PORT=45712 \
-                                 INSTANCE_HTTP_PORT=45721 \
-                                 INSTANCE_HTTPS_PORT=45718 \
-                                 INSTANCE_PORT_2=45719 \
-                                 INSTANCE_PORT_3=45720 \
-                                 ALTERNATE_PORT=45713 \
-                                 ORB_SSL_PORT=45714 \
-                                 ORB_SSL_MUTUALAUTH_PORT=45715 \
-                                 DB_PORT=45716 \
-                                 DB_PORT_2=45717
+               JMS_PORT=45708 \
+               JMX_PORT=45709 \
+               ORB_PORT=45710 \
+               SSL_PORT=45711 \
+               INSTANCE_PORT=45712 \
+               INSTANCE_HTTP_PORT=45721 \
+               INSTANCE_HTTPS_PORT=45718 \
+               INSTANCE_PORT_2=45719 \
+               INSTANCE_PORT_3=45720 \
+               ALTERNATE_PORT=45713 \
+               ORB_SSL_PORT=45714 \
+               ORB_SSL_MUTUALAUTH_PORT=45715 \
+               DB_PORT=45716 \
+               DB_PORT_2=45717
         env
 
         cd ${APS_HOME}
@@ -278,32 +278,32 @@ get_test_target(){
 
 
 run_test_id(){
-        if [[ ${1} = "ejb_web_all" ]]; then
-                unzip_test_resources ${WORKSPACE}/bundles/web.zip
-        else
-                unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip
-        fi
-        dname=`pwd`
-        cd `dirname ${0}`
-        test_init
-        get_test_target ${1}
-        if [[ ${1} = "ejb_all" || ${1} = "ejb_group"* ]]; then
-                test_run_ejb
-        elif [[ ${1} = "ejb_timer_cluster_all" ]]; then
-                test_run_ejb_timer_cluster
-        elif [[ ${1} = "ejb_web_all" ]]; then
-                test_run_ejb_web
-        else
-                echo "Invalid Test ID"
-                exit 1
-        fi
-        check_successful_run
+  if [[ ${1} = "ejb_web_all" ]]; then
+          unzip_test_resources ${WORKSPACE}/bundles/web.zip
+  else
+          unzip_test_resources ${WORKSPACE}/bundles/glassfish.zip
+  fi
+  dname=`pwd`
+  cd `dirname ${0}`
+  test_init
+  get_test_target ${1}
+  if [[ ${1} = "ejb_all" || ${1} = "ejb_group"* ]]; then
+          test_run_ejb
+  elif [[ ${1} = "ejb_timer_cluster_all" ]]; then
+          test_run_ejb_timer_cluster
+  elif [[ ${1} = "ejb_web_all" ]]; then
+          test_run_ejb_web
+  else
+          echo "Invalid Test ID"
+          exit 1
+  fi
+  check_successful_run
   generate_junit_report ${1}
   change_junit_report_class_names
 }
 
 list_test_ids(){
-        echo ejb_all ejb_timer_cluster_all ejb_web_all ejb_group_1 ejb_group_2 ejb_group_3 ejb_group_embedded
+  echo ejb_all ejb_timer_cluster_all ejb_web_all ejb_group_1 ejb_group_2 ejb_group_3 ejb_group_embedded
 }
 
 OPT=${1}

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.xml b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/build.xml
@@ -91,7 +91,7 @@
 
     <target name="runloadgenerator">
        <java  fork="true" failonerror="true"
-              classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${assemble.dir}/ejb-sfsb-stressAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
+              classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${assemble.dir}/ejb-sfsb-stressAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
            classname="${loadgenerator.client}">
            <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
            <arg value="ejb/ejb_sfsb_stress_StressSFSBHome"/>

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/build.xml
@@ -48,7 +48,7 @@
     <target name="runclient_nooverride" depends="init-common">
        <java  fork="on"
               failonerror="true"
-              classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient/ejb-stubs-ejbapp-clientClient.jar:${env.APS_HOME}/lib/reporter.jar"
+              classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient/ejb-stubs-ejbapp-clientClient.jar:${env.APS_HOME}/lib/reporter.jar"
            classname="${simple.client}">
            <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
            <jvmarg value="-Dorg.glassfish.gmbal.no.multipleUpperBoundsException=true" />
@@ -65,7 +65,7 @@
     <target name="runclient_setnothing" depends="init-common">
        <java  fork="on"
               failonerror="true"
-              classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
+              classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
               classname="${simple.client}">
            <arg value="ejb/ejb_stubs_ejbapp_HelloBean"/>
         </java>
@@ -96,7 +96,7 @@
     <target name="runclient_withoverride" depends="init-common">
        <java  fork="on"
               failonerror="true"
-              classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
+              classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
            classname="${simple.client}">
             <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
              <jvmarg

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/sun-web.xml
@@ -26,12 +26,6 @@
      <ejb-ref-name>ejb/hello</ejb-ref-name>
      <jndi-name>ejb/ejb_stubs_ejbapp_HelloBean</jndi-name>
   </ejb-ref>
-<!--
-  <ejb-ref>
-     <ejb-ref-name>ejb/dummymejb</ejb-ref-name>
-     <jndi-name>ejb/ejb_stubs_ejbapp_DummyMEJBBean</jndi-name>
-  </ejb-ref>
--->
   <class-loader delegate="true"/>
   <jsp-config/>
 </sun-web-app>

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Servlet.java
@@ -43,22 +43,7 @@ public void service ( HttpServletRequest req , HttpServletResponse resp ) throws
 
             InitialContext ic = new InitialContext();
 
-            System.out.println("Skipping mejb test for now.  NEED TO REENABLE");
-            //            System.out.println("Calling DummyMEJBBean");
-
-            /* TODO reenable once javax.management classes are available
-            Object objref = ic.lookup("java:comp/env/ejb/dummymejb");
-            ManagementHome mHome = (ManagementHome)
-                PortableRemoteObject.narrow(objref, ManagementHome.class);
-            Management dummyMejb = mHome.create();
-
-            System.out.println("Invoking dummy mejb to force context class loader test.");
-            dummyMejb.getMBeanCount();
-            System.out.println("dummy mejb test successful");
-
-            */
-
-           System.out.println("Looking up ejb ref ");
+            System.out.println("Looking up ejb ref ");
             // create EJB using factory from container
             Object objref2 = ic.lookup("java:comp/env/ejb/hello");
             System.out.println("objref = " + objref2);

diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml
@@ -48,7 +48,7 @@
   <target name="runclient" depends="init-common">
     <java  fork="on"
           failonerror="true"
-          classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+          classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
           classname="${simple.client}">
     </java>
   </target>
@@ -57,7 +57,7 @@
   <target name="perf" depends="init-common">
     <java  fork="on"
           failonerror="true"
-          classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+          classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
           classname="${perf.client}">
       <arg value="javax.xml.rpc.Service"/>
       <arg value="100000"/>

diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.properties b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.properties
diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.xml b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.xml