[webbeans-commits] Webbeans SVN: r1505 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname and 2 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Fri Feb 13 09:13:05 EST 2009
Author: pete.muir at jboss.org
Date: 2009-02-13 09:13:05 -0500 (Fri, 13 Feb 2009)
New Revision: 1505
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Animal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Chunky.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Cod.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/ScottishFish.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Sole.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Whitefish.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/DuplicateNameResolutionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/AnotherDeploymentType.java
Modified:
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Tuna.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/TunedTuna.java
Log:
Various fixes to incontainer tests
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-13 13:50:46 UTC (rev 1504)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java 2009-02-13 14:13:05 UTC (rev 1505)
@@ -1,9 +1,7 @@
package org.jboss.webbeans.tck.integration.jbossas;
-import java.io.BufferedOutputStream;
import java.io.DataOutputStream;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
@@ -36,10 +34,10 @@
private static Logger log = Logger.getLogger(AbstractContainersImpl.class);
private Configuration configuration;
- protected final String jbossHome;
+ protected String jbossHome;
private String jbossHttpUrl;
private boolean jbossWasStarted;
- private final long bootTimeout;
+ private long bootTimeout;
protected static void copy(InputStream inputStream, File file) throws IOException
{
@@ -57,38 +55,6 @@
{
os.close();
}
- }
-
-
- public AbstractContainersImpl() throws FileNotFoundException, IOException
- {
- if (System.getProperty(JBOSS_AS_DIR_PROPERTY_NAME) != null)
- {
- File jbossAsDir = new File(System.getProperty(JBOSS_AS_DIR_PROPERTY_NAME));
- if (jbossAsDir.isDirectory())
- {
- File buildProperties = new File(jbossAsDir, "build.properties");
- if (buildProperties.exists())
- {
- System.getProperties().load(new FileReader(buildProperties));
- }
- File localBuildProperties = new File(jbossAsDir, "local.build.properties");
- if (buildProperties.exists())
- {
- System.getProperties().load(new FileReader(localBuildProperties));
- }
- }
- }
- jbossHome = System.getProperty(JBOSS_HOME_PROPERTY_NAME);
- if (jbossHome == null)
- {
- throw new IllegalArgumentException("-D" + JBOSS_HOME_PROPERTY_NAME + " must be set");
- }
- else
- {
- log.info("JBoss Home set to " + jbossHome);
- }
- this.bootTimeout = Long.getLong(JBOSS_BOOT_TIMEOUT_PROPERTY_NAME, 60000);
}
public void setConfiguration(Configuration configuration)
@@ -124,6 +90,33 @@
public void setup() throws IOException
{
+ if (System.getProperty(JBOSS_AS_DIR_PROPERTY_NAME) != null)
+ {
+ File jbossAsDir = new File(System.getProperty(JBOSS_AS_DIR_PROPERTY_NAME));
+ if (jbossAsDir.isDirectory())
+ {
+ File buildProperties = new File(jbossAsDir, "build.properties");
+ if (buildProperties.exists())
+ {
+ System.getProperties().load(new FileReader(buildProperties));
+ }
+ File localBuildProperties = new File(jbossAsDir, "local.build.properties");
+ if (buildProperties.exists())
+ {
+ System.getProperties().load(new FileReader(localBuildProperties));
+ }
+ }
+ }
+ jbossHome = System.getProperty(JBOSS_HOME_PROPERTY_NAME);
+ if (jbossHome == null)
+ {
+ throw new IllegalArgumentException("-D" + JBOSS_HOME_PROPERTY_NAME + " must be set");
+ }
+ else
+ {
+ log.info("JBoss Home set to " + jbossHome);
+ }
+ this.bootTimeout = Long.getLong(JBOSS_BOOT_TIMEOUT_PROPERTY_NAME, 60000);
if (!checkJBossUp())
{
jbossWasStarted = true;
@@ -141,7 +134,7 @@
}
try
{
- Thread.sleep(1000);
+ Thread.sleep(500);
}
catch (InterruptedException e)
{
@@ -153,6 +146,10 @@
Thread.currentThread().interrupt();
}
}
+ else
+ {
+ return;
+ }
// After trying to start automatically, try the connection again
if (!checkJBossUp())
{
@@ -164,7 +161,9 @@
{
if (jbossWasStarted)
{
+ log.info("Shutting down JBoss AS");
launch(jbossHome, "shutdown", "-S");
+ log.info("Shut down JBoss AS");
}
}
@@ -204,7 +203,7 @@
{
try
{
- DataOutputStream out = new DataOutputStream(new BufferedOutputStream(new FileOutputStream("/tmp/jboss.log")));
+ DataOutputStream out = new DataOutputStream(new FileOutputStream("/tmp/jboss.log"));
int c;
while((c = is.read()) != -1)
{
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/DuplicateNameResolutionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/DuplicateNameResolutionTest.java 2009-02-13 13:50:46 UTC (rev 1504)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/DuplicateNameResolutionTest.java 2009-02-13 14:13:05 UTC (rev 1505)
@@ -1,60 +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.lookup.byname;
-
-import javax.inject.AmbiguousDependencyException;
-
-import org.jboss.jsr299.tck.AbstractTest;
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.impl.packaging.Artifact;
-import org.jboss.jsr299.tck.impl.packaging.Classes;
-import org.testng.annotations.Test;
-
-/**
- *
- * Spec version: Public Release Draft 2
- *
- */
- at Artifact(addCurrentPackage=false)
- at Classes(value={Cod.class, Sole.class})
-public class DuplicateNameResolutionTest extends AbstractTest
-{
- /**
- * � Otherwise, if resolveByName() returned more than one Web Bean, throw an
- * AmbiguousDependencyException.
- *
- * @throws Exception
- */
- @Test(groups = { "resolution", "el" }, expectedExceptions = AmbiguousDependencyException.class)
- @SpecAssertion(section = "5.10", id = "unknown")
- public void testDuplicateNamedBeans() throws Exception
- {
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- assert manager.resolveByName("whitefish").size() == 2;
- manager.getInstanceByName("whitefish");
- }
-
- }.run();
- }
-
-}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Animal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Animal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Animal.java 2009-02-13 14:13:05 UTC (rev 1505)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution;
+
+interface Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Animal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Chunky.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Chunky.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Chunky.java 2009-02-13 14:13:05 UTC (rev 1505)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at BindingType
+ at interface Chunky
+{
+
+ boolean realChunky();
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Chunky.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Cod.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Cod.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Cod.java 2009-02-13 14:13:05 UTC (rev 1505)
@@ -0,0 +1,13 @@
+package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution;
+
+import javax.annotation.Named;
+import javax.inject.Production;
+
+ at Production
+ at Whitefish
+ at Chunky(realChunky=true)
+ at Named("whitefish")
+class Cod implements ScottishFish
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Cod.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java (from rev 1502, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/DuplicateNameResolutionTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java 2009-02-13 14:13:05 UTC (rev 1505)
@@ -0,0 +1,58 @@
+/*
+ * 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.lookup.byname.duplicateNameResolution;
+
+import javax.inject.AmbiguousDependencyException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Spec version: Public Release Draft 2
+ *
+ */
+ at Artifact
+public class DuplicateNameResolutionTest extends AbstractTest
+{
+ /**
+ * � Otherwise, if resolveByName() returned more than one Web Bean, throw an
+ * AmbiguousDependencyException.
+ *
+ * @throws Exception
+ */
+ @Test(groups = { "resolution", "el" }, expectedExceptions = AmbiguousDependencyException.class)
+ @SpecAssertion(section = "5.10", id = "unknown")
+ public void testDuplicateNamedBeans() throws Exception
+ {
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ assert manager.resolveByName("whitefish").size() == 2;
+ manager.getInstanceByName("whitefish");
+ }
+
+ }.run();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/DuplicateNameResolutionTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/ScottishFish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/ScottishFish.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/ScottishFish.java 2009-02-13 14:13:05 UTC (rev 1505)
@@ -0,0 +1,7 @@
+package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution;
+
+
+interface ScottishFish extends Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/ScottishFish.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Sole.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Sole.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Sole.java 2009-02-13 14:13:05 UTC (rev 1505)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution;
+
+import javax.annotation.Named;
+import javax.inject.Production;
+
+ at Production
+ at Whitefish
+ at Named("whitefish")
+class Sole implements ScottishFish
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Sole.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Whitefish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Whitefish.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Whitefish.java 2009-02-13 14:13:05 UTC (rev 1505)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.unit.lookup.byname.duplicateNameResolution;
+
+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;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at BindingType
+ at interface Whitefish
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/duplicateNameResolution/Whitefish.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/AnotherDeploymentType.java 2009-02-13 13:50:46 UTC (rev 1504)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/AnotherDeploymentType.java 2009-02-13 14:13:05 UTC (rev 1505)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.unit.lookup.clientProxy;
-
-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;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-13 13:50:46 UTC (rev 1504)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-13 14:13:05 UTC (rev 1505)
@@ -1,15 +1,11 @@
package org.jboss.jsr299.tck.unit.lookup.clientProxy;
import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.util.List;
-import javax.inject.DefinitionException;
-import javax.inject.UnproxyableDependencyException;
import javax.inject.manager.Bean;
-import org.jboss.jsr299.tck.AbstractTest;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractTest;
import org.jboss.jsr299.tck.impl.ConfigurationImpl;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
import org.testng.annotations.Test;
@@ -22,14 +18,6 @@
@Artifact
public class ClientProxyTest extends AbstractTest
{
-
- @Override
- protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
- {
- List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes();
- deploymentTypes.add(AnotherDeploymentType.class);
- return deploymentTypes;
- }
@Test(groups = "configuration().getBeans()")
@SpecAssertion(section = "5.4", id = "unknown")
@@ -61,8 +49,7 @@
@SpecAssertion(section = "5.4", id = "unknown")
public void testSimpleWebBeanClientProxyIsSerializable() throws IOException, ClassNotFoundException
{
- Bean<TunedTuna> tunaBean = manager.resolveByType(TunedTuna.class).iterator().next();
- TunedTuna tuna = manager.getInstance(tunaBean);
+ TunedTuna tuna = manager.getInstanceByType(TunedTuna.class);
assert ConfigurationImpl.get().getBeans().isProxy(tuna);
byte[] bytes = serialize(tuna);
tuna = (TunedTuna) deserialize(bytes);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Tuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Tuna.java 2009-02-13 13:50:46 UTC (rev 1504)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Tuna.java 2009-02-13 14:13:05 UTC (rev 1505)
@@ -2,7 +2,6 @@
import javax.context.RequestScoped;
- at AnotherDeploymentType
@RequestScoped
class Tuna
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/TunedTuna.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/TunedTuna.java 2009-02-13 13:50:46 UTC (rev 1504)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/TunedTuna.java 2009-02-13 14:13:05 UTC (rev 1505)
@@ -2,7 +2,6 @@
import javax.context.RequestScoped;
- at AnotherDeploymentType
@RequestScoped
class TunedTuna
{
More information about the weld-commits
mailing list