[webbeans-commits] Webbeans SVN: r1554 - ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck and 6 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Mon Feb 16 18:56:50 EST 2009
Author: pete.muir at jboss.org
Date: 2009-02-16 18:56:49 -0500 (Mon, 16 Feb 2009)
New Revision: 1554
Removed:
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/helpers/
Modified:
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TCK.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestResult.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Contexts.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/EL.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java
Log:
Tidy up API and javadoc for TCK
Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -41,7 +41,7 @@
}
}
- public void undeploy(String name) throws DeploymentException, IOException
+ public void undeploy(String name) throws IOException
{
try
{
@@ -49,7 +49,7 @@
}
catch (Exception e)
{
- throw new DeploymentException("Error deploying " + name, e);
+ throw new IOException("Error undeploying " + name, e);
}
}
Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ProfileServiceContainersImpl.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -81,7 +81,7 @@
}
}
- public void undeploy(String name) throws DeploymentException, IOException
+ public void undeploy(String name) throws IOException
{
try
{
Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -52,5 +52,21 @@
{
deploy(null, classes, beansXml);
}
+
+ public void cleanup()
+ {
+ // TODO Auto-generated method stub
+
+ }
+ public void setup()
+ {
+ // No-op
+ }
+
+ public void undeploy()
+ {
+ // No-op
+ }
+
}
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -11,6 +11,21 @@
import org.jboss.jsr299.tck.spi.Managers;
import org.jboss.jsr299.tck.spi.StandaloneContainers;
+/**
+ * The configuration of the TCK.
+ *
+ * The TCK may be configured using system properties or placed in a properties
+ * file called META-INF/web-beans-tck.properties.
+ *
+ * Porting package property names are the FQCN of the SPI class. Other property
+ * names (one for each non-porting package SPI configuration option) are
+ * specified here. The defaults are also listed here.
+ *
+ * The TCK may also be configured programatically through this interface
+ *
+ * @author Pete Muir
+ *
+ */
public interface Configuration
{
@@ -31,24 +46,69 @@
public static final String DEFAULT_HOST = "localhost:8080";
public static final int DEFAULT_CONNECT_RETRIES = 2;
+ /**
+ * The output directory to put TCK specific output. The TestNG output
+ * directory is configured via TestNG.
+ *
+ * By default set to ${tmp}/jsr-299-tck
+ */
public String getOutputDirectory();
+ /**
+ * Whether the TCK is in standalone mode or not.
+ *
+ * By default true
+ */
public boolean isStandalone();
+ /**
+ * When the TCK is running in container tests it will attempt to connect to
+ * the server every 200ms until the timeout is reached.
+ *
+ * By default 5000ms
+ */
public int getConnectTimeout();
+ /**
+ * The TCK allows additional libraries to be put in the deployed test
+ * artifacts (for example the porting package for the implementation). Any
+ * jars in this directory will be added to the deployed artifact.
+ *
+ * By default no directory is used.
+ */
public String getLibraryDirectory();
+ /**
+ * The TCK test launcher
+ *
+ * @see TestLauncher
+ *
+ */
public TestLauncher getInContainerTestLauncher();
+ /**
+ * The implementation of {@link Beans} in use.
+ */
public Beans getBeans();
+ /**
+ * The implementation of {@link Contexts} in use.
+ */
public <T extends Context> Contexts<T> getContexts();
+ /**
+ * The implementation of {@link Managers} in use.
+ */
public Managers getManagers();
+ /**
+ * The implementation of {@link Containers} in use.
+ */
public Containers getContainers();
+ /**
+ * Whether to run integration tests, by default false.
+ */
public boolean isRunIntegrationTests();
public void setOutputDirectory(String outputDirectory);
@@ -69,26 +129,32 @@
public void setContainers(Containers containers);
+ /**
+ * The implementation of {@link StandaloneContainers} in use.
+ */
public StandaloneContainers getStandaloneContainers();
public void setStandaloneContainers(StandaloneContainers standaloneContainers);
public void setRunIntegrationTests(boolean runIntegrationTests);
+ @Deprecated
public List<String> getInContainerTestPackageNames();
- public List<String> getStandaloneTestPackageNames();
-
public void setEl(EL el);
+ /**
+ * The implementation of {@link EL} in use.
+ */
public EL getEl();
+ /**
+ * The TCK will use this as the remote host to connect to run in container
+ * tests. By default localhost:8080
+ *
+ */
public String getHost();
public void setHost(String host);
- public Class<?> getTestClass();
-
- public void setTestClass(Class<?> clazz);
-
}
\ No newline at end of file
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TCK.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TCK.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TCK.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -55,11 +55,6 @@
TCK tck = newInstance();
tck.dumpArtifacts();
}
- if (isSystemPropertyTrue(RUN_SUITE_PROPERTY_NAME))
- {
- TCK tck = newInstance();
- tck.runInContainerTests();
- }
if (isSystemPropertyTrue(DUMP_CONFIGURATION_PROPERTY_NAME))
{
System.out.println(newInstance().getConfiguration());
@@ -70,11 +65,17 @@
{
}
+ /**
+ * Initiate a dump of all TCK artifacts
+ *
+ */
public abstract void dumpArtifacts();
- public abstract void runInContainerTests();
-
-
+ /**
+ * Get the current configuration
+ *
+ * @return
+ */
public abstract Configuration getConfiguration();
private static boolean isSystemPropertyTrue(String propertyName)
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -3,12 +3,36 @@
import java.io.IOException;
import java.lang.reflect.Method;
-
+/**
+ * Allow the TCK to launch a test remotely in a container.
+ *
+ * The TCK provides a built in launcher for use in an environment where Servlet
+ * is available such as EE6, EE5 or EE6 Web Profile. This can be used by
+ * specifying:
+ *
+ * org.jboss.jsr299.tck.api.TestLauncher=org.jboss.jsr299.tck.impl.runner.servlet.ServletTestLauncher
+ *
+ * A Servlet suitable for launching tests is included in the artifacts produced
+ * by the JSR299 TCK.
+ *
+ * @author Pete Muir
+ *
+ */
public interface TestLauncher
{
public static final String PROPERTY_NAME = TestLauncher.class.getName();
+ /**
+ * Launch a test remotely, returning the result to the TCK.
+ *
+ * @param method
+ * the method to launch
+ * @return the test result
+ * @throws IOException
+ * if a communication error occured with the server. This will
+ * cause the test to fail
+ */
public TestResult launchTest(Method method) throws IOException;
}
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestResult.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestResult.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestResult.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -1,18 +1,47 @@
package org.jboss.jsr299.tck.api;
+import java.io.Serializable;
-public interface TestResult
+/**
+ * A test result which may be serialized for communicate between client and
+ * server
+ *
+ * @author Pete Muir
+ *
+ */
+public interface TestResult extends Serializable
{
+ /**
+ * The test status
+ * @author Pete Muir
+ *
+ */
public enum Status
{
+ /**
+ * The test passed
+ */
PASSED,
+ /**
+ * The test failed
+ */
FAILED,
+ /**
+ * The test was skipped due to some deployment problem
+ */
SKIPPED;
}
+ /**
+ * Get the status of this test
+ */
public Status getStatus();
+ /**
+ * If the test failed, the exception that was thrown. It does not need to be
+ * the root cause.
+ */
public Throwable getThrowable();
}
\ No newline at end of file
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Beans.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -8,6 +8,11 @@
/**
* Provides Bean related operations.
*
+ * The TCK porting package must provide an implementation of this interface which is
+ * suitable for the target implementation.
+ *
+ * This interface may be removed.
+ *
* @author Shane Bryzak
* @author Pete Muir
* @author David Allen
@@ -24,6 +29,9 @@
* @param <T> The type of the bean
* @param clazz the class to create the bean
* @return the created bean
+ *
+ * Deprecated, {@link StandaloneContainers#deploy(Iterable, Iterable)} should
+ * be used. This method will be removed when the TCK is released.
*/
@Deprecated
public <T> Bean<T> createSimpleBean(Class<T> clazz);
@@ -35,6 +43,9 @@
* @param <T> The type of the bean
* @param clazz the class to create the bean
* @return the created bean
+ *
+ * Deprecated, {@link StandaloneContainers#deploy(Iterable, Iterable)} should
+ * be used. This method will be removed when the TCK is released.
*/
@Deprecated
@@ -53,6 +64,9 @@
* @param declaringBean the simple or enterprise bean which declares this
* producer method
* @return the producer bean
+ *
+ * Deprecated, {@link StandaloneContainers#deploy(Iterable, Iterable)} should
+ * be used. This method will be removed when the TCK is released.
*/
@Deprecated
public <T> Bean<T> createProducerMethodBean(Method method, Bean<?> declaringBean);
@@ -97,6 +111,9 @@
* @param field the producer field
* @param declaringBean
* @return the producer bean
+ *
+ * Deprecated, {@link StandaloneContainers#deploy(Iterable, Iterable)} should
+ * be used. This method will be removed when the TCK is released.
*/
@Deprecated
public <T> Bean<T> createProducerFieldBean(Field field, Bean<?> declaringBean);
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -5,25 +5,81 @@
import org.jboss.jsr299.tck.api.DeploymentException;
+/**
+ * Incontainer mode deployment related operations
+ *
+ * The TCK porting package must provide an implementation of this interface
+ * which is suitable for the target implementation and application server
+ *
+ * @author Pete Muir
+ *
+ */
public interface Containers
{
public static final String PROPERTY_NAME = Containers.class.getName();
/**
- * The compressed archive, represented as an stream of bytes
+ * The war/ear to deploy to the container, it should be read using a
+ * JarInputStream.
*
- * The stream should be uncompressed using a JarInputStream
- *
+ * For a successful deployment, a symmetric {@link #undeploy(String)} will be
+ * called.
+ *
+ * @see #undeploy(String)
+ *
* @param archive
- * @return
+ * the archive
+ * @param name
+ * the name the TCK uses to refer to this archive, unique within
+ * this tck run
+ * @throws DeploymentException
+ * if any exceptions are encountered during deployment, they
+ * should be rethrown wrapped in a {@link DeploymentException}.
+ * Note that the TCK checks deployment exceptions.
+ * @throws IOException
+ * if any communication problems with the server occur during
+ * deployment. These will cause the test suite to fail.
*/
public void deploy(InputStream archive, String name) throws DeploymentException, IOException;
- public void undeploy(String name) throws DeploymentException, IOException;
+ /**
+ * Undeploy the war/ear from the container.
+ *
+ * @see #deploy(InputStream, String)
+ *
+ * @param name
+ * the name the TCK uses to refer to this archive, unique within
+ * this tck run
+ * @throws IOException
+ * if any communication problems with the server occur during
+ * deployment. These will cause the test suite to fail.
+ */
+ public void undeploy(String name) throws IOException;
+ /**
+ * Called before the TCK starts executing the testsuite, but after the suite
+ * has been configured.
+ *
+ * A TCK suite lifecycle callback, useful for setting up the container. This
+ * method may be a no-op if no setup is required.
+ *
+ * @throws IOException
+ * if any communication problems with the server occur during
+ * setup. These will cause the test suite to fail.
+ */
public void setup() throws IOException;
+ /**
+ * Called after the TCK finishes executing the testsuite.
+ *
+ * A TCK suite lifecycle callback, useful for cleaning up and shutting down
+ * the container. This method may be a no-op if no setup is required.
+ *
+ * @throws IOException
+ * if any communication problems with the server occur during
+ * cleanup. These will cause the test suite to fail.
+ */
public void cleanup() throws IOException;
-
+
}
\ No newline at end of file
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Contexts.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Contexts.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Contexts.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -4,10 +4,15 @@
/**
- * Context related operations
+ * This interface provides operations relating to Contexts.
*
+ * The TCK porting package must provide an implementation of this interface which is
+ * suitable for the target implementation.
+ *
* @author Shane Bryzak
* @author Pete Muir
+ *
+ * @param <T> The concrete context type of the implementation
*
*/
public interface Contexts<T extends Context>
@@ -30,24 +35,24 @@
public void setInactive(T context);
/**
- * Creates a new request context
+ * Get the request context, regardless of whether it is active or not
*
- * @return The new request context
+ * @return The request context
*/
public T getRequestContext();
/**
- * Returns the default dependent context
+ * Returns the dependent context, regardless of whether it is active or not
*
* @return the dependent context
*/
public T getDependentContext();
/**
- * Destroy the context. This operation is not well defined by the Web Beans
- * specification and is implementation dependent.
+ * Destroy the context. This operation is defined by the Web Beans
+ * specification but has no API.
*
- * @param context
+ * @param context the context to destroy
*/
public void destroyContext(T context);
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/EL.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/EL.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/EL.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -1,5 +1,16 @@
package org.jboss.jsr299.tck.spi;
+/**
+ * This interface provides operations relating to EL.
+ *
+ * The TCK porting package must provide an implementation of this interface which is
+ * suitable for the target Web Beans implementation.
+ *
+ * NOTE: This interface will be removed
+ *
+ * @author Pete Muir
+ */
+ at Deprecated
public interface EL
{
@@ -7,6 +18,7 @@
/**
*
+ *
* @param <T>
* @param expression
* @param expectedType
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Managers.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -6,10 +6,10 @@
import javax.inject.manager.Manager;
/**
- * This interface provides operations relating to a Web Beans Manager.
+ * This interface provides operations relating to a Manager.
*
* The TCK porting package must provide an implementation of this interface which is
- * suitable for the target Web Beans implementation.
+ * suitable for the target implementation.
*
* @author Shane Bryzak
*/
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/StandaloneContainers.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -7,7 +7,8 @@
import org.jboss.jsr299.tck.api.DeploymentException;
/**
- * Standalone container related operations
+ * Standalone mode deployment related operations. If the TCK is placed in
+ * standalone mode, unit tests will be deployed via this interface.
*
* You must implement this as part of the porting package if you intend to run
* the TCK in standalone mode
@@ -70,8 +71,8 @@
public void deploy(Iterable<Class<?>> classes) throws DeploymentException;
/**
- * <p>Bootstrap the container by registering Beans and Observers, raising
- * @Initialized event, validating the deployment, and raising the
+ * <p>Bootstrap the container for a test by registering Beans and Observers,
+ * raising @Initialized event, validating the deployment, and raising the
* @Deployed event.</p>
*
* <p>Any classes passed in should be fully deployed. This includes:</p>
@@ -91,4 +92,30 @@
* @param beansXmls the beans.xml files to deploy
*/
public void deploy(Iterable<Class<?>> classes, Iterable<URL> beansXmls) throws DeploymentException;
+
+ /**
+ * Cleanup the container after this test
+ *
+ */
+ public void undeploy();
+
+ /**
+ * Called before the TCK starts executing the testsuite, but after the suite
+ * has been configured.
+ *
+ * A TCK suite lifecycle callback, useful for setting up the container. This
+ * method may be a no-op if no setup is required.
+ *
+ */
+ public void setup();
+
+ /**
+ * Called after the TCK finishes executing the testsuite.
+ *
+ * A TCK suite lifecycle callback, useful for cleaning up and shutting down
+ * the container. This method may be a no-op if no setup is required.
+ *
+ */
+ public void cleanup();
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -129,6 +129,10 @@
{
getCurrentConfiguration().getContainers().undeploy(artifact.getDefaultName());
}
+ if (getCurrentConfiguration().isStandalone())
+ {
+ getCurrentConfiguration().getStandaloneContainers().undeploy();
+ }
}
private void checkAssertionsEnabled()
@@ -155,6 +159,10 @@
{
getCurrentConfiguration().getContainers().setup();
}
+ if (getCurrentConfiguration().isStandalone())
+ {
+ getCurrentConfiguration().getStandaloneContainers().setup();
+ }
checkAssertionsEnabled();
}
@@ -170,6 +178,10 @@
{
getCurrentConfiguration().getContainers().cleanup();
}
+ if (getCurrentConfiguration().isStandalone())
+ {
+ getCurrentConfiguration().getStandaloneContainers().cleanup();
+ }
}
@BeforeClass(alwaysRun=true)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -46,7 +46,6 @@
private List<String> inContainerPackageNames;
private List<String> unitTestPackageNames;
private String host;
- private Class<?> testClass;
protected ConfigurationImpl()
{
@@ -68,7 +67,6 @@
this.el = configuration.getEl();
this.standaloneContainers = configuration.getStandaloneContainers();
this.host = configuration.getHost();
- this.testClass = configuration.getTestClass();
}
public String getOutputDirectory()
@@ -188,19 +186,6 @@
return Collections.unmodifiableList(inContainerPackageNames);
}
- public List<String> getStandaloneTestPackageNames()
- {
- if (unitTestPackageNames == null)
- {
- unitTestPackageNames = new ArrayList<String>();
- if (isStandalone())
- {
- unitTestPackageNames.add(UNIT_TEST_PACKAGE_NAME);
- }
- }
- return Collections.unmodifiableList(unitTestPackageNames);
- }
-
public EL getEl()
{
return el;
@@ -260,20 +245,8 @@
configuration.append("\tRun Integration Tests: ").append(isRunIntegrationTests()).append("\n");
configuration.append("\tStandalone: ").append(isStandalone()).append("\n");
configuration.append("\tTest Launcher: ").append(getTestLauncher()).append("\n");
- configuration.append("\tTest Class: ").append(getTestClass()).append("\n");
- configuration.append("\tStandalone Tests Pacakge Names: ").append(getStandaloneTestPackageNames()).append("\n");
return configuration.toString();
}
-
- public Class<?> getTestClass()
- {
- return testClass;
- }
-
- public void setTestClass(Class<?> testClass)
- {
- this.testClass = testClass;
- }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -27,7 +27,6 @@
setConnectTimeout(deploymentProperties.getIntValue(CONNECT_TIMEOUT_PROPERTY_NAME, DEFAULT_CONNECT_DELAY, false));
setLibraryDirectory(deploymentProperties.getStringValue(LIBRARY_DIRECTORY_PROPERTY_NAME, DEFAULT_LIBRARY_DIRECTORY, false));
setHost(deploymentProperties.getStringValue(HOST_PROPERTY_NAME, DEFAULT_HOST, false));
- setTestClass(deploymentProperties.getClassValue(TEST_CLASS_PROPERTY_NAME, null, false));
}
public PropertiesBasedConfigurationImpl loadSPIImplementation()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -59,13 +59,7 @@
}
testNG.setXmlSuites(suites);
}
-
- public void runInContainerTests()
- {
- }
-
-
@Override
public void dumpArtifacts()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -2,8 +2,8 @@
import javax.inject.DefinitionException;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java 2009-02-16 22:30:14 UTC (rev 1553)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java 2009-02-16 23:56:49 UTC (rev 1554)
@@ -69,7 +69,7 @@
assert root.listFiles(META_INF_FILTER).length == 1;
File metaInf = root.listFiles(META_INF_FILTER)[0];
- assert metaInf.listFiles().length == 2;
+ assert metaInf.listFiles().length == 1;
assert metaInf.listFiles(BEANS_XML_FILTER).length == 1;
assert metaInf.listFiles(BEANS_XML_FILTER)[0].length() == 0;
}
More information about the weld-commits
mailing list