[jboss-cvs] JBossAS SVN: r107530 - in projects/jboss-jca/trunk: core/src/test/java/org/jboss/jca/core/connectionmanager/tx and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 10 16:22:49 EDT 2010
Author: jesper.pedersen
Date: 2010-08-10 16:22:48 -0400 (Tue, 10 Aug 2010)
New Revision: 107530
Modified:
projects/jboss-jca/trunk/adapters/build.xml
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/nontx/NonTxConnectionManagerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/workmanager/unit/WorkManagerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase.java
Log:
Test suite fixes
Modified: projects/jboss-jca/trunk/adapters/build.xml
===================================================================
--- projects/jboss-jca/trunk/adapters/build.xml 2010-08-10 19:35:03 UTC (rev 107529)
+++ projects/jboss-jca/trunk/adapters/build.xml 2010-08-10 20:22:48 UTC (rev 107530)
@@ -105,50 +105,6 @@
Target: test
================================= -->
<target name="test" depends="jars, prepare-test">
- <mkdir dir="${reports.dir}"/>
- <mkdir dir="${reports.dir}/adapters"/>
-
- <junit dir="src/test"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}">
-
- <jvmarg line="${junit.jvm.options}"/>
- <sysproperty key="archives.dir" value="${build.adapters.dir}"/>
- <sysproperty key="java.util.logging.manager" value="org.jboss.logmanager.LogManager"/>
- <sysproperty key="log4j.defaultInitOverride" value="true"/>
- <sysproperty key="org.jboss.logging.Logger.pluginClass" value="org.jboss.logging.logmanager.LoggerPluginImpl"/>
- <sysproperty key="test.dir" value="${test.dir}"/>
- <sysproperty key="xb.builder.useUnorderedSequence" value="true"/>
- <sysproperty key="javax.xml.stream.XMLInputFactory" value="com.sun.xml.internal.stream.XMLInputFactoryImpl"/>
-
- <classpath>
- <pathelement location="${build.adapters.dir}/test"/>
- <fileset dir="${target.dir}" includes="*.jar"/>
- <fileset dir="${lib.dir}/common" includes="*.jar" />
- <fileset dir="${lib.dir}/embedded" includes="*.jar" />
- <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
- <fileset dir="${lib.dir}/sjc" includes="*.jar" />
- <fileset dir="${lib.dir}/test" includes="*.jar" />
- </classpath>
-
- <formatter type="plain"/>
- <formatter type="xml"/>
-
- <batchtest todir="${reports.dir}/adapters"
- haltonerror="${junit.batchtest.haltonerror}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- fork="${junit.batchtest.fork}">
-
- <fileset dir="${build.adapters.dir}/test">
- <include name="**/*TestCase.class"/>
- </fileset>
- </batchtest>
-
- </junit>
-
</target>
@@ -156,65 +112,12 @@
Target: one-test
================================= -->
<target name="one-test" depends="jars, prepare-test">
- <mkdir dir="${reports.dir}"/>
- <mkdir dir="${reports.dir}/adapters"/>
-
- <junit dir="src/test"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="${junit.fork}"
- timeout="${junit.timeout}">
-
- <jvmarg line="${junit.jvm.options}"/>
- <sysproperty key="archives.dir" value="${build.adapters.dir}"/>
- <sysproperty key="java.util.logging.manager" value="org.jboss.logmanager.LogManager"/>
- <sysproperty key="log4j.defaultInitOverride" value="true"/>
- <sysproperty key="org.jboss.logging.Logger.pluginClass" value="org.jboss.logging.logmanager.LoggerPluginImpl"/>
- <sysproperty key="test.dir" value="${test.dir}"/>
- <sysproperty key="xb.builder.useUnorderedSequence" value="true"/>
- <sysproperty key="javax.xml.stream.XMLInputFactory" value="com.sun.xml.internal.stream.XMLInputFactoryImpl"/>
-
- <classpath>
- <pathelement location="${build.adapters.dir}/test"/>
- <fileset dir="${target.dir}" includes="*.jar"/>
- <fileset dir="${lib.dir}/common" includes="*.jar" />
- <fileset dir="${lib.dir}/embedded" includes="*.jar" />
- <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
- <fileset dir="${lib.dir}/sjc" includes="*.jar" />
- <fileset dir="${lib.dir}/test" includes="*.jar" />
- </classpath>
-
- <formatter type="plain"/>
- <formatter type="xml"/>
-
- <test todir="${reports.dir}/adapters" name="${test}"
- haltonerror="${junit.batchtest.haltonerror}"
- haltonfailure="${junit.batchtest.haltonfailure}"
- fork="${junit.batchtest.fork}"/>
- </junit>
</target>
<!-- =================================
Target: prepare-test
================================= -->
<target name="prepare-test">
- <mkdir dir="${build.adapters.dir}" />
- <mkdir dir="${build.adapters.dir}/test" />
-
- <javac srcdir="src/test"
- destdir="${build.adapters.dir}/test"
- classpathref="test.lib.path.id"
- debug="${javac.debug}"
- deprecation="${javac.deprecation}"
- optimize="${javac.optimize}">
- <compilerarg value="-Xlint"/>
- </javac>
-
- <copy todir="${build.adapters.dir}/test">
- <fileset dir="src/test/resources"/>
- </copy>
-
</target>
<!-- =================================
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java 2010-08-10 19:35:03 UTC (rev 107529)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java 2010-08-10 20:22:48 UTC (rev 107530)
@@ -21,7 +21,7 @@
*/
package org.jboss.jca.core.connectionmanager.tx;
-import org.jboss.jca.core.api.ConnectionManager;
+import org.jboss.jca.core.api.connectionmanager.ConnectionManager;
import org.jboss.jca.core.connectionmanager.ConnectionManagerFactory;
import org.jboss.jca.core.connectionmanager.common.MockConnectionRequestInfo;
import org.jboss.jca.core.connectionmanager.common.MockHandle;
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java 2010-08-10 19:35:03 UTC (rev 107529)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java 2010-08-10 20:22:48 UTC (rev 107530)
@@ -21,7 +21,7 @@
*/
package org.jboss.jca.core.connectionmanager.tx;
-import org.jboss.jca.core.api.ConnectionManager;
+import org.jboss.jca.core.api.connectionmanager.ConnectionManager;
import org.jboss.jca.core.connectionmanager.ConnectionManagerFactory;
import org.jboss.jca.core.connectionmanager.common.MockConnectionRequestInfo;
import org.jboss.jca.core.connectionmanager.common.MockHandle;
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/nontx/NonTxConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/nontx/NonTxConnectionManagerTestCase.java 2010-08-10 19:35:03 UTC (rev 107529)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/nontx/NonTxConnectionManagerTestCase.java 2010-08-10 20:22:48 UTC (rev 107530)
@@ -21,7 +21,7 @@
*/
package org.jboss.jca.core.connectionmanager.unit.nontx;
-import org.jboss.jca.core.api.ConnectionManager;
+import org.jboss.jca.core.api.connectionmanager.ConnectionManager;
import org.jboss.jca.core.connectionmanager.ConnectionManagerFactory;
import org.jboss.jca.core.connectionmanager.common.MockConnectionRequestInfo;
import org.jboss.jca.core.connectionmanager.common.MockHandle;
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/workmanager/unit/WorkManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/workmanager/unit/WorkManagerTestCase.java 2010-08-10 19:35:03 UTC (rev 107529)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/workmanager/unit/WorkManagerTestCase.java 2010-08-10 20:22:48 UTC (rev 107530)
@@ -65,8 +65,8 @@
@Test
public void testInstanceOf() throws Throwable
{
- org.jboss.jca.core.api.WorkManager workManager =
- embedded.lookup("WorkManager", org.jboss.jca.core.api.WorkManager.class);
+ org.jboss.jca.core.api.workmanager.WorkManager workManager =
+ embedded.lookup("WorkManager", org.jboss.jca.core.api.workmanager.WorkManager.class);
assertNotNull(workManager);
assertTrue(workManager instanceof javax.resource.spi.work.WorkManager);
@@ -79,8 +79,8 @@
@Test
public void testThreadPool() throws Throwable
{
- org.jboss.jca.core.api.WorkManager workManager =
- embedded.lookup("WorkManager", org.jboss.jca.core.api.WorkManager.class);
+ org.jboss.jca.core.api.workmanager.WorkManager workManager =
+ embedded.lookup("WorkManager", org.jboss.jca.core.api.workmanager.WorkManager.class);
assertNotNull(workManager);
assertNotNull(workManager.getShortRunningThreadPool());
@@ -94,8 +94,8 @@
@Test
public void testXATerminator() throws Throwable
{
- org.jboss.jca.core.api.WorkManager workManager =
- embedded.lookup("WorkManager", org.jboss.jca.core.api.WorkManager.class);
+ org.jboss.jca.core.api.workmanager.WorkManager workManager =
+ embedded.lookup("WorkManager", org.jboss.jca.core.api.workmanager.WorkManager.class);
assertNotNull(workManager);
assertNotNull(workManager.getXATerminator());
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase.java 2010-08-10 19:35:03 UTC (rev 107529)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/test/core/spec/chapter10/section1/ManageThreadTestCase.java 2010-08-10 20:22:48 UTC (rev 107530)
@@ -53,8 +53,8 @@
@Test
public void testWorkManagerHasThreadPool() throws Throwable
{
- org.jboss.jca.core.api.WorkManager workManager =
- embedded.lookup("WorkManager", org.jboss.jca.core.api.WorkManager.class);
+ org.jboss.jca.core.api.workmanager.WorkManager workManager =
+ embedded.lookup("WorkManager", org.jboss.jca.core.api.workmanager.WorkManager.class);
BlockingExecutor shortRunning = workManager.getShortRunningThreadPool();
assertNotNull(shortRunning);
More information about the jboss-cvs-commits
mailing list