#23507 Cleanup in jdbc tests - generated files, formatting, longer sleep
- note - I know that the sleep is an antipattern, the test will be rewritten
soon this year to something much better.
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
index fc26249..7f0fdd3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
@@ -42,7 +42,7 @@
System.out.println("Creating timers for schedule_exp timer test");
bean.createTimers();
System.out.println("Waiting timers to expire for schedule_exp timer test");
- Thread.sleep(12000);
+ Thread.sleep(15000);
System.out.println("Verifying timers for schedule_exp timer test");
bean.verifyTimers();
stat.addStatus("schedule_exp: ", stat.PASS );
diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
index f5f90b0..1b584a4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
@@ -204,7 +204,7 @@
}
if (timerSvc.getTimers().size() != 0) {
- throw new EJBException("After cencel, timerSvc.getTimers().size() = "
+ throw new EJBException("After cancel, timerSvc.getTimers().size() = "
+ timerSvc.getTimers().size());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/RepRunConf.txt b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/RepRunConf.txt
deleted file mode 100644
index c604c61..0000000
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/RepRunConf.txt
+++ /dev/null
@@ -1 +0,0 @@
-Test has been reported
\ No newline at end of file
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java
deleted file mode 100644
index b2c8c2a..0000000
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation.client;
-
-import java.io.*;
-import java.util.*;
-import java.sql.*;
-import jakarta.ejb.EJB;
-import jakarta.transaction.UserTransaction;
-import jakarta.annotation.*;
-import jakarta.annotation.sql.*;
-import javax.sql.DataSource;
-import com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation.*;
-
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class Client {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- private String personName;
-
- private /** static @Resource(mappedName="jdbc/xa") **/ DataSource ds;
-
- public static void main (String[] args) {
-
- stat.addDescription("ejb-ejb30-persistence-tx_propagation");
- Client client = new Client(args);
- client.doTest(false);
- client.doTest(true);
- stat.printSummary("ejb-ejb30-persistence-tx_propagationID");
- }
-
- public Client (String[] args) {
-
- personName = "duke";
-
- if( args.length > 0 ) {
- personName = args[0];
- }
-
- }
-
- private static @EJB Sful sful;
-
- public void doTest(boolean commit) {
-
- ResultSet rs = null;
- Connection connection = null;
- PreparedStatement s = null;
- try {
- System.err.println("I am in client");
-
- UserTransaction utx = (UserTransaction)(new javax.naming.InitialContext()).lookup("java:comp/UserTransaction");
- ds = (DataSource)(new javax.naming.InitialContext()).lookup("java:app/jdbc/xa");
-
- System.err.println("calling createPerson(" + personName + ")");
- if (sful == null) {
- // Java SE client
- sful = (Sful)(new javax.naming.InitialContext()).lookup("com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation.Sful");
- }
- sful.setName(personName);
- System.err.println("created ");
-
- utx.begin();
- System.err.println("utx.begin called ");
-
- connection = ds.getConnection();
- s = connection.prepareStatement("insert into EJB30_PERSISTENCE_EEM_INJECTION_PERSON values('1', '1')");
- s.execute();
- System.err.println("inserted 1,1 into table ");
-
- Map<String, Boolean> map = sful.doTests();
- if (commit) {
- System.err.println("calling utx.commit ");
- utx.commit();
- System.err.println("utx.commit called ");
- } else {
- System.err.println("calling utx.rollback ");
- utx.rollback();
- System.err.println("utx.rollback called ");
- }
-
- Iterator<String> iter = map.keySet().iterator();
- while (iter.hasNext()) {
- String testName = iter.next();
- boolean result = map.get(testName);
- stat.addStatus("local " + testName,
- (result) ? stat.PASS : stat.FAIL);
- }
-
- } catch(Exception e) {
- e.printStackTrace();
- stat.addStatus("local main" , stat.FAIL);
- } finally {
-
- try {
- if (rs != null)
- rs.close();
- } catch (Exception e) { }
-
- try {
- if (s != null)
- s.close();
- } catch (Exception e) { }
-
- try {
- if (connection != null)
- connection.close();
- } catch (Exception e) { }
-
- }
-
- return;
- }
-
-
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java
deleted file mode 100644
index b415c3f..0000000
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
-
-import java.util.Map;
-import java.util.HashMap;
-
-import javax.naming.InitialContext;
-
-import jakarta.ejb.Stateful;
-import jakarta.ejb.EJB;
-import jakarta.persistence.PersistenceContextType;
-import jakarta.persistence.PersistenceContext;
-import jakarta.persistence.EntityNotFoundException;
-import jakarta.annotation.sql.*;
-
-import jakarta.persistence.EntityManager;
-
-import jakarta.ejb.TransactionAttribute;
-import jakarta.ejb.TransactionAttributeType;
-import jakarta.ejb.EJBException;
-
-@DataSourceDefinition(name = "java:app/jdbc/xa",
- className = "org.apache.derby.jdbc.ClientXADataSource",
- minPoolSize = 0,
- initialPoolSize = 0,
- user = "dbuser",
- password = "dbpassword",
- databaseName = "testdb",
- properties = {"connectionAttributes=;create=true"}
-
- )
-@Stateful
-@EJB(name="ejb/SfulBean",
- beanInterface=com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation.SfulDelegate.class)
-
-public class SfulBean
- implements Sful {
-
- private String name;
-
- private @EJB SfulDelegate delegate;
-
- private @PersistenceContext(unitName="lib/ejb-ejb30-persistence-tx_propagation-par1.jar#em",
- type=PersistenceContextType.EXTENDED)
- EntityManager extendedEM;
-
- public void setName(String name) {
- this.name = name;
- try {
- String lookupName = "java:comp/env/ejb/SfulBean";
-
- InitialContext initCtx = new InitialContext();
- delegate = (SfulDelegate) initCtx.lookup(lookupName);
- } catch (Exception ex) {
- throw new EJBException(ex);
- }
- }
-
- public Map<String, Boolean> doTests() {
- Person person = new Person(name);
-
- String delegateName = "delgname_" + name;
- String delegateData= "delgdata: " + name;
- delegate.create(delegateName, delegateData);
-
- Person dPerson = extendedEM.find(Person.class, delegateName);
-
- extendedEM.persist(person);
- Person foundPerson = delegate.find(name);
-
-
- Map<String, Boolean> map = new HashMap<String, Boolean>();
- map.put("findDelegateCreatedPerson", (dPerson != null));
- map.put("delegateFoundMe", (foundPerson != null));
-
- // See https://glassfish.dev.java.net/issues/show_bug.cgi?id=3867
- extendedEM.flush();
-
- return map;
- }
-
- Person findPerson() {
-
- Person p = extendedEM.find(Person.class, name);
- System.out.println("Found " + p);
- return p;
- }
-
- boolean removePerson(String personName) {
-
- Person p = extendedEM.find(Person.class, personName);
- boolean removed = false;
- if (p != null) {
- extendedEM.remove(p);
- removed = true;
- }
- return removed;
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/build.xml b/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/build.xml
index e5e3cc9..37abd31 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/build.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/build.xml
@@ -31,107 +31,103 @@
&run;
&testproperties;
- <target name="all" depends="build,setup,run,unsetup"/>
+ <target name="all" depends="build,setup,run,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="compile" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- </target>
-
- <target name="build" depends="compile">
- <mkdir dir="${assemble.dir}"/>
- <antcall target="package-appclientjar-common">
- <param name="appclientjar.classes"
- value="**/*.class" />
- <param name="appclientjar.files"
- value="${build.classes.dir}" />
- <param name="appclient.jar"
- value="${assemble.dir}/${appname}AppClient.jar"/>
- </antcall>
- </target>
-
-<!-- run appclient in AppServ -->
-<target name="myrunclient" depends="init-common">
- <echo message="appclient -client ${assemble.dir}/${appname}AppClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
- <exec executable="${APPCLIENT}" failonerror="false">
- <arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
- <arg line="-name ${appname}Client"/>
- <arg line="-textauth"/>
- <arg line="-user j2ee"/>
- <arg line="-password j2ee"/>
- <arg line="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
- <arg line="${appclient.application.args}"/>
- <env key="APPCPATH" value="${env.APS_HOME}/lib/reporter.jar"/>
- <env key="VMARGS" value="-Dcom.sun.enterprise.connectors.SwitchoffACCConnectionPooling=true"/>
- </exec>
-
-<!-- confirming report generation... -->
- <antcall target="checkReporting-common">
- <param name="test.name" value="${appname}"/>
- <param name="test.description" value="${test.description}"/>
- <param name="test.count" value="${test.count}"/>
+ <target name="compile" depends="clean">
+ <antcall target="compile-common">
+ <param name="src" value="client" />
</antcall>
-</target>
+ </target>
- <target name="run" depends="init-common">
- <antcall target="myrunclient"/>
- </target>
+ <target name="build" depends="compile">
+ <mkdir dir="${assemble.dir}" />
+ <antcall target="package-appclientjar-common">
+ <param name="appclientjar.classes" value="**/*.class" />
+ <param name="appclientjar.files" value="${build.classes.dir}" />
+ <param name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar" />
+ </antcall>
+ </target>
- <target name="unsetup" depends="init-common">
- <antcall target="delete-jdbc-resource-common">
- <param name="jdbc.resource.name" value="jdbc/nonxaresource"/>
- </antcall>
+ <!-- run appclient in AppServ -->
+ <target name="myrunclient" depends="init-common">
+ <echo message="appclient -client ${assemble.dir}/${appname}AppClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}" />
+ <exec executable="${APPCLIENT}">
+ <arg line="-client ${assemble.dir}/${appname}AppClient.jar" />
+ <arg line="-name ${appname}Client" />
+ <arg line="-textauth" />
+ <arg line="-user j2ee" />
+ <arg line="-password j2ee" />
+ <arg line="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml" />
+ <arg line="${appclient.application.args}" />
+ <env key="APPCPATH" value="${env.APS_HOME}/lib/reporter.jar" />
+ <env key="VMARGS"
+ value="-Dcom.sun.enterprise.connectors.SwitchoffACCConnectionPooling=true"
+ />
+ </exec>
- <antcall target="delete-jdbc-connpool-common">
- <param name="jdbc.conpool.name" value="jdbc-derby-pool"/>
- </antcall>
+ <!-- confirming report generation... -->
+ <antcall target="checkReporting-common">
+ <param name="test.name" value="${appname}" />
+ <param name="test.description" value="${test.description}" />
+ <param name="test.count" value="${test.count}" />
+ </antcall>
+ </target>
- <antcall target="delete-jdbc-resource-common">
- <param name="jdbc.resource.name" value="jdbc/xaresource"/>
- </antcall>
+ <target name="run" depends="init-common">
+ <antcall target="myrunclient" />
+ </target>
- <antcall target="delete-jdbc-connpool-common">
- <param name="jdbc.conpool.name" value="jdbc-derby-xa-pool"/>
- </antcall>
+ <target name="unsetup" depends="init-common">
+ <antcall target="delete-jdbc-resource-common">
+ <param name="jdbc.resource.name" value="jdbc/nonxaresource" />
+ </antcall>
- </target>
+ <antcall target="delete-jdbc-connpool-common">
+ <param name="jdbc.conpool.name" value="jdbc-derby-pool" />
+ </antcall>
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
+ <antcall target="delete-jdbc-resource-common">
+ <param name="jdbc.resource.name" value="jdbc/xaresource" />
+ </antcall>
+
+ <antcall target="delete-jdbc-connpool-common">
+ <param name="jdbc.conpool.name" value="jdbc-derby-xa-pool" />
+ </antcall>
+ </target>
+
+ <target name="usage">
+ <antcall target="usage-common" />
+ </target>
<target name="setup" depends="init-common">
+ <echo message="Setting up derby .... " />
+ <antcall target="deploy-jdbc-common">
+ <param name="jdbc.conpool.name" value="jdbc-derby-pool" />
+ <param name="jdbc.resource.name" value="jdbc/nonxaresource" />
+ </antcall>
+ <antcall target="deploy-jdbc-common">
+ <param name="jdbc.conpool.name" value="jdbc-derby-xa-pool" />
+ <param name="jdbc.resource.name" value="jdbc/xaresource" />
+ <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource" />
+ <param name="jdbc.resource.type" value="javax.sql.XADataSource" />
+ </antcall>
- <echo message="Setting up derby .... "/>
- <antcall target="deploy-jdbc-common">
- <param name="jdbc.conpool.name" value="jdbc-derby-pool"/>
- <param name="jdbc.resource.name" value="jdbc/nonxaresource"/>
- </antcall>
- <antcall target="deploy-jdbc-common">
- <param name="jdbc.conpool.name" value="jdbc-derby-xa-pool"/>
- <param name="jdbc.resource.name" value="jdbc/xaresource"/>
- <param name="db.class" value="org.apache.derby.jdbc.ClientXADataSource"/>
- <param name="jdbc.resource.type" value="javax.sql.XADataSource"/>
- </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="set" />
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-derby-pool.property.connectionAttributes=create=true;"
+ />
+ </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-derby-pool.property.connectionAttributes=create=true;"/>
- </antcall>
-
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props"
- value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-derby-xa-pool.property.connectionAttributes=create=true;"/>
- </antcall>
-
-
- </target>
-
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="set" />
+ <param name="operand.props"
+ value="${resources.dottedname.prefix}.jdbc-connection-pool.jdbc-derby-xa-pool.property.connectionAttributes=create=true;"
+ />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/client/Client.java
index da1f3c6..a805371 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/switchoffACCconnpooling/client/Client.java
@@ -14,15 +14,6 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/
-/*
- * UnpooledTest.java
- *
- * Created on October 31, 2006, 11:44 AM
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
- */
-
package com.sun.s1asdev.jdbc.switchoffACCConnPooling.client;
import java.sql.ResultSet;
@@ -44,21 +35,14 @@
*/
public class Client {
+ private static final String testSuite = "switchoffACCconnpooling";
private static int count = 10;
+ private static SimpleReporterAdapter stat = new SimpleReporterAdapter();
+
private static boolean rollback;
private static String tableName = "COFFEE";
-
- //static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests");
- private static SimpleReporterAdapter stat = new SimpleReporterAdapter();
- private static final String testSuite = "switchoffACCconnpooling";
- private static int testCount = 0;
-
- private static boolean isXA=false;
-
- /** Creates a new instance of UnpooledTest */
- public Client() {
- }
-
+ private static int testCount;
+ private static boolean isXA;
/**
* @param args the command line arguments
