[webbeans-commits] Webbeans SVN: r3089 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: implementation/disposal/method/definition and 5 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Sun Jul 19 21:34:57 EDT 2009
Author: shane.bryzak at jboss.com
Date: 2009-07-19 21:34:56 -0400 (Sun, 19 Jul 2009)
New Revision: 3089
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
Log:
matched disposal method, scope definition and resolution by name tests to assertions
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-07-19 23:52:32 UTC (rev 3088)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-07-20 01:34:56 UTC (rev 3089)
@@ -19,7 +19,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@@ -64,7 +64,7 @@
assert bean.getScopeType().equals(RequestScoped.class);
}
- @Test @SpecAssertion(section="2.4.4", id = "a")
+ @Test @SpecAssertion(section="2.4.4", id = "aa")
public void testDefaultScope()
{
assert getBeans(Order.class).size() == 1;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-07-19 23:52:32 UTC (rev 3088)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-07-20 01:34:56 UTC (rev 3089)
@@ -14,7 +14,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@BeansXml("beans.xml")
@@ -25,12 +25,12 @@
@Test
@SpecAssertions({
@SpecAssertion(section = "2.3.5", id = "c"),
- @SpecAssertion(section = "3.4.5", id = "b"),
- @SpecAssertion(section = "3.4.5", id = "c"),
- @SpecAssertion(section = "3.4.5", id = "e"),
- @SpecAssertion(section = "3.4.6", id = "ba"),
- @SpecAssertion(section = "3.4.7", id = "a"),
- @SpecAssertion(section = "3.4.9", id = "aa")
+ @SpecAssertion(section = "3.3.5", id = "b"),
+ @SpecAssertion(section = "3.3.5", id = "c"),
+ @SpecAssertion(section = "3.3.5", id = "e"),
+ @SpecAssertion(section = "3.3.6", id = "ba"),
+ @SpecAssertion(section = "3.3.7", id = "a"),
+ @SpecAssertion(section = "3.3.9", id = "aa")
})
public void testBindingTypesAppliedToDisposalMethodParameters() throws Exception
{
@@ -53,8 +53,8 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.4.5", id = "a"),
- @SpecAssertion(section = "3.4.6", id = "ba")
+ @SpecAssertion(section = "3.3.5", id = "a"),
+ @SpecAssertion(section = "3.3.6", id = "ba")
})
public void testDisposalMethodOnNonBean() throws Exception
{
@@ -83,7 +83,7 @@
* @throws Exception
*/
@Test(groups = { "disposalMethod" })
- @SpecAssertion(section = "3.4.8", id = "a")
+ @SpecAssertion(section = "3.3.8", id = "a")
public void testDisposalMethodParametersGetInjected() throws Exception
{
new RunInDependentContext()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-07-19 23:52:32 UTC (rev 3088)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/methodOnSessionBean/DisposalMethodOnSessionBean.java 2009-07-20 01:34:56 UTC (rev 3089)
@@ -12,7 +12,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@@ -22,8 +22,8 @@
{
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.4.5", id = "d"),
- @SpecAssertion(section = "3.4.7", id = "fa")
+ @SpecAssertion(section = "3.3.5", id = "d"),
+ @SpecAssertion(section = "3.3.7", id = "fa")
})
public void testDisposalMethodNotBusinessOrStatic()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-07-19 23:52:32 UTC (rev 3088)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/multiParams/MultipleDisposeParametersDefinitionTest.java 2009-07-20 01:34:56 UTC (rev 3089)
@@ -11,7 +11,7 @@
import org.testng.annotations.Test;
/**
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@ExpectedDeploymentException(DefinitionError.class)
@@ -20,8 +20,8 @@
{
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.4.6", id = "a"),
- @SpecAssertion(section = "3.4.7", id = "ba")
+ @SpecAssertion(section = "3.3.6", id = "a"),
+ @SpecAssertion(section = "3.3.7", id = "ba")
})
public void testMultipleDisposeParameters()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-07-19 23:52:32 UTC (rev 3088)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-07-20 01:34:56 UTC (rev 3089)
@@ -8,7 +8,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@@ -17,7 +17,7 @@
{
@Test(groups = { "resolution" })
- @SpecAssertion(section = "5.2", id = "c")
+ @SpecAssertion(section = "5.4", id = "review") // deployment types removed from spec
public void testOnlyHighestPrecedenceResolved() throws Exception
{
// Both Cod and Plaice are named "whitefish" - Plaice has the highest
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-07-19 23:52:32 UTC (rev 3088)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-07-20 01:34:56 UTC (rev 3089)
@@ -13,27 +13,27 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
public class ResolutionByNameTest extends AbstractJSR299Test
{
- @Test(groups={"stub", "el"}) @SpecAssertion(section="5.6", id = "aba")
+ @Test(groups={"stub", "el"}) @SpecAssertion(section="5.8", id = "aba")
public void testELResolverRegisteredWithJsf()
{
assert false;
}
- @Test(groups={"stub", "el"}) @SpecAssertion(section="5.6", id = "aaa")
+ @Test(groups={"stub", "el"}) @SpecAssertion(section="5.8", id = "aaa")
public void testELResolverRegisteredWithServlet()
{
assert false;
}
@Test
- @SpecAssertion(section="5.6", id="c")
+ @SpecAssertion(section="5.8", id="c")
public void testQualifiedNameLookup()
{
assert getCurrentConfiguration().getEl().evaluateValueExpression("#{javax.context.conversation}", Conversation.class) != null;
@@ -42,7 +42,7 @@
@Test(groups = "beanLifecycle")
@SpecAssertions({
- @SpecAssertion(section = "5.6", id = "bc"),
+ @SpecAssertion(section = "5.8", id = "bc"),
@SpecAssertion(section = "6.5.2", id = "a")
})
public void testContextCreatesNewInstanceForInjection()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-19 23:52:32 UTC (rev 3088)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-20 01:34:56 UTC (rev 3089)
@@ -52,7 +52,7 @@
}
@Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
- @SpecAssertion(section="5.3", id = "e")
+ @SpecAssertion(section="5.3", id = "review") // seems to be removed from spec - double check
public void testNonBindingTypeUsed()
{
getBeans(Tuna.class, new AnotherDeploymentTypeLiteral());
More information about the weld-commits
mailing list