[webbeans-commits] Webbeans SVN: r1694 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-24 18:05:26 -0500 (Tue, 24 Feb 2009)
New Revision: 1694
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
Log:
one more hanging stream
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-24 22:52:15 UTC (rev 1693)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-24 23:05:26 UTC (rev 1694)
@@ -173,15 +173,31 @@
public InputStream jar() throws IOException
{
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- Manifest manifest = new Manifest();
- Attributes attributes = manifest.getMainAttributes();
- attributes.putValue("Created-By", "JSR-299 TCK Harness");
- attributes.put(Attributes.Name.MANIFEST_VERSION, "1.0");
- JarOutputStream jarOutputStream = new JarOutputStream(byteArrayOutputStream, manifest);
- jar(root, jarOutputStream);
- jarOutputStream.close();
- return new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
+ ByteArrayOutputStream byteArrayOutputStream = null;
+ JarOutputStream jarOutputStream = null;
+ try
+ {
+ byteArrayOutputStream = new ByteArrayOutputStream();
+ Manifest manifest = new Manifest();
+ Attributes attributes = manifest.getMainAttributes();
+ attributes.putValue("Created-By", "JSR-299 TCK Harness");
+ attributes.put(Attributes.Name.MANIFEST_VERSION, "1.0");
+ jarOutputStream = new JarOutputStream(byteArrayOutputStream, manifest);
+ jar(root, jarOutputStream);
+ jarOutputStream.close();
+ return new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
+ }
+ finally
+ {
+ if (jarOutputStream != null)
+ {
+ jarOutputStream.close();
+ }
+ else if (byteArrayOutputStream != null)
+ {
+ byteArrayOutputStream.close();
+ }
+ }
}
private void jar(File directory, JarOutputStream jarOutputStream) throws IOException
@@ -326,14 +342,26 @@
private static void copyClass(String className, File root) throws IOException
{
- String classFilePathName = getClassFileName(className);
- String directoryName = classFilePathName.substring(0, classFilePathName.lastIndexOf("/"));
- String classFileName = classFilePathName.substring(classFilePathName.lastIndexOf("/") + 1);
- File packageDirectory = makeDirectoryStructure(root, directoryName);
- File classFile = new File(packageDirectory, classFileName);
- classFile.createNewFile();
- classFile.deleteOnExit();
- Files.copy(loadResourceAsStream(classFilePathName), classFile);
+ InputStream clazzStream = null;
+ try
+ {
+ String classFilePathName = getClassFileName(className);
+ String directoryName = classFilePathName.substring(0, classFilePathName.lastIndexOf("/"));
+ String classFileName = classFilePathName.substring(classFilePathName.lastIndexOf("/") + 1);
+ File packageDirectory = makeDirectoryStructure(root, directoryName);
+ File classFile = new File(packageDirectory, classFileName);
+ classFile.createNewFile();
+ classFile.deleteOnExit();
+ clazzStream = loadResourceAsStream(classFilePathName);
+ Files.copy(clazzStream, classFile);
+ }
+ finally
+ {
+ if (clazzStream != null)
+ {
+ clazzStream.close();
+ }
+ }
}
private static File makeDirectoryStructure(File root, String directoryName)
@@ -358,11 +386,11 @@
InputStream jar = null;
try
{
- File file = new File(outputDirectory, fileName);
- file.createNewFile();
- os = new BufferedOutputStream(new FileOutputStream(file));
- jar = getJarAsStream();
- Files.copy(jar, os);
+ File file = new File(outputDirectory, fileName);
+ file.createNewFile();
+ os = new BufferedOutputStream(new FileOutputStream(file));
+ jar = getJarAsStream();
+ Files.copy(jar, os);
}
finally
{
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1693 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck: impl/packaging and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-24 17:52:15 -0500 (Tue, 24 Feb 2009)
New Revision: 1693
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ResourceDescriptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EarArtifactDescriptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/util/Files.java
Log:
close streams
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-24 21:59:04 UTC (rev 1692)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-24 22:52:15 UTC (rev 1693)
@@ -1,6 +1,7 @@
package org.jboss.jsr299.tck;
import java.io.IOException;
+import java.io.InputStream;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Set;
@@ -83,7 +84,19 @@
{
if (isDeployToContainerNeeded())
{
- getCurrentConfiguration().getContainers().deploy(artifact.getJarAsStream(), artifact.getDefaultName());
+ InputStream jar = null;
+ try
+ {
+ jar = artifact.getJarAsStream();
+ getCurrentConfiguration().getContainers().deploy(jar, artifact.getDefaultName());
+ }
+ finally
+ {
+ if (jar != null)
+ {
+ jar.close();
+ }
+ }
}
else if (artifact != null && artifact.isUnit())
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-24 21:59:04 UTC (rev 1692)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-24 22:52:15 UTC (rev 1693)
@@ -240,11 +240,23 @@
public URL getJar() throws IOException
{
- InputStream is = getJarAsStream();
- File file = File.createTempFile(ArtifactDescriptor.class.getCanonicalName(), ".jar");
- file.deleteOnExit();
- copy(is, file);
- return file.toURI().toURL();
+ InputStream is = null;
+ try
+ {
+ is = getJarAsStream();
+ File file = File.createTempFile(ArtifactDescriptor.class.getCanonicalName(), ".jar");
+ file.deleteOnExit();
+ Files.copy(is, file);
+ is.close();
+ return file.toURI().toURL();
+ }
+ finally
+ {
+ if (is != null)
+ {
+ is.close();
+ }
+ }
}
public File getExplodedJar() throws IOException
@@ -309,7 +321,7 @@
File file = new File(directory, fileName);
file.createNewFile();
file.deleteOnExit();
- copy(resourceDescriptor.getSource().openStream(), file);
+ Files.copy(resourceDescriptor.getSource().openStream(), file);
}
private static void copyClass(String className, File root) throws IOException
@@ -321,7 +333,7 @@
File classFile = new File(packageDirectory, classFileName);
classFile.createNewFile();
classFile.deleteOnExit();
- copy(loadResourceAsStream(classFilePathName), classFile);
+ Files.copy(loadResourceAsStream(classFilePathName), classFile);
}
private static File makeDirectoryStructure(File root, String directoryName)
@@ -342,13 +354,27 @@
public void writeArtifactToDisk(String outputDirectory, String fileName) throws IOException
{
+ OutputStream os = null;
+ InputStream jar = null;
+ try
+ {
File file = new File(outputDirectory, fileName);
file.createNewFile();
- OutputStream os = new BufferedOutputStream(new FileOutputStream(file));
- InputStream jar = getJarAsStream();
+ os = new BufferedOutputStream(new FileOutputStream(file));
+ jar = getJarAsStream();
Files.copy(jar, os);
- jar.close();
- os.close();
+ }
+ finally
+ {
+ if (os != null)
+ {
+ os.close();
+ }
+ if (jar != null)
+ {
+ jar.close();
+ }
+ }
}
public String getDefaultName()
@@ -361,25 +387,6 @@
return className.replace('.', '/') + ".class";
}
- private static void copy(InputStream inputStream, File file) throws IOException
- {
- OutputStream os = new FileOutputStream(file);
- try
- {
- byte[] buf = new byte[1024];
- int i = 0;
- while ((i = inputStream.read(buf)) != -1)
- {
- os.write(buf, 0, i);
- }
- }
- finally
- {
- os.close();
- }
-
- }
-
public Set<Class<?>> getClasses()
{
return classes;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ResourceDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ResourceDescriptor.java 2009-02-24 21:59:04 UTC (rev 1692)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ResourceDescriptor.java 2009-02-24 22:52:15 UTC (rev 1693)
@@ -3,12 +3,12 @@
import static org.jboss.jsr299.tck.impl.util.Reflections.loadResource;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.net.URL;
+import org.jboss.jsr299.tck.impl.util.Files;
+
public class ResourceDescriptor
{
@@ -20,7 +20,7 @@
this.name = name;
File file = File.createTempFile(ResourceDescriptor.class.getName(), null);
file.deleteOnExit();
- copy(source, file);
+ Files.copy(source, file);
this.source = file.toURI().toURL();
}
@@ -80,23 +80,4 @@
return name + " (" + source.toString() + ")";
}
- private static void copy(InputStream inputStream, File file) throws IOException
- {
- OutputStream os = new FileOutputStream(file);
- try
- {
- byte[] buf = new byte[1024];
- int i = 0;
- while ((i = inputStream.read(buf)) != -1)
- {
- os.write(buf, 0, i);
- }
- }
- finally
- {
- os.close();
- }
-
- }
-
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EarArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EarArtifactDescriptor.java 2009-02-24 21:59:04 UTC (rev 1692)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ear/EarArtifactDescriptor.java 2009-02-24 22:52:15 UTC (rev 1693)
@@ -42,15 +42,30 @@
}
};
+ InputStream applicationXml = null;
try
{
- getResources().add(new ResourceDescriptor(APPLICATION_XML_DESTINATION, getApplicationXml(declaringClass)));
+ applicationXml = getApplicationXml(declaringClass);
+ getResources().add(new ResourceDescriptor(APPLICATION_XML_DESTINATION, applicationXml));
}
catch (IOException e)
{
- log.warn("Error generating ear");
+ log.warn("Error generating ear", e);
}
-
+ finally
+ {
+ if (applicationXml != null)
+ {
+ try
+ {
+ applicationXml.close();
+ }
+ catch (IOException e1)
+ {
+ log.error("Error generating ear", e1);
+ }
+ }
+ }
}
@Override
@@ -110,24 +125,31 @@
private static InputStream getApplicationXml(Class<?> declaringClass) throws IOException
{
ByteArrayOutputStream os = new ByteArrayOutputStream();
- Writer writer = new PrintWriter(os);
- writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
- writer.write("<application xmlns=\"http://java.sun.com/xml/ns/javaee\" \n" +
- "\t\txmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" +
- "\t\txsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd\" \n" +
- "\t\tversion=\"5\">\n\n");
- writer.write("\t<display-name>JSR-99 TCK: " + declaringClass.getName() + "</display-name>\n\n");
- writer.write("\t<module>\n" +
- "\t\t<web>\n" +
- "\t\t\t<web-uri>" + declaringClass.getName() +".war</web-uri>\n" +
- "\t\t\t<context-root>/" + declaringClass.getName() + "</context-root>\n" +
- "\t\t</web>\n" +
- "\t</module>\n\n");
- writer.write("\t<module>\n" +
- "\t\t<ejb>" + declaringClass.getName() +".jar</ejb>\n" +
- "\t</module>\n\n");
- writer.write("</application>\n");
- writer.flush();
- return new ByteArrayInputStream(os.toByteArray());
+ try
+ {
+ Writer writer = new PrintWriter(os);
+ writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+ writer.write("<application xmlns=\"http://java.sun.com/xml/ns/javaee\" \n" +
+ "\t\txmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" +
+ "\t\txsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd\" \n" +
+ "\t\tversion=\"5\">\n\n");
+ writer.write("\t<display-name>JSR-99 TCK: " + declaringClass.getName() + "</display-name>\n\n");
+ writer.write("\t<module>\n" +
+ "\t\t<web>\n" +
+ "\t\t\t<web-uri>" + declaringClass.getName() +".war</web-uri>\n" +
+ "\t\t\t<context-root>/" + declaringClass.getName() + "</context-root>\n" +
+ "\t\t</web>\n" +
+ "\t</module>\n\n");
+ writer.write("\t<module>\n" +
+ "\t\t<ejb>" + declaringClass.getName() +".jar</ejb>\n" +
+ "\t</module>\n\n");
+ writer.write("</application>\n");
+ writer.flush();
+ return new ByteArrayInputStream(os.toByteArray());
+ }
+ finally
+ {
+ os.close();
+ }
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java 2009-02-24 21:59:04 UTC (rev 1692)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java 2009-02-24 22:52:15 UTC (rev 1693)
@@ -50,24 +50,47 @@
getLibraries().add(new ResourceDescriptor("testng.jar", "/lib/testng-jdk15.jar"));
getLibraries().add(new ResourceDescriptor("jsr-299-tck-api.jar", "/lib/jsr299-tck-api.jar"));
getLibraries().add(getTckSupportJar());
+ InputStream deploymentProperties = null;
try
{
- getResources().add(new ResourceDescriptor(getClassesRoot() + DeploymentProperties.RESOURCE_BUNDLE, getDeploymentProperties(declaringClass)));
+ deploymentProperties = getDeploymentProperties(declaringClass);
+ getResources().add(new ResourceDescriptor(getClassesRoot() + DeploymentProperties.RESOURCE_BUNDLE, deploymentProperties));
}
catch (IOException e)
{
log.warn("Error generating deployment properties", e);
}
+ finally
+ {
+ if (deploymentProperties != null)
+ {
+ try
+ {
+ deploymentProperties.close();
+ }
+ catch (IOException e)
+ {
+ log.error("Error generating deployment properties", e);
+ }
+ }
+ }
}
}
private static InputStream getDeploymentProperties(Class<?> declaringClass) throws IOException
{
ByteArrayOutputStream os = new ByteArrayOutputStream();
- Writer writer = new PrintWriter(os);
- writer.write("className=" + declaringClass.getName());
- writer.flush();
- return new ByteArrayInputStream(os.toByteArray());
+ try
+ {
+ Writer writer = new PrintWriter(os);
+ writer.write("className=" + declaringClass.getName());
+ writer.flush();
+ return new ByteArrayInputStream(os.toByteArray());
+ }
+ finally
+ {
+ os.close();
+ }
}
public boolean isUnit()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/util/Files.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/util/Files.java 2009-02-24 21:59:04 UTC (rev 1692)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/util/Files.java 2009-02-24 22:52:15 UTC (rev 1693)
@@ -1,5 +1,7 @@
package org.jboss.jsr299.tck.impl.util;
+import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -16,5 +18,19 @@
destination.write(readBuffer, 0, bytesIn);
}
}
+
+ public static void copy(InputStream inputStream, File file) throws IOException
+ {
+ OutputStream os = new FileOutputStream(file);
+ try
+ {
+ copy(inputStream, os);
+ }
+ finally
+ {
+ os.close();
+ }
+ }
+
}
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1692 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner: servlet and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-24 16:59:04 -0500 (Tue, 24 Feb 2009)
New Revision: 1692
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java
Log:
Fix expected exceptions for debug servlet mode
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java 2009-02-24 21:37:57 UTC (rev 1691)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java 2009-02-24 21:59:04 UTC (rev 1692)
@@ -39,7 +39,7 @@
return methodNames;
}
- public void run()
+ public void run(boolean ignoreExpectedExceptions)
{
AbstractDeclarativeTest.setInContainer(true);
if (classNames.size() == 0)
@@ -54,7 +54,10 @@
List<XmlSuite> xmlSuites = new ArrayList<XmlSuite>();
testNG.setXmlSuites(xmlSuites);
xmlSuites.add(createSuite());
- testNG.setAnnotationTransformer(new RemoveExpectedExceptionsAnnotationTransformer());
+ if (ignoreExpectedExceptions)
+ {
+ testNG.setAnnotationTransformer(new RemoveExpectedExceptionsAnnotationTransformer());
+ }
testNG.run();
this.context = listener.getContext();
this.testResults = listener.getTestResults();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java 2009-02-24 21:37:57 UTC (rev 1691)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java 2009-02-24 21:59:04 UTC (rev 1692)
@@ -45,9 +45,10 @@
resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "No method name specified");
return;
}
- runner.run();
+
if (outputMode.equals("html"))
{
+ runner.run(false);
resp.setContentType("text/html");
resp.setStatus(HttpServletResponse.SC_OK);
PrintWriter writer = resp.getWriter();
@@ -90,7 +91,7 @@
}
else if (outputMode.equals("serializedObject"))
{
-
+ runner.run(true);
ObjectOutputStream oos = new ObjectOutputStream(resp.getOutputStream());
if (runner.getTestResults().size() == 1)
{
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1691 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/event/register and 4 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-02-24 16:37:57 -0500 (Tue, 24 Feb 2009)
New Revision: 1691
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/AuroraFinch.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/BirdCage.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/BlueFacedParrotFinch.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/FinchKeeper.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/ImplicitEventBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/OrangeCheekedWaxbill.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/StarFinch.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/Tame.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/register/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/register/fires1/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/register/fires1/beans.xml
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AuroraFinch.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BirdCage.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BlueFacedParrotFinch.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FinchKeeper.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StarFinch.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java
Log:
Refactored one of the tests for events.
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AuroraFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AuroraFinch.java 2009-02-24 21:09:12 UTC (rev 1690)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AuroraFinch.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -1,26 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.event.Event;
-import javax.event.Fires;
-import javax.inject.Initializer;
-
-import org.jboss.jsr299.tck.unit.event.StarFinch.Mess;
-
-class AuroraFinch
-{
-
- private Mess someMess;
-
- @Initializer
- public AuroraFinch(@Fires Event<Mess> eventObject)
- {
- // Create a new mess and fire the event for it
- someMess = new Mess("smallMess");
- eventObject.fire(someMess);
- }
-
- public Mess getSomeMess()
- {
- return someMess;
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BirdCage.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BirdCage.java 2009-02-24 21:09:12 UTC (rev 1690)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BirdCage.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -1,24 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.annotation.Named;
-import javax.context.RequestScoped;
-import javax.inject.Current;
-
-import org.jboss.jsr299.tck.unit.event.StarFinch.Mess;
-
-@RequestScoped
-@Named("BirdCage")
-class BirdCage
-{
- @Current
- private Mess someMess;
-
- public BirdCage()
- {
- }
-
- public Mess getSomeMess()
- {
- return someMess;
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BlueFacedParrotFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BlueFacedParrotFinch.java 2009-02-24 21:09:12 UTC (rev 1690)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BlueFacedParrotFinch.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -1,31 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.event.Event;
-import javax.event.Fires;
-import javax.event.Observer;
-
-class BlueFacedParrotFinch
-{
- @Fires
- private Event<String> simpleEvent;
-
- public void methodThatFiresEvent()
- {
- simpleEvent.fire("An event");
- }
-
- public void methodThatRegistersObserver()
- {
- simpleEvent.observe(new Observer<String>()
- {
- public void notify(String event)
- {
- }
- });
- }
-
- public Event<String> getSimpleEvent()
- {
- return simpleEvent;
- }
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-24 21:09:12 UTC (rev 1690)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -600,69 +600,6 @@
}.run();
}
- @Test(groups = { "events", "broken" })
- @SpecAssertion(section = "7.6", id = "i")
- public void testFiresAnnotationOnEventTypes() throws Exception
- {
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- BlueFacedParrotFinch bean = getCurrentManager().getInstanceByType(BlueFacedParrotFinch.class);
- bean.methodThatRegistersObserver();
-
- Set<Observer<String>> observers = getCurrentManager().resolveObservers("String type event");
- assert observers.size() == 1;
- }
-
- }.run();
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- StarFinch starFinch = getCurrentManager().getInstanceByType(StarFinch.class);
- FinchKeeper birdKeeper = getCurrentManager().getInstanceByType(FinchKeeper.class);
- BirdCage birdCage = getCurrentManager().getInstanceByType(BirdCage.class);
- assert starFinch != null;
- assert birdCage != null;
- assert birdCage.getSomeMess() != null;
- assert birdKeeper.isNewMessDetected();
- }
-
- }.run();
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- OrangeCheekedWaxbill bird = getCurrentManager().getInstanceByType(OrangeCheekedWaxbill.class);
- FinchKeeper birdKeeper = getCurrentManager().getInstanceByType(FinchKeeper.class);
- assert bird != null;
- assert bird.getSomeMess() != null;
- assert birdKeeper.isNewMessDetected();
- }
-
- }.run();
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- AuroraFinch bird = getCurrentManager().getInstanceByType(AuroraFinch.class);
- FinchKeeper birdKeeper = getCurrentManager().getInstanceByType(FinchKeeper.class);
- assert bird != null;
- assert birdKeeper.isNewMessDetected();
- }
-
- }.run();
- }
-
@Test(groups = { "events" })
@SpecAssertion(section = "7.6", id = "n")
public void testImplicitEventBeanMatchesAPITypeOfInectionPoint() throws Exception
@@ -682,7 +619,7 @@
}.run();
}
- @Test(groups = { "events" })
+ @Test(groups = { "events", "broken" })
@SpecAssertion(section = "7.6", id = "n")
public void testImplicitEventBeanMatchesBindingAnnotationsOfInjectionPoint() throws Exception
{
@@ -802,21 +739,21 @@
@Test(groups = { "events", "underInvestigation" })
@SpecAssertion(section = "7.6", id = "u")
- public void testObserveMethodCallsManagerAddObserverWithObserverObject()
+ public void testObserverMethodCallsManagerAddObserverWithObserverObject()
{
assert false;
}
@Test(groups = { "events", "underInvestigation" })
@SpecAssertion(section = "7.6", id = "u")
- public void testObserveMethodCallsManagerAddObserverWithAllBindingAnnotationsExceptFires()
+ public void testObserverMethodCallsManagerAddObserverWithAllBindingAnnotationsExceptFires()
{
assert false;
}
@Test(groups = { "events", "underInvestigation" })
@SpecAssertion(section = "7.6", id = "u")
- public void testObserveMethodCallsManagerAddObserverWithAllBindingAnnotationInstance()
+ public void testObserverMethodCallsManagerAddObserverWithAllBindingAnnotationInstance()
{
assert false;
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FinchKeeper.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FinchKeeper.java 2009-02-24 21:09:12 UTC (rev 1690)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FinchKeeper.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -1,28 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.annotation.Named;
-import javax.context.RequestScoped;
-import javax.event.Observes;
-
-import org.jboss.jsr299.tck.unit.event.StarFinch.Mess;
-
-@RequestScoped
-@Named("FinchKeeper")
-class FinchKeeper
-{
- public FinchKeeper()
- {
- }
-
- private boolean newMessDetected = false;
-
- public void observesMesses(@Observes Mess aNewMess)
- {
- newMessDetected = true;
- }
-
- public boolean isNewMessDetected()
- {
- return newMessDetected;
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java 2009-02-24 21:09:12 UTC (rev 1690)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -1,36 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.event.Event;
-import javax.event.Fires;
-import javax.inject.Initializer;
-
-import org.jboss.jsr299.tck.unit.event.StarFinch.Mess;
-
-class OrangeCheekedWaxbill
-{
-
- private Mess someMess;
- private Event<Mess> injectedEvent;
-
- public OrangeCheekedWaxbill()
- {
- }
-
- @Initializer
- public void theInitializerMethod(@Fires @Tame Event<Mess> eventObject)
- {
- // Create a new mess and fire the event for it
- someMess = new Mess("tameMess");
- eventObject.fire(someMess);
- }
-
- public Event<Mess> getInjectedEvent()
- {
- return injectedEvent;
- }
-
- public Mess getSomeMess()
- {
- return someMess;
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StarFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StarFinch.java 2009-02-24 21:09:12 UTC (rev 1690)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StarFinch.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -1,32 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.annotation.Named;
-import javax.context.RequestScoped;
-import javax.event.Event;
-import javax.event.Fires;
-import javax.inject.Produces;
-
-@RequestScoped
-@Named("StarFinch")
-class StarFinch
-{
- public static class Mess
- {
- public Mess(String name)
- {
-
- }
- }
-
- public StarFinch()
- {
- }
-
- @Produces @AnotherDeploymentType
- public Mess producerOfMesses(@Fires Event<Mess> messEvent)
- {
- Mess newMess = new Mess("bigMess");
- messEvent.fire(newMess);
- return newMess;
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/AnotherDeploymentType.java (from rev 1683, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AnotherDeploymentType.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/AnotherDeploymentType.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.event.register.fires1;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.DeploymentType;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@interface AnotherDeploymentType
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/AuroraFinch.java (from rev 1683, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AuroraFinch.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/AuroraFinch.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/AuroraFinch.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -0,0 +1,27 @@
+package org.jboss.jsr299.tck.unit.event.register.fires1;
+
+import javax.event.Event;
+import javax.event.Fires;
+import javax.inject.Initializer;
+
+import org.jboss.jsr299.tck.unit.event.register.fires1.StarFinch.Mess;
+
+
+class AuroraFinch
+{
+
+ private Mess someMess;
+
+ @Initializer
+ public AuroraFinch(@Fires Event<Mess> eventObject)
+ {
+ // Create a new mess and fire the event for it
+ someMess = new Mess("smallMess");
+ eventObject.fire(someMess);
+ }
+
+ public Mess getSomeMess()
+ {
+ return someMess;
+ }
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/BirdCage.java (from rev 1683, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BirdCage.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/BirdCage.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/BirdCage.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.unit.event.register.fires1;
+
+import javax.annotation.Named;
+import javax.context.RequestScoped;
+import javax.inject.Current;
+
+import org.jboss.jsr299.tck.unit.event.register.fires1.StarFinch.Mess;
+
+@RequestScoped
+@Named("BirdCage")
+class BirdCage
+{
+ @Current
+ private Mess someMess;
+
+ public BirdCage()
+ {
+ }
+
+ public Mess getSomeMess()
+ {
+ return someMess;
+ }
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/BlueFacedParrotFinch.java (from rev 1683, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BlueFacedParrotFinch.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/BlueFacedParrotFinch.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/BlueFacedParrotFinch.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -0,0 +1,31 @@
+package org.jboss.jsr299.tck.unit.event.register.fires1;
+
+import javax.event.Event;
+import javax.event.Fires;
+import javax.event.Observer;
+
+class BlueFacedParrotFinch
+{
+ @Fires
+ private Event<String> simpleEvent;
+
+ public void methodThatFiresEvent()
+ {
+ simpleEvent.fire("An event");
+ }
+
+ public void methodThatRegistersObserver()
+ {
+ simpleEvent.observe(new Observer<String>()
+ {
+ public void notify(String event)
+ {
+ }
+ });
+ }
+
+ public Event<String> getSimpleEvent()
+ {
+ return simpleEvent;
+ }
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/FinchKeeper.java (from rev 1683, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FinchKeeper.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/FinchKeeper.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/FinchKeeper.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -0,0 +1,28 @@
+package org.jboss.jsr299.tck.unit.event.register.fires1;
+
+import javax.annotation.Named;
+import javax.context.RequestScoped;
+import javax.event.Observes;
+
+import org.jboss.jsr299.tck.unit.event.register.fires1.StarFinch.Mess;
+
+@RequestScoped
+@Named("FinchKeeper")
+class FinchKeeper
+{
+ public FinchKeeper()
+ {
+ }
+
+ private boolean newMessDetected = false;
+
+ public void observesMesses(@Observes Mess aNewMess)
+ {
+ newMessDetected = true;
+ }
+
+ public boolean isNewMessDetected()
+ {
+ return newMessDetected;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/ImplicitEventBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/ImplicitEventBeanTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/ImplicitEventBeanTest.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.register.fires1;
+
+import java.util.Set;
+
+import javax.event.Observer;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * Tests proper functioning of the implicit event bean injected
+ * when @Fires is used on an Event<T> type.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+@BeansXml("beans.xml")
+public class ImplicitEventBeanTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events", "broken" })
+ @SpecAssertion(section = "7.6", id = "i")
+ public void testFiresAnnotationOnEventTypes() throws Exception
+ {
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ BlueFacedParrotFinch bean = getCurrentManager().getInstanceByType(BlueFacedParrotFinch.class);
+ bean.methodThatRegistersObserver();
+
+ Set<Observer<String>> observers = getCurrentManager().resolveObservers("String type event");
+ assert observers.size() == 1;
+ }
+
+ }.run();
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ StarFinch starFinch = getCurrentManager().getInstanceByType(StarFinch.class);
+ FinchKeeper birdKeeper = getCurrentManager().getInstanceByType(FinchKeeper.class);
+ BirdCage birdCage = getCurrentManager().getInstanceByType(BirdCage.class);
+ assert starFinch != null;
+ assert birdCage != null;
+ assert birdCage.getSomeMess() != null;
+ assert birdKeeper.isNewMessDetected();
+ }
+
+ }.run();
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ OrangeCheekedWaxbill bird = getCurrentManager().getInstanceByType(OrangeCheekedWaxbill.class);
+ FinchKeeper birdKeeper = getCurrentManager().getInstanceByType(FinchKeeper.class);
+ assert bird != null;
+ assert bird.getSomeMess() != null;
+ assert birdKeeper.isNewMessDetected();
+ }
+
+ }.run();
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ AuroraFinch bird = getCurrentManager().getInstanceByType(AuroraFinch.class);
+ FinchKeeper birdKeeper = getCurrentManager().getInstanceByType(FinchKeeper.class);
+ assert bird != null;
+ assert birdKeeper.isNewMessDetected();
+ }
+
+ }.run();
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/ImplicitEventBeanTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/OrangeCheekedWaxbill.java (from rev 1683, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/OrangeCheekedWaxbill.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/OrangeCheekedWaxbill.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -0,0 +1,36 @@
+package org.jboss.jsr299.tck.unit.event.register.fires1;
+
+import javax.event.Event;
+import javax.event.Fires;
+import javax.inject.Initializer;
+
+import org.jboss.jsr299.tck.unit.event.register.fires1.StarFinch.Mess;
+
+class OrangeCheekedWaxbill
+{
+
+ private Mess someMess;
+ private Event<Mess> injectedEvent;
+
+ public OrangeCheekedWaxbill()
+ {
+ }
+
+ @Initializer
+ public void theInitializerMethod(@Fires @Tame Event<Mess> eventObject)
+ {
+ // Create a new mess and fire the event for it
+ someMess = new Mess("tameMess");
+ eventObject.fire(someMess);
+ }
+
+ public Event<Mess> getInjectedEvent()
+ {
+ return injectedEvent;
+ }
+
+ public Mess getSomeMess()
+ {
+ return someMess;
+ }
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/StarFinch.java (from rev 1683, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StarFinch.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/StarFinch.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/StarFinch.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -0,0 +1,32 @@
+package org.jboss.jsr299.tck.unit.event.register.fires1;
+
+import javax.annotation.Named;
+import javax.context.RequestScoped;
+import javax.event.Event;
+import javax.event.Fires;
+import javax.inject.Produces;
+
+@RequestScoped
+@Named("StarFinch")
+public class StarFinch
+{
+ public static class Mess
+ {
+ public Mess(String name)
+ {
+
+ }
+ }
+
+ public StarFinch()
+ {
+ }
+
+ @Produces @AnotherDeploymentType
+ public Mess producerOfMesses(@Fires Event<Mess> messEvent)
+ {
+ Mess newMess = new Mess("bigMess");
+ messEvent.fire(newMess);
+ return newMess;
+ }
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/Tame.java (from rev 1683, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Tame.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/Tame.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/fires1/Tame.java 2009-02-24 21:37:57 UTC (rev 1691)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.unit.event.register.fires1;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Tame
+{
+
+}
Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/register/fires1/beans.xml (from rev 1683, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/beans.xml)
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/register/fires1/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/register/fires1/beans.xml 2009-02-24 21:37:57 UTC (rev 1691)
@@ -0,0 +1,8 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.unit.event.register.fires1">
+ <Deploy>
+ <Standard />
+ <Production />
+ <test:AnotherDeploymentType />
+ </Deploy>
+</Beans>
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1690 - ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-24 16:09:12 -0500 (Tue, 24 Feb 2009)
New Revision: 1690
Modified:
ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties
Log:
minor
Modified: ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties
===================================================================
--- ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties 2009-02-24 21:00:41 UTC (rev 1689)
+++ ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties 2009-02-24 21:09:12 UTC (rev 1690)
@@ -1,3 +1,5 @@
+# Configuration for running incontainer tests from your IDE
+# Alter the path webbeans accordingly (relative from the tck/impl dir)
org.jboss.jsr299.tck.standalone=false
jboss-as.dir=../../webbeans/jboss-as
jboss.force.restart=false
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1689 - in ri/trunk/jboss-tck-runner/src/test: debug-resources and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-24 16:00:41 -0500 (Tue, 24 Feb 2009)
New Revision: 1689
Added:
ri/trunk/jboss-tck-runner/src/test/debug-resources/
ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/
ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties
Removed:
ri/trunk/jboss-tck-runner/src/test/resources/debug/META-INF/
Log:
Slightly better version of debug properties
Added: ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties
===================================================================
--- ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties (rev 0)
+++ ri/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/web-beans-tck.properties 2009-02-24 21:00:41 UTC (rev 1689)
@@ -0,0 +1,5 @@
+org.jboss.jsr299.tck.standalone=false
+jboss-as.dir=../../webbeans/jboss-as
+jboss.force.restart=false
+org.jboss.jsr299.tck.libraryDirectory=../../webbeans/jboss-tck-runner/target/dependency/lib
+org.jboss.jsr299.tck.runIntegrationTests=true
\ No newline at end of file
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1688 - in ri/trunk/jboss-tck-runner/src: main/java/org/jboss/webbeans/tck/integration/jbossas/util and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-24 15:47:28 -0500 (Tue, 24 Feb 2009)
New Revision: 1688
Added:
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/DeploymentProperties.java
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/EnumerationIterable.java
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/EnumerationIterator.java
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/ResourceLoadingException.java
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/SimpleResourceLoader.java
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/Strings.java
ri/trunk/jboss-tck-runner/src/test/resources/debug/
ri/trunk/jboss-tck-runner/src/test/resources/debug/META-INF/
ri/trunk/jboss-tck-runner/src/test/resources/debug/META-INF/web-beans-tck.properties
Modified:
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
Log:
Add suitable config for running tests incontainer from an IDE
Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java 2009-02-24 19:59:44 UTC (rev 1687)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java 2009-02-24 20:47:28 UTC (rev 1688)
@@ -2,7 +2,6 @@
import java.io.DataOutputStream;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
@@ -16,6 +15,7 @@
import org.jboss.jsr299.tck.api.Configurable;
import org.jboss.jsr299.tck.api.Configuration;
import org.jboss.jsr299.tck.spi.Containers;
+import org.jboss.webbeans.tck.integration.jbossas.util.DeploymentProperties;
/**
*
@@ -36,12 +36,19 @@
private static Logger log = Logger.getLogger(AbstractContainersImpl.class);
+ private final DeploymentProperties properties;
+
private Configuration configuration;
protected String jbossHome;
private String jbossHttpUrl;
private boolean jbossWasStarted;
private long bootTimeout;
private String javaOpts;
+
+ public AbstractContainersImpl()
+ {
+ this.properties = new DeploymentProperties();
+ }
protected static void copy(InputStream inputStream, File file) throws IOException
{
@@ -94,9 +101,10 @@
public void setup() throws IOException
{
- if (System.getProperty(JBOSS_AS_DIR_PROPERTY_NAME) != null)
+ String jbossAsPath = properties.getStringValue(JBOSS_AS_DIR_PROPERTY_NAME, "../jboss-as", false);
+ if (jbossAsPath != null)
{
- File jbossAsDir = new File(System.getProperty(JBOSS_AS_DIR_PROPERTY_NAME));
+ File jbossAsDir = new File(jbossAsPath);
if (jbossAsDir.isDirectory())
{
File buildProperties = new File(jbossAsDir, "build.properties");
@@ -111,27 +119,15 @@
}
}
}
- jbossHome = System.getProperty(JBOSS_HOME_PROPERTY_NAME);
- javaOpts = System.getProperty(JAVA_OPTS_PROPERTY_NAME);
- if (javaOpts == null)
- {
- javaOpts = "";
- }
+ jbossHome = properties.getStringValue(JBOSS_HOME_PROPERTY_NAME, null, true);
+ javaOpts = properties.getStringValue(JAVA_OPTS_PROPERTY_NAME, "", false);
javaOpts = javaOpts + JAVA_OPTS;
- if (jbossHome == null)
+ File jbossHomeFile = new File(jbossHome);
+ jbossHome = jbossHomeFile.getPath();
+ log.info("Using JBoss instance in " + jbossHome + " at URL " + configuration.getHost());
+ this.bootTimeout = properties.getLongValue(JBOSS_BOOT_TIMEOUT_PROPERTY_NAME, 240000, false);
+ if (properties.getBooleanValue(FORCE_RESTART_PROPERTY_NAME, false, false))
{
- throw new IllegalArgumentException("-D" + JBOSS_HOME_PROPERTY_NAME + " must be set");
- }
- else
- {
- jbossHome = System.getProperty(JBOSS_HOME_PROPERTY_NAME);
- File jbossHomeFile = new File(jbossHome);
- jbossHome = jbossHomeFile.getPath();
- log.info("Using JBoss instance in " + jbossHome + " at URL " + configuration.getHost());
- }
- this.bootTimeout = Long.getLong(JBOSS_BOOT_TIMEOUT_PROPERTY_NAME, 240000);
- if (Boolean.getBoolean(FORCE_RESTART_PROPERTY_NAME))
- {
if (isJBossUp())
{
log.info("Shutting down JBoss instance as in force-restart mode");
Added: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/DeploymentProperties.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/DeploymentProperties.java (rev 0)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/DeploymentProperties.java 2009-02-24 20:47:28 UTC (rev 1688)
@@ -0,0 +1,233 @@
+package org.jboss.webbeans.tck.integration.jbossas.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+
+/**
+ * Utility class to load deployment properties
+ *
+ * @author Pete Muir
+ */
+public class DeploymentProperties
+{
+ // The resource bundle used to control Web Beans RI deployment
+ public static final String RESOURCE_BUNDLE = "META-INF/web-beans-tck.properties";
+
+ private static final Logger log = Logger.getLogger(DeploymentProperties.class);
+
+ // The class to work from
+ private SimpleResourceLoader resourceLoader;
+
+ /**
+ * Constructor
+ *
+ * @param classLoader The classloader to work on
+ */
+ public DeploymentProperties()
+ {
+ this.resourceLoader = new SimpleResourceLoader();
+ }
+
+ /**
+ * Get a list of possible values for a given key.
+ *
+ * First, System properties are tried, followed by the specified resource
+ * bundle (first in classpath only).
+ *
+ * @param key The key to search for
+ * @return A list of possible values. An empty list is returned if there are
+ * no matches.
+ */
+ public List<String> getPropertyValues(String key)
+ {
+ List<String> values = new ArrayList<String>();
+ addPropertiesFromSystem(key, values);
+ addPropertiesFromResourceBundle(key, values);
+ return values;
+ }
+
+ /**
+ * Adds matches from system properties
+ *
+ * @param key The key to match
+ * @param values The currently found values
+ */
+ private void addPropertiesFromSystem(String key, List<String> values)
+ {
+ addProperty(key, System.getProperty(key), values);
+ }
+
+ /**
+ * Adds matches from detected resource bundles
+ *
+ * @param key The key to match
+ * @param values The currently found values
+ */
+ private void addPropertiesFromResourceBundle(String key, List<String> values)
+ {
+ try
+ {
+ for (URL url : resourceLoader.getResources(RESOURCE_BUNDLE))
+ {
+ Properties properties = new Properties();
+ InputStream propertyStream = url.openStream();
+ try
+ {
+ properties.load(propertyStream);
+ addProperty(key, properties.getProperty(key), values);
+ }
+ finally
+ {
+ if (propertyStream != null)
+ {
+ propertyStream.close();
+ }
+ }
+ }
+ }
+ catch (IOException e)
+ {
+ // No - op, file is optional
+ }
+ }
+
+ /**
+ * Add the property to the set of properties only if it hasn't already been
+ * added
+ *
+ * @param key The key searched for
+ * @param value The value of the property
+ * @param values The currently found values
+ */
+ private void addProperty(String key, String value, List<String> values)
+ {
+ if (value != null)
+ {
+ values.add(value);
+ }
+
+ }
+
+ /**
+ * Gets the possible implementation class for a given property for which the
+ * values are classanames
+ *
+ * @param deploymentProperties The deployment properties object to use
+ * @param resourceLoader The resource laoder to use to attempt
+ * @param propertyName The name of the property to load
+ * @return A set of classes specified
+ */
+ @SuppressWarnings("unchecked")
+ public <T> Set<Class<T>> getClasses(String propertyName, Class<T> expectedType)
+ {
+ Set<Class<T>> classes = new HashSet<Class<T>>();
+ for (String className : getPropertyValues(propertyName))
+ {
+ try
+ {
+ classes.add((Class<T>) resourceLoader.classForName(className));
+ }
+ catch (ResourceLoadingException e)
+ {
+ //log.debug("Unable to load class " + className + " for property " + propertyName, e);
+ }
+ }
+ return classes;
+ }
+
+ public <T> Class<T> getClassValue(String propertyName, Class<T> expectedType, boolean required)
+ {
+ Set<Class<T>> classes = getClasses(propertyName, expectedType);
+ if (classes.size() == 0)
+ {
+ if (required)
+ {
+ throw new IllegalArgumentException("Cannot find any implementations of " + expectedType.getSimpleName() + ", check that " + propertyName + " is specified");
+ }
+ else
+ {
+ return null;
+ }
+ }
+ else if (classes.size() > 1)
+ {
+ throw new IllegalArgumentException("More than one implementation of " + expectedType.getSimpleName() + " specified by " + propertyName + ", not sure which one to use!");
+ }
+ else
+ {
+ return classes.iterator().next();
+ }
+ }
+
+ public <T> T getInstanceValue(String propertyName, Class<T> expectedType, boolean required)
+ {
+ Class<T> clazz = getClassValue(propertyName, expectedType, required);
+ if (clazz != null)
+ {
+ try
+ {
+ return clazz.newInstance();
+ }
+ catch (InstantiationException e)
+ {
+ throw new IllegalStateException("Error instantiating " + clazz + " specified by " + propertyName, e);
+ }
+ catch (IllegalAccessException e)
+ {
+ throw new IllegalStateException("Error instantiating " + clazz + " specified by " + propertyName, e);
+ }
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ public boolean getBooleanValue(String propertyName, boolean _default, boolean required)
+ {
+ return Boolean.valueOf(getStringValue(propertyName, _default ? "true" : "false", required));
+ }
+
+ public int getIntValue(String propertyName, int _default, boolean required)
+ {
+ return Integer.valueOf(getStringValue(propertyName, Integer.toString(_default), required)).intValue();
+ }
+
+ public long getLongValue(String propertyName, long _default, boolean required)
+ {
+ return Long.valueOf(getStringValue(propertyName, Long.toString(_default), required)).longValue();
+ }
+
+ public String getStringValue(String propertyName, String _default, boolean required)
+ {
+ List<String> values = getPropertyValues(propertyName);
+ if (values.size() == 0)
+ {
+ if (required)
+ {
+ throw new IllegalArgumentException("Cannot find required property " + propertyName + ", check that it is specified");
+ }
+ else
+ {
+ return _default;
+ }
+ }
+ else if (values.size() > 1)
+ {
+ throw new IllegalArgumentException("More than one value given for " + propertyName + ", not sure which one to use!");
+ }
+ else
+ {
+ return values.iterator().next();
+ }
+ }
+
+}
\ No newline at end of file
Property changes on: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/DeploymentProperties.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/EnumerationIterable.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/EnumerationIterable.java (rev 0)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/EnumerationIterable.java 2009-02-24 20:47:28 UTC (rev 1688)
@@ -0,0 +1,37 @@
+package org.jboss.webbeans.tck.integration.jbossas.util;
+
+import java.util.Enumeration;
+import java.util.Iterator;
+
+/**
+ * An Enumeration -> Iteratble adaptor
+ *
+ * @author Pete Muir
+ * @see org.jboss.webbeans.util.EnumerationIterator
+ */
+class EnumerationIterable<T> implements Iterable<T>
+{
+ // The enumeration-iteartor
+ private EnumerationIterator<T> iterator;
+
+ /**
+ * Constructor
+ *
+ * @param enumeration The enumeration
+ */
+ public EnumerationIterable(Enumeration<T> enumeration)
+ {
+ this.iterator = new EnumerationIterator<T>(enumeration);
+ }
+
+ /**
+ * Gets an iterator
+ *
+ * @return The iterator
+ */
+ public Iterator<T> iterator()
+ {
+ return iterator;
+ }
+
+}
\ No newline at end of file
Property changes on: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/EnumerationIterable.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/EnumerationIterator.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/EnumerationIterator.java (rev 0)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/EnumerationIterator.java 2009-02-24 20:47:28 UTC (rev 1688)
@@ -0,0 +1,55 @@
+package org.jboss.webbeans.tck.integration.jbossas.util;
+
+import java.util.Enumeration;
+import java.util.Iterator;
+
+/**
+ * An enumeration -> iterator adapter
+ *
+ * @author Pete Muir
+ */
+@SuppressWarnings("unchecked")
+class EnumerationIterator<T> implements Iterator<T>
+{
+ // The enumeration
+ private Enumeration e;
+
+ /**
+ * Constructor
+ *
+ * @param e The enumeration
+ */
+ public EnumerationIterator(Enumeration e)
+ {
+ this.e = e;
+ }
+
+ /**
+ * Indicates if there are more items to iterate
+ *
+ * @return True if more, false otherwise
+ */
+ public boolean hasNext()
+ {
+ return e.hasMoreElements();
+ }
+
+ /**
+ * Gets the next item
+ *
+ * @return The next items
+ */
+ public T next()
+ {
+ return (T) e.nextElement();
+ }
+
+ /**
+ * Removes an item. Not supported
+ */
+ public void remove()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+}
\ No newline at end of file
Property changes on: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/EnumerationIterator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/ResourceLoadingException.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/ResourceLoadingException.java (rev 0)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/ResourceLoadingException.java 2009-02-24 20:47:28 UTC (rev 1688)
@@ -0,0 +1,54 @@
+package org.jboss.webbeans.tck.integration.jbossas.util;
+
+import javax.inject.ExecutionException;
+
+/**
+ * Exception thrown when errors occur while loading resource
+ *
+ * @author Pete Muir
+ *
+ */
+class ResourceLoadingException extends ExecutionException
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Constructor
+ */
+ public ResourceLoadingException()
+ {
+ super();
+ }
+
+ /**
+ * Constructor
+ *
+ * @param message The message
+ * @param throwable The exception
+ */
+ public ResourceLoadingException(String message, Throwable throwable)
+ {
+ super(message, throwable);
+ }
+
+ /**
+ * Constructor
+ *
+ * @param message The message
+ */
+ public ResourceLoadingException(String message)
+ {
+ super(message);
+ }
+
+ /**
+ * Constructor
+ *
+ * @param throwable The exception
+ */
+ public ResourceLoadingException(Throwable throwable)
+ {
+ super(throwable);
+ }
+
+}
\ No newline at end of file
Property changes on: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/ResourceLoadingException.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/SimpleResourceLoader.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/SimpleResourceLoader.java (rev 0)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/SimpleResourceLoader.java 2009-02-24 20:47:28 UTC (rev 1688)
@@ -0,0 +1,43 @@
+package org.jboss.webbeans.tck.integration.jbossas.util;
+
+import java.io.IOException;
+import java.net.URL;
+
+class SimpleResourceLoader
+{
+
+ public Class<?> classForName(String name)
+ {
+
+ try
+ {
+ return Class.forName(name);
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new ResourceLoadingException(e);
+ }
+ catch (NoClassDefFoundError e)
+ {
+ throw new ResourceLoadingException(e);
+ }
+ }
+
+ public URL getResource(String name)
+ {
+ return getClass().getResource(name);
+ }
+
+ public Iterable<URL> getResources(String name)
+ {
+ try
+ {
+ return new EnumerationIterable<URL>(getClass().getClassLoader().getResources(name));
+ }
+ catch (IOException e)
+ {
+ throw new ResourceLoadingException(e);
+ }
+ }
+
+}
\ No newline at end of file
Property changes on: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/SimpleResourceLoader.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/Strings.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/Strings.java (rev 0)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/Strings.java 2009-02-24 20:47:28 UTC (rev 1688)
@@ -0,0 +1,30 @@
+package org.jboss.webbeans.tck.integration.jbossas.util;
+
+import java.util.StringTokenizer;
+
+public class Strings
+{
+ static String[] split(String strings, String delims)
+ {
+ if (strings == null)
+ {
+ return new String[0];
+ }
+ else
+ {
+ StringTokenizer tokens = new StringTokenizer(strings, delims);
+ String[] result = new String[tokens.countTokens()];
+ int i = 0;
+ while (tokens.hasMoreTokens())
+ {
+ result[i++] = tokens.nextToken();
+ }
+ return result;
+ }
+ }
+
+ public static boolean isEmpty(String string)
+ {
+ return string == null || string.length() == 0;
+ }
+}
Property changes on: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/util/Strings.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: ri/trunk/jboss-tck-runner/src/test/resources/debug/META-INF/web-beans-tck.properties
===================================================================
--- ri/trunk/jboss-tck-runner/src/test/resources/debug/META-INF/web-beans-tck.properties (rev 0)
+++ ri/trunk/jboss-tck-runner/src/test/resources/debug/META-INF/web-beans-tck.properties 2009-02-24 20:47:28 UTC (rev 1688)
@@ -0,0 +1,5 @@
+org.jboss.jsr299.tck.standalone=false
+jboss-as.dir=/Users/pmuir/workspace/webbeans/jboss-as
+jboss.force.restart=false
+org.jboss.jsr299.tck.libraryDirectory=/Users/pmuir/workspace/webbeans/jboss-tck-runner/target/dependency/lib
+org.jboss.jsr299.tck.runIntegrationTests=true
\ No newline at end of file
Property changes on: ri/trunk/jboss-tck-runner/src/test/resources/debug/META-INF/web-beans-tck.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1687 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-24 14:59:44 -0500 (Tue, 24 Feb 2009)
New Revision: 1687
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Animal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidow.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidowConsumer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidowProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DeadlyAnimal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DeadlySpider.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DefangedTarantula.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/HighestDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Null.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderConsumer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Spider.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/SpiderStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/StaticTarantulaProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Tarantula.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/TarantulaConsumer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/TarantulaProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Working.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/beans.xml
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidowConsumer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java
Log:
Fix producer lifecycle tests standalone
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidowConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidowConsumer.java 2009-02-24 19:30:54 UTC (rev 1686)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidowConsumer.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.jsr299.tck.unit.implementation.producer.field;
-
-import javax.inject.Current;
-
-/**
- * This simple bean contains an injection point to receive the value of a
- * producer field in another bean.
- *
- * @author David Allen
- *
- */
-public class BlackWidowConsumer
-{
- @Current
- private BlackWidow injectedSpider;
-
- public BlackWidow getInjectedSpider()
- {
- return injectedSpider;
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-24 19:30:54 UTC (rev 1686)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -1,142 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.producer.field;
-
-import java.lang.annotation.Annotation;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import javax.inject.IllegalProductException;
-import javax.inject.Production;
-import javax.inject.Standard;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.hibernate.tck.annotations.SpecAssertions;
-import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.jboss.jsr299.tck.impl.packaging.Artifact;
-import org.testng.annotations.Test;
-
-/**
- *
- * Spec version: PRD2
- *
- */
-@Artifact
-public class ProducerFieldLifecycleTest extends AbstractDeclarativeTest
-{
- /*
- * (non-Javadoc)
- *
- * @see org.jboss.webbeans.tck.AbstractTest#getEnabledDeploymentTypes()
- */
- @SuppressWarnings("unchecked")
- @Override
- protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
- {
- // Add a local deployment type used in tests
- return Collections.unmodifiableList(Arrays.asList(Standard.class, Production.class, AnotherDeploymentType.class, HighestDeploymentType.class));
- }
-
- @Test(groups = { "producerField" })
- @SpecAssertions({
- @SpecAssertion(section = "6.8", id = "h"),
- @SpecAssertion(section = "3.5", id = "b")
- })
- public void testProducerStaticFieldBean()
- {
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- TarantulaConsumer tarantulaConsumer = getCurrentManager().getInstanceByType(TarantulaConsumer.class);
- assert tarantulaConsumer.getConsumedTarantula().equals(StaticTarantulaProducer.produceTarantula);
- }
- };
- }
-
- @Test(groups = { "producerField" })
- @SpecAssertions({
- @SpecAssertion(section = "6.8", id = "k"),
- @SpecAssertion(section = "6.8", id = "l"),
- @SpecAssertion(section = "6", id = "c"),
- @SpecAssertion(section = "6.8", id = "a"),
- @SpecAssertion(section = "6.8", id = "g")
- })
- public void testProducerFieldBeanCreate() throws Exception
- {
- new RunInDependentContext()
- {
- @Override
- protected void execute() throws Exception
- {
- BlackWidowConsumer spiderConsumer = getCurrentManager().getInstanceByType(BlackWidowConsumer.class);
- assert spiderConsumer.getInjectedSpider().equals(BlackWidowProducer.blackWidow);
- }
- }.run();
- }
-
- @Test(groups = { "producerField", "specialization" })
- @SpecAssertion(section = "6.8", id = "i")
- public void testSpecializedBeanAlwaysUsed() throws Exception
- {
- new RunInDependentContext()
- {
- @Override
- protected void execute() throws Exception
- {
- TarantulaConsumer spiderConsumer = getCurrentManager().getInstanceByType(TarantulaConsumer.class);
- assert spiderConsumer.getConsumedTarantula() != null;
- assert spiderConsumer.getConsumedTarantula() instanceof DefangedTarantula;
- }
- }.run();
- }
-
- @Test(groups = { "producerField" })
- @SpecAssertions({
- @SpecAssertion(section = "3.5", id = "d"),
- @SpecAssertion(section = "6.8", id = "m")
- })
- public void testProducerFieldReturnsNullIsDependent() throws Exception
- {
- new RunInDependentContext()
- {
- @Override
- protected void execute() throws Exception
- {
- NullSpiderConsumer consumerBean = getCurrentManager().getInstanceByType(NullSpiderConsumer.class);
- assert consumerBean.getInjectedSpider() == null;
- }
- }.run();
- }
-
- @Test(groups = { "producerField" }, expectedExceptions = IllegalProductException.class)
- @SpecAssertions({
- @SpecAssertion(section = "3.5", id = "e"),
- @SpecAssertion(section = "6.8", id = "n")
- })
- public void testProducerFieldReturnsNullIsNotDependent() throws Exception
- {
- new RunInDependentContext()
- {
- @Override
- protected void execute() throws Exception
- {
- NullSpiderConsumer consumer = getCurrentManager().getInstanceByType(NullSpiderConsumer.class);
- // The injected spider is proxied since it is in the request scope.
- // So to actually create the bean instance, we need to invoke
- // some method on the proxy.
- if (consumer.getInjectedSpider() == null)
- {
- // No proxy in this impl, and no exception = fail
- }
- else
- {
- // Proxy is assumed, so invoke some method
- consumer.getInjectedSpider().bite();
- }
- }
- }.run();
- }
-
-}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Animal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Animal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Animal.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+interface Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Animal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/AnotherDeploymentType.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.DeploymentType;
+
+@Target( { TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@interface AnotherDeploymentType
+{
+
+}
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/AnotherDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidow.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidow.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+class BlackWidow extends Spider implements DeadlySpider
+{
+ public void bite()
+ {
+ // Test method used for proxy instances to force
+ // creation of the instance.
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidow.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidowConsumer.java (from rev 1682, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/BlackWidowConsumer.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidowConsumer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidowConsumer.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import javax.inject.Current;
+
+/**
+ * This simple bean contains an injection point to receive the value of a
+ * producer field in another bean.
+ *
+ * @author David Allen
+ *
+ */
+public class BlackWidowConsumer
+{
+ @Current
+ private BlackWidow injectedSpider;
+
+ public BlackWidow getInjectedSpider()
+ {
+ return injectedSpider;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidowConsumer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidowProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidowProducer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidowProducer.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import javax.annotation.Named;
+import javax.inject.Produces;
+
+@AnotherDeploymentType
+public class BlackWidowProducer
+{
+ public static BlackWidow blackWidow = new BlackWidow();
+ @Produces
+ @Named("blackWidow")
+ public BlackWidow produceBlackWidow = blackWidow;
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/BlackWidowProducer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Broken.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Broken
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DeadlyAnimal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DeadlyAnimal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DeadlyAnimal.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+interface DeadlyAnimal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DeadlyAnimal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DeadlySpider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DeadlySpider.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DeadlySpider.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+interface DeadlySpider extends DeadlyAnimal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DeadlySpider.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DefangedTarantula.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DefangedTarantula.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DefangedTarantula.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+class DefangedTarantula extends Tarantula
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/DefangedTarantula.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/HighestDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/HighestDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/HighestDeploymentType.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.DeploymentType;
+
+@Target( { TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@interface HighestDeploymentType
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/HighestDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Null.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Null.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Null.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Null
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Null.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderConsumer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderConsumer.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import java.io.Serializable;
+
+/**
+ * Simple bean that has an injection point for a spider
+ *
+ * @author David Allen
+ *
+ */
+public class NullSpiderConsumer implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ @Null @Working
+ private BlackWidow injectedSpider;
+
+ public BlackWidow getInjectedSpider()
+ {
+ return injectedSpider;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderConsumer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import java.io.Serializable;
+
+/**
+ * Simple bean that has an injection point for a spider
+ *
+ * @author David Allen
+ *
+ */
+public class NullSpiderConsumerForBrokenProducer implements Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ @Null @Broken
+ private BlackWidow injectedSpider;
+
+ public BlackWidow getInjectedSpider()
+ {
+ return injectedSpider;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderConsumerForBrokenProducer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderProducer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderProducer.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import javax.annotation.Named;
+import javax.inject.Produces;
+
+/**
+ * Contains producer for Spider which always is a null value and
+ * in Dependent scope
+ *
+ * @author David Allen
+ *
+ */
+@AnotherDeploymentType
+public class NullSpiderProducer
+{
+ @Produces @Named("blackWidow") @Null @Working public BlackWidow produceBlackWidow = null;
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderProducer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import javax.annotation.Named;
+import javax.context.RequestScoped;
+import javax.inject.Produces;
+
+/**
+ * Bean with a producer field that always returns null and is not
+ * in Dependent context (the produced result)
+ *
+ * @author David Allen
+ *
+ */
+@AnotherDeploymentType
+public class NullSpiderProducer_Broken
+{
+ @Produces @RequestScoped @Named("blackWidow") @Null @Broken public BlackWidow produceBlackWidow = null;
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/NullSpiderProducer_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java (from rev 1682, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,125 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import javax.inject.IllegalProductException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Spec version: PRD2
+ *
+ */
+@Artifact
+@BeansXml("beans.xml")
+public class ProducerFieldLifecycleTest extends AbstractDeclarativeTest
+{
+
+ @Test(groups = { "producerField" })
+ @SpecAssertions({
+ @SpecAssertion(section = "6.8", id = "h"),
+ @SpecAssertion(section = "3.5", id = "b")
+ })
+ public void testProducerStaticFieldBean()
+ {
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ TarantulaConsumer tarantulaConsumer = getCurrentManager().getInstanceByType(TarantulaConsumer.class);
+ assert tarantulaConsumer.getConsumedTarantula().equals(StaticTarantulaProducer.produceTarantula);
+ }
+ };
+ }
+
+ @Test(groups = { "producerField" })
+ @SpecAssertions({
+ @SpecAssertion(section = "6.8", id = "k"),
+ @SpecAssertion(section = "6.8", id = "l"),
+ @SpecAssertion(section = "6", id = "c"),
+ @SpecAssertion(section = "6.8", id = "a"),
+ @SpecAssertion(section = "6.8", id = "g")
+ })
+ public void testProducerFieldBeanCreate() throws Exception
+ {
+ new RunInDependentContext()
+ {
+ @Override
+ protected void execute() throws Exception
+ {
+ BlackWidowConsumer spiderConsumer = getCurrentManager().getInstanceByType(BlackWidowConsumer.class);
+ assert spiderConsumer.getInjectedSpider().equals(BlackWidowProducer.blackWidow);
+ }
+ }.run();
+ }
+
+ @Test(groups = { "producerField", "specialization" })
+ @SpecAssertion(section = "6.8", id = "i")
+ public void testSpecializedBeanAlwaysUsed() throws Exception
+ {
+ new RunInDependentContext()
+ {
+ @Override
+ protected void execute() throws Exception
+ {
+ TarantulaConsumer spiderConsumer = getCurrentManager().getInstanceByType(TarantulaConsumer.class);
+ assert spiderConsumer.getConsumedTarantula() != null;
+ assert spiderConsumer.getConsumedTarantula() instanceof DefangedTarantula;
+ }
+ }.run();
+ }
+
+ @Test(groups = { "producerField" })
+ @SpecAssertions({
+ @SpecAssertion(section = "3.5", id = "d"),
+ @SpecAssertion(section = "6.8", id = "m")
+ })
+ public void testProducerFieldReturnsNullIsDependent() throws Exception
+ {
+ new RunInDependentContext()
+ {
+ @Override
+ protected void execute() throws Exception
+ {
+ NullSpiderConsumer consumerBean = getCurrentManager().getInstanceByType(NullSpiderConsumer.class);
+ assert consumerBean.getInjectedSpider() == null;
+ }
+ }.run();
+ }
+
+ @Test(groups = { "producerField" }, expectedExceptions = IllegalProductException.class)
+ @SpecAssertions({
+ @SpecAssertion(section = "3.5", id = "e"),
+ @SpecAssertion(section = "6.8", id = "n")
+ })
+ public void testProducerFieldReturnsNullIsNotDependent() throws Exception
+ {
+ new RunInDependentContext()
+ {
+ @Override
+ protected void execute() throws Exception
+ {
+ NullSpiderConsumerForBrokenProducer consumer = getCurrentManager().getInstanceByType(NullSpiderConsumerForBrokenProducer.class);
+ // The injected spider is proxied since it is in the request scope.
+ // So to actually create the bean instance, we need to invoke
+ // some method on the proxy.
+ if (consumer.getInjectedSpider() == null)
+ {
+ // No proxy in this impl, and no exception = fail
+ }
+ else
+ {
+ // Proxy is assumed, so invoke some method
+ consumer.getInjectedSpider().bite();
+ }
+ }
+ }.run();
+ }
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import javax.inject.Produces;
+import javax.inject.Specializes;
+
+/**
+ * This bean contains a producer field and specializes another bean
+ * which has the same producer field.
+ *
+ * @author David Allen
+ *
+ */
+@Specializes
+@HighestDeploymentType
+public class SpecializedTarantulaProducer extends TarantulaProducer
+{
+ @Produces public Tarantula produceTarantula = new DefangedTarantula();
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/SpecializedTarantulaProducer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Spider.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Spider.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Spider.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,13 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+class Spider implements Animal
+{
+
+ private static final long serialVersionUID = 1L;
+
+ public void layEggs()
+ {
+
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Spider.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/SpiderStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/SpiderStereotype.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/SpiderStereotype.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.annotation.Named;
+import javax.annotation.Stereotype;
+import javax.context.RequestScoped;
+import javax.inject.Production;
+
+/**
+ * Test stereotype used to change the scope type and deployment type
+ * of another bean, in particular a producer field bean.
+ *
+ * @author David Allen
+ *
+ */
+(a)Stereotype(requiredTypes=Spider.class)
+@Target( { TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@RequestScoped
+@Production
+@Named
+public @interface SpiderStereotype
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/SpiderStereotype.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/StaticTarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/StaticTarantulaProducer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/StaticTarantulaProducer.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import javax.inject.Produces;
+
+public class StaticTarantulaProducer
+{
+ @Produces @SpiderStereotype public static Tarantula produceTarantula = new Tarantula();
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/StaticTarantulaProducer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Tarantula.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Tarantula.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Tarantula.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+class Tarantula extends Spider implements DeadlySpider
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Tarantula.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/TarantulaConsumer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/TarantulaConsumer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/TarantulaConsumer.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import javax.inject.Current;
+
+/**
+ * This bean contains an injection point for a Tarantula that must be provided
+ * by the container via a (static) producer field.
+ *
+ * @author David Allen
+ *
+ */
+public class TarantulaConsumer
+{
+ @Current
+ private Tarantula consumedTarantula;
+
+ public Tarantula getConsumedTarantula()
+ {
+ return consumedTarantula;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/TarantulaConsumer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/TarantulaProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/TarantulaProducer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/TarantulaProducer.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import javax.inject.Produces;
+
+@AnotherDeploymentType
+public class TarantulaProducer
+{
+ @Produces public Tarantula produceTarantula = new Tarantula();
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/TarantulaProducer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Working.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Working.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Working.java 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Working
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/Working.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/beans.xml 2009-02-24 19:59:44 UTC (rev 1687)
@@ -0,0 +1,9 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.unit.implementation.producer.field.lifecycle">
+ <Deploy>
+ <Standard />
+ <Production />
+ <test:AnotherDeploymentType />
+ <test:HighestDeploymentType />
+ </Deploy>
+</Beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/implementation/producer/field/lifecycle/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1686 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck: unit/context and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-24 14:30:54 -0500 (Tue, 24 Feb 2009)
New Revision: 1686
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DestroyedInstanceReturnedByGetTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetOnInactiveContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetWithNoCreationalContextTest.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java
Log:
Fix normalcontext tests for standalone
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-24 17:49:48 UTC (rev 1685)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-24 19:30:54 UTC (rev 1686)
@@ -192,7 +192,7 @@
}
@BeforeClass(alwaysRun=true)
- public final void beforeClass() throws Throwable
+ public void beforeClass() throws Throwable
{
generateArtifact();
deployArtifact();
@@ -209,7 +209,7 @@
}
@BeforeMethod(alwaysRun=true)
- public final void beforeMethod(Method method)
+ public void beforeMethod(Method method)
{
if (!isInContainer() && artifact == null)
{
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DestroyedInstanceReturnedByGetTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DestroyedInstanceReturnedByGetTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DestroyedInstanceReturnedByGetTest.java 2009-02-24 19:30:54 UTC (rev 1686)
@@ -0,0 +1,54 @@
+package org.jboss.jsr299.tck.unit.context;
+
+import javax.context.ApplicationScoped;
+import javax.context.Context;
+import javax.context.SessionScoped;
+import javax.inject.manager.Bean;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+@Artifact
+public class DestroyedInstanceReturnedByGetTest extends AbstractDeclarativeTest
+{
+
+
+ Context context;
+
+ @BeforeMethod(dependsOnMethods = "beforeMethod")
+ public void initContext()
+ {
+ if (context == null)
+ {
+ context = new DummyContext();
+ getCurrentManager().addContext(context);
+ }
+ }
+
+ @Test(groups = { "contexts", "ri-broken" })
+ @SpecAssertion(section = "8.1", id = "g")
+ public void testDestroyedInstanceMustNotBeReturnedByGet()
+ {
+ Bean<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next();
+ MyCreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>();
+ MySessionBean beanInstance = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext);
+ assert beanInstance != null;
+ mySessionBean.destroy(beanInstance);
+ MySessionBean beanInstanceFromGet = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean);
+ assert beanInstanceFromGet != beanInstance;
+
+ Bean<MyApplicationBean> myApplicationBean = getCurrentManager().resolveByType(MyApplicationBean.class).iterator().next();
+ MyCreationalContext<MyApplicationBean> myCreationalContextForApplication = new MyCreationalContext<MyApplicationBean>();
+ MyApplicationBean myApplicationBeanInstance = getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean, myCreationalContextForApplication);
+ assert myApplicationBeanInstance != null;
+ myApplicationBean.destroy(myApplicationBeanInstance);
+
+ MyApplicationBean mySecondApplicationBeanInstance = getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean);
+ assert mySecondApplicationBeanInstance != null;
+ assert myApplicationBeanInstance != mySecondApplicationBeanInstance;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/DestroyedInstanceReturnedByGetTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetOnInactiveContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetOnInactiveContextTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetOnInactiveContextTest.java 2009-02-24 19:30:54 UTC (rev 1686)
@@ -0,0 +1,44 @@
+package org.jboss.jsr299.tck.unit.context;
+
+import javax.context.Context;
+import javax.context.ContextNotActiveException;
+import javax.context.Contextual;
+import javax.context.SessionScoped;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+@Artifact
+public class GetOnInactiveContextTest extends AbstractDeclarativeTest
+{
+
+
+ Context context;
+
+ @BeforeMethod(dependsOnMethods = "beforeMethod")
+ public void initContext()
+ {
+ if (context == null)
+ {
+ context = new DummyContext();
+ getCurrentManager().addContext(context);
+ }
+ }
+
+
+ @Test(groups = { "contexts" }, expectedExceptions = { ContextNotActiveException.class })
+ @SpecAssertion(section = "8.1", id = "h")
+ public void testInvokingGetOnInactiveContextFails()
+ {
+ Context sessionContext = getCurrentManager().getContext(SessionScoped.class);
+ assert sessionContext.isActive();
+ setContextInactive(sessionContext);
+
+ Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next();
+ sessionContext.get(mySessionBean);
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetOnInactiveContextTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetTest.java 2009-02-24 19:30:54 UTC (rev 1686)
@@ -0,0 +1,50 @@
+package org.jboss.jsr299.tck.unit.context;
+
+import javax.context.ApplicationScoped;
+import javax.context.Context;
+import javax.context.Contextual;
+import javax.context.CreationalContext;
+import javax.context.SessionScoped;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+@Artifact
+public class GetTest extends AbstractDeclarativeTest
+{
+
+ Context context;
+
+ @BeforeMethod(dependsOnMethods = "beforeMethod")
+ public void initContext()
+ {
+ if (context == null)
+ {
+ context = new DummyContext();
+ getCurrentManager().addContext(context);
+ }
+ }
+
+
+ @Test(groups = { "contexts" })
+ @SpecAssertion(section = "8.1", id = "e")
+ public void testGetMayNotCreateNewInstanceUnlessCreationalContextGiven()
+ {
+ Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next();
+ assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean) == null;
+
+ Contextual<MyApplicationBean> myApplicationBean = getCurrentManager().resolveByType(MyApplicationBean.class).iterator().next();
+ assert getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean) == null;
+
+ // Now try same operation with a CreationalContext
+ CreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>();
+ assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext) != null;
+
+ CreationalContext<MyApplicationBean> myOtherCreationalContext = new MyCreationalContext<MyApplicationBean>();
+ assert getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean, myOtherCreationalContext) != null;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetWithNoCreationalContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetWithNoCreationalContextTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetWithNoCreationalContextTest.java 2009-02-24 19:30:54 UTC (rev 1686)
@@ -0,0 +1,38 @@
+package org.jboss.jsr299.tck.unit.context;
+
+import javax.context.Context;
+import javax.context.Contextual;
+import javax.context.SessionScoped;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+@Artifact
+public class GetWithNoCreationalContextTest extends AbstractDeclarativeTest
+{
+
+ Context context;
+
+ @BeforeMethod(dependsOnMethods = "beforeMethod")
+ public void initContext()
+ {
+ if (context == null)
+ {
+ context = new DummyContext();
+ getCurrentManager().addContext(context);
+ }
+ }
+
+
+ @Test(groups = { "contexts" })
+ @SpecAssertion(section = "8.1", id = "b")
+ public void testGetWithoutCreationalContextReturnsNull()
+ {
+ Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next();
+ assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean) == null;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/GetWithNoCreationalContextTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-24 17:49:48 UTC (rev 1685)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-24 19:30:54 UTC (rev 1686)
@@ -1,12 +1,9 @@
package org.jboss.jsr299.tck.unit.context;
-import javax.context.ApplicationScoped;
import javax.context.Context;
-import javax.context.ContextNotActiveException;
import javax.context.Contextual;
import javax.context.CreationalContext;
import javax.context.SessionScoped;
-import javax.inject.manager.Bean;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
@@ -34,8 +31,11 @@
@BeforeMethod(dependsOnMethods = "beforeMethod")
public void initContext()
{
- context = new DummyContext();
- getCurrentManager().addContext(context);
+ if (context == null)
+ {
+ context = new DummyContext();
+ getCurrentManager().addContext(context);
+ }
}
@Test(groups = { "contexts" })
@@ -51,14 +51,6 @@
}
@Test(groups = { "contexts" })
- @SpecAssertion(section = "8.1", id = "b")
- public void testGetWithoutCreationalContextReturnsNull()
- {
- Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next();
- assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean) == null;
- }
-
- @Test(groups = { "contexts" })
@SpecAssertion(section = "8.1", id = "c")
public void testGetWithCreationalContextReturnsNewInstance()
{
@@ -87,24 +79,6 @@
}
@Test(groups = { "contexts" })
- @SpecAssertion(section = "8.1", id = "e")
- public void testGetMayNotCreateNewInstanceUnlessCreationalContextGiven()
- {
- Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next();
- assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean) == null;
-
- Contextual<MyApplicationBean> myApplicationBean = getCurrentManager().resolveByType(MyApplicationBean.class).iterator().next();
- assert getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean) == null;
-
- // Now try same operation with a CreationalContext
- CreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>();
- assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext) != null;
-
- CreationalContext<MyApplicationBean> myOtherCreationalContext = new MyCreationalContext<MyApplicationBean>();
- assert getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean, myOtherCreationalContext) != null;
- }
-
- @Test(groups = { "contexts" })
@SpecAssertion(section = "8.1", id = "f")
public void testContextDestroysBeansWhenDestroyed()
{
@@ -121,40 +95,8 @@
assert bean.isDestroyCalled();
}
- @Test(groups = { "contexts", "broken" })
- @SpecAssertion(section = "8.1", id = "g")
- public void testDestroyedInstanceMustNotBeReturnedByGet()
- {
- Bean<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next();
- MyCreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>();
- MySessionBean beanInstance = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext);
- assert beanInstance != null;
- mySessionBean.destroy(beanInstance);
- MySessionBean beanInstanceFromGet = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean);
- assert beanInstanceFromGet != beanInstance;
-
- Bean<MyApplicationBean> myApplicationBean = getCurrentManager().resolveByType(MyApplicationBean.class).iterator().next();
- MyCreationalContext<MyApplicationBean> myCreationalContextForApplication = new MyCreationalContext<MyApplicationBean>();
- MyApplicationBean myApplicationBeanInstance = getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean, myCreationalContextForApplication);
- assert myApplicationBeanInstance != null;
- myApplicationBean.destroy(myApplicationBeanInstance);
-
- MyApplicationBean mySecondApplicationBeanInstance = getCurrentManager().getContext(ApplicationScoped.class).get(myApplicationBean);
- assert mySecondApplicationBeanInstance != null;
- assert myApplicationBeanInstance != mySecondApplicationBeanInstance;
- }
- @Test(groups = { "contexts" }, expectedExceptions = { ContextNotActiveException.class })
- @SpecAssertion(section = "8.1", id = "h")
- public void testInvokingGetOnInactiveContextFails()
- {
- Context sessionContext = getCurrentManager().getContext(SessionScoped.class);
- assert sessionContext.isActive();
- setContextInactive(sessionContext);
- Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next();
- sessionContext.get(mySessionBean);
- }
/**
* There may be no more than one mapped instance per contextual type per
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1685 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-24 12:49:48 -0500 (Tue, 24 Feb 2009)
New Revision: 1685
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/TurkuLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Big.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/EspooLocal_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/London_Broken.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/PassivatingContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/Turku.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer2.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Espoo_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Generator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Jamsa_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kuopio_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation2.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Fixes to passivation tests
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-02-24 17:29:06 UTC (rev 1684)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -24,7 +24,6 @@
import javax.inject.AmbiguousDependencyException;
import javax.inject.DefinitionException;
-import javax.inject.IllegalProductException;
import javax.inject.InconsistentSpecializationException;
import javax.inject.New;
import javax.inject.NullableDependencyException;
@@ -34,11 +33,9 @@
import javax.inject.manager.Bean;
import javax.inject.manager.InjectionPoint;
-import org.jboss.webbeans.bean.AbstractProducerBean;
import org.jboss.webbeans.bean.NewEnterpriseBean;
import org.jboss.webbeans.bean.NewSimpleBean;
import org.jboss.webbeans.bean.RIBean;
-import org.jboss.webbeans.introspector.AnnotatedField;
import org.jboss.webbeans.metadata.MetaDataCache;
import org.jboss.webbeans.util.Beans;
import org.jboss.webbeans.util.ListComparator;
@@ -101,21 +98,6 @@
{
throw new NullableDependencyException("The injection point " + injectionPoint + " has nullable dependencies");
}
- if (MetaDataCache.instance().getScopeModel(bean.getScopeType()).isPassivating())
- {
- if (resolvedBean instanceof AbstractProducerBean)
- {
- AbstractProducerBean producerBean = (AbstractProducerBean) resolvedBean;
- if ((injectionPoint instanceof AnnotatedField) && ((AnnotatedField<?>) injectionPoint).isTransient())
- {
- injectionPoint.getBean();
- }
- else if (producerBean.isDependent() && !Reflections.isSerializable(producerBean.getType()))
- {
- throw new IllegalProductException("Cannot inject @Depedent non-serializable type into " + injectionPoint);
- }
- }
- }
}
else
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-02-24 17:29:06 UTC (rev 1684)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -212,16 +212,16 @@
Method method = (Method) injectionPoint.getMember();
if (method.isAnnotationPresent(Initializer.class))
{
- throw new IllegalProductException("Dependent scoped producers cannot produce non-serializable instances for injection into parameters of intializers of beans declaring passivating scope");
+ throw new IllegalProductException("Dependent scoped producers cannot produce non-serializable instances for injection into parameters of intializers of beans declaring passivating scope. Bean " + toString() + " being injected into " + injectionPoint.toString());
}
if (method.isAnnotationPresent(Produces.class))
{
- throw new IllegalProductException("Dependent scoped producers cannot produce non-serializable instances for injection into parameters of producer methods declaring passivating scope");
+ throw new IllegalProductException("Dependent scoped producers cannot produce non-serializable instances for injection into parameters of producer methods declaring passivating scope. Bean " + toString() + " being injected into " + injectionPoint.toString());
}
}
else if (injectionPoint.getMember() instanceof Constructor)
{
- throw new IllegalProductException("Dependent scoped producers cannot produce non-serializable instances for injection into parameters of constructors of beans declaring passivating scope");
+ throw new IllegalProductException("Dependent scoped producers cannot produce non-serializable instances for injection into parameters of constructors of beans declaring passivating scope. Bean " + toString() + " being injected into " + injectionPoint.toString());
}
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/PassivatingContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/PassivatingContextTest.java 2009-02-24 17:29:06 UTC (rev 1684)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/PassivatingContextTest.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -6,6 +6,8 @@
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.IntegrationTest;
import org.testng.annotations.Test;
/**
@@ -14,13 +16,15 @@
*
* Spec version: PRD2
*/
+@Artifact
+@IntegrationTest
public class PassivatingContextTest extends AbstractDeclarativeTest
{
@Test(groups = { "contexts", "passivation", "enterpriseBean", "integration" })
@SpecAssertion(section = "8.4", id = "a")
public void testEJBWebBeanCanDeclarePassivatingScope()
{
- deployBeans(Turku.class);
+ assert getCurrentManager().resolveByType(Turku.class).size() == 1;
}
@Test(groups = { "stub", "contexts", "passivation", "jms" })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/Turku.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/Turku.java 2009-02-24 17:29:06 UTC (rev 1684)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/Turku.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -6,7 +6,7 @@
@Stateful
@SessionScoped
-class Turku
+class Turku implements TurkuLocal
{
@Remove
public void bye() {
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/TurkuLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/TurkuLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/TurkuLocal.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.integration.context.passivating;
+
+public interface TurkuLocal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/TurkuLocal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Big.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Big.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Big.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.unit.context.passivating;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Big
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Big.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer2.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer2.java 2009-02-24 17:29:06 UTC (rev 1684)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer2.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -3,10 +3,10 @@
import javax.context.Dependent;
import javax.inject.Produces;
+@AnotherDeploymentType
class CityProducer2
{
- @Produces
- @Dependent
+ @Produces @Dependent @Big
public Violation create()
{
return new Violation();
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/EspooLocal_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/EspooLocal_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/EspooLocal_Broken.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.context.passivating;
+
+import javax.ejb.Local;
+
+@Local
+public interface EspooLocal_Broken
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/EspooLocal_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Espoo_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Espoo_Broken.java 2009-02-24 17:29:06 UTC (rev 1684)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Espoo_Broken.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -7,7 +7,7 @@
@Stateful
@SessionScoped
-class Espoo_Broken
+class Espoo_Broken implements EspooLocal_Broken
{
@Current
Violation reference;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Generator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Generator.java 2009-02-24 17:29:06 UTC (rev 1684)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Generator.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -7,6 +7,7 @@
import javax.inject.Produces;
@ApplicationScoped
+@AnotherDeploymentType
class Generator implements Serializable
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Jamsa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Jamsa_Broken.java 2009-02-24 17:29:06 UTC (rev 1684)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Jamsa_Broken.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -7,6 +7,7 @@
import javax.inject.Produces;
@SessionScoped
+@AnotherDeploymentType
class Jamsa_Broken extends City implements Serializable
{
private static final long serialVersionUID = 8228981889946806181L;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kuopio_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kuopio_Broken.java 2009-02-24 17:29:06 UTC (rev 1684)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kuopio_Broken.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -3,7 +3,6 @@
import java.io.Serializable;
import javax.context.SessionScoped;
-import javax.inject.Current;
import javax.inject.Initializer;
@SessionScoped
@@ -16,7 +15,7 @@
}
@Initializer
- public void init(@Current Violation reference) {
+ public void init(@Big Violation reference) {
}
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/London_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/London_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/London_Broken.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -0,0 +1,25 @@
+package org.jboss.jsr299.tck.unit.context.passivating;
+
+import java.io.Serializable;
+
+import javax.context.SessionScoped;
+import javax.inject.Produces;
+
+@SessionScoped
+@AnotherDeploymentType
+class London_Broken extends City implements Serializable
+{
+ private static final long serialVersionUID = 8228981889946806181L;
+
+ public London_Broken()
+ {
+ }
+
+ @Produces
+ @SessionScoped
+ @Big
+ public Violation2 create(@Big Violation violation)
+ {
+ return new Violation2();
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/London_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java 2009-02-24 17:29:06 UTC (rev 1684)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -3,7 +3,6 @@
import java.io.Serializable;
import javax.context.SessionScoped;
-import javax.inject.Current;
import javax.inject.Initializer;
@SessionScoped
@@ -15,7 +14,7 @@
}
@Initializer
- public Loviisa_Broken(@Current Violation reference) {
+ public Loviisa_Broken(@Big Violation reference) {
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-24 17:29:06 UTC (rev 1684)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -1,10 +1,12 @@
package org.jboss.jsr299.tck.unit.context.passivating;
import java.io.IOException;
+import java.lang.annotation.Annotation;
import java.util.Set;
import javax.context.Context;
import javax.context.SessionScoped;
+import javax.inject.AnnotationLiteral;
import javax.inject.IllegalProductException;
import javax.inject.UnserializableDependencyException;
import javax.inject.manager.Bean;
@@ -27,6 +29,9 @@
@BeansXml("beans.xml")
public class PassivatingContextTest extends AbstractDeclarativeTest
{
+
+ private static final Annotation BIG_LITERAL = new AnnotationLiteral<Big>() {};
+
@Test(groups = { "contexts", "passivation" })
@SpecAssertion(section = "8.4", id = "b")
public void testSimpleWebBeanWithSerializableImplementationClassOK()
@@ -86,11 +91,12 @@
assert testSerialize(vaasaBeans.iterator().next());
}
- @Test(groups = { "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class)
+ @Test(groups = { "contexts", "passivation" , "ri-broken"}, expectedExceptions = UnserializableDependencyException.class)
@SpecAssertion(section = "8.4", id = "k")
public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoStatefulSessionBeanFails()
{
- getCurrentManager().getInstanceByType(Espoo_Broken.class);
+ // WBRI-150
+ getCurrentManager().getInstanceByType(EspooLocal_Broken.class);
}
@Test(groups = { "contexts", "passivation" })
@@ -134,7 +140,7 @@
@SpecAssertion(section = "8.4", id = "t")
public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoProducerMethodParameterWithPassivatingScopeFails()
{
- getCurrentManager().getInstanceByType(Jamsa_Broken.class).ping();
+ getCurrentManager().getInstanceByType(Violation2.class).ping();
}
@Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class)
@@ -169,7 +175,6 @@
@SpecAssertion(section = "8.4", id = "t")
public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoProducerMethodParameterWithPassivatingScopeFails()
{
- // TODO Not quite sure what this test is doing
- getCurrentManager().getInstanceByType(Jamsa_Broken.class).ping();
+ getCurrentManager().getInstanceByType(Violation2.class, BIG_LITERAL).ping();
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation.java 2009-02-24 17:29:06 UTC (rev 1684)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -5,5 +5,10 @@
@Dependent
class Violation
{
+
+ public void ping()
+ {
+
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation2.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation2.java 2009-02-24 17:29:06 UTC (rev 1684)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Violation2.java 2009-02-24 17:49:48 UTC (rev 1685)
@@ -5,5 +5,10 @@
@Dependent
class Violation2
{
+
+ public void ping()
+ {
+
+ }
}
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-24 17:29:06 UTC (rev 1684)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-02-24 17:49:48 UTC (rev 1685)
@@ -4303,10 +4303,14 @@
<text>Simple beans are not required to be serializable. If a simple bean declares a passivating scope, and the bean class is not serializable, a DefinitionException is thrown by the container at deployment time</text>
</assertion>
- <assertion id="c">
- <text>If a producer method or field declares a passivating scope and returns a non-serializable object at runtime, an IllegalProductException is thrown by the container</text>
+ <assertion id="cc">
+ <text>If a ~producer method or ~field declares a passivating scope and returns a non-serializable object at runtime, an IllegalProductException is thrown by the container</text>
</assertion>
+ <assertion id="cd">
+ <text>If a producer method~ or field~ declares a passivating scope and returns a non-serializable object at runtime, an IllegalProductException is thrown by the container</text>
+ </assertion>
+
<assertion id="ca">
<text>Check a producer method which declares a passivating scope and returns a serializable product works</text>
<note>Sanity test</note>
17 years, 1 month
- 1
- 0