Author: shane.bryzak(a)jboss.com
Date: 2009-09-29 08:50:49 -0400 (Tue, 29 Sep 2009)
New Revision: 3799
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.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/enterprise/definition/EnterpriseBeanDefinitionTest.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/policy/PolicyAvailabilityTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java
tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
Log:
matched some unmatched tests
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-09-29
12:11:06 UTC (rev 3798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-09-29
12:50:49 UTC (rev 3799)
@@ -45,7 +45,7 @@
}
@Test(groups = { "contexts", "integration" })
- @SpecAssertion(section = "6.7.3", id = "ea")
+ @SpecAssertion(section = "6.7.3", id = "e")
public void testApplicationContextSharedBetweenServletRequests() throws Exception
{
WebClient webClient = new WebClient();
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-09-29
12:11:06 UTC (rev 3798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-09-29
12:50:49 UTC (rev 3799)
@@ -63,7 +63,7 @@
}
@Test(groups = { "contexts", "el" })
- @SpecAssertion(section = "6.4", id = "c")
+ @SpecAssertion(section = "6.4", id = "ca")
public void testInstanceUsedForElEvaluationNotShared() throws Exception
{
Set<Bean<Fox>> foxBeans = getBeans(Fox.class);
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-09-29
12:11:06 UTC (rev 3798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-09-29
12:50:49 UTC (rev 3799)
@@ -42,8 +42,8 @@
@SpecAssertion(section="8.1.3", id="d"),
@SpecAssertion(section="8.1.2", id="f"),
@SpecAssertion(section="8.1.2", id="b"),
- @SpecAssertion(section="7.2", id="b"),
- @SpecAssertion(section="7.2", id="ha")
+ @SpecAssertion(section="7.2", id="b")
+ //(a)SpecAssertion(section="7.2", id="ha") removed from spec
})
public void testDecoratorInvocation()
{
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java 2009-09-29
12:11:06 UTC (rev 3798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/custom/CustomBeanImplementationTest.java 2009-09-29
12:50:49 UTC (rev 3799)
@@ -37,7 +37,10 @@
{
@Test
- @SpecAssertions( { @SpecAssertion(section = "5.1", id = "b"),
@SpecAssertion(section = "5.2", id = "k") })
+ @SpecAssertions({
+ @SpecAssertion(section = "5.1", id = "b"),
+ @SpecAssertion(section = "5.2.1", id = "k")
+ })
public void testGetBeanClassCalled()
{
assert CatBean.bean.isGetBeanClassCalled();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-09-29
12:11:06 UTC (rev 3798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-09-29
12:50:49 UTC (rev 3799)
@@ -66,7 +66,7 @@
@SpecAssertions({
//@SpecAssertion(section = "4.3.2", id = "d"),
@SpecAssertion(section="4.3", id="cb"),
- @SpecAssertion(section = "5.6.8", id = "ba")
+ @SpecAssertion(section = "5.6.8", id = "baa")
})
public void testObserverCalledOnMostSpecializedInstance()
{
@@ -152,7 +152,7 @@
}
@Test(groups = { "events" })
- @SpecAssertion(section = "11.1.3", id = "g")
+ @SpecAssertion(section = "11.1.3", id = "ga")
public void testInstanceOfBeanForEveryEnabledObserverMethod()
{
assert !getCurrentManager().resolveObserverMethods(new StockPrice()).isEmpty();
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java 2009-09-29
12:11:06 UTC (rev 3798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/ConditionalObserverTest.java 2009-09-29
12:50:49 UTC (rev 3799)
@@ -18,7 +18,7 @@
{
@Test(groups = { "events" })
@SpecAssertions( {
- @SpecAssertion(section = "5.6.8", id = "ba"),
+ @SpecAssertion(section = "5.6.8", id = "baa"),
@SpecAssertion(section = "10.4.4", id = "a")
} )
public void testConditionalObserver()
@@ -40,7 +40,7 @@
}
@Test(groups = { "events" })
- @SpecAssertion(section = "5.6.8", id = "ba")
+ @SpecAssertion(section = "5.6.8", id = "baa")
public void testObserverMethodInvokedOnReturnedInstanceFromContext()
{
RecluseSpider spider = getInstanceByType(RecluseSpider.class);
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java 2009-09-29
12:11:06 UTC (rev 3798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java 2009-09-29
12:50:49 UTC (rev 3799)
@@ -42,14 +42,14 @@
{
@Test(groups = "ri-broken")
// Event resolution seems to be broken here
- @SpecAssertion(section = "11.5.9", id = "aa")
+ @SpecAssertion(section = "11.5.9", id = "aaa")
public void testProcessObserverMethodEventsSent()
{
assert ProcessObserverMethodObserver.getEventtypes().contains(EventA.class);
}
@Test(groups = "ri-broken")
- @SpecAssertion(section = "11.5.9", id = "ab")
+ @SpecAssertion(section = "11.5.9", id = "aba")
public void testGetAnnotatedMethod()
{
assert
ProcessObserverMethodObserver.getAnnotatedMethod().getParameters().iterator().next().getBaseType().equals(EventA.class);
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-09-29
12:11:06 UTC (rev 3798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-09-29
12:50:49 UTC (rev 3799)
@@ -36,7 +36,7 @@
@Test(groups = "ri-broken")
@SpecAssertions({
@SpecAssertion(section = "11.2", id = "ba"),
- @SpecAssertion(section = "11.5.7", id = "b")
+ @SpecAssertion(section = "11.5.7", id = "ba")
})
public void testProduceCallsInitializer()
{
@@ -48,7 +48,7 @@
@Test(groups = "ri-broken")
@SpecAssertions({
- @SpecAssertion(section = "11.2", id = "bb")
+ @SpecAssertion(section = "11.2", id = "ba")
})
public void testProduceCallsConstructor()
{
@@ -122,9 +122,9 @@
@Test(groups = "ri-broken")
@SpecAssertions({
- @SpecAssertion(section = "11.2", id = "ea"),
+ @SpecAssertion(section = "11.2", id = "eaa"),
@SpecAssertion(section = "11.5.7", id = "a"),
- @SpecAssertion(section = "11.5.7", id = "b"),
+ @SpecAssertion(section = "11.5.7", id = "ba"),
@SpecAssertion(section = "11.5.7", id = "c"),
@SpecAssertion(section = "11.5.7", id = "d"),
@SpecAssertion(section = "12.3", id = "ha")
@@ -140,9 +140,9 @@
@Test(groups = "ri-broken")
@SpecAssertions({
- @SpecAssertion(section = "11.2", id = "eb"),
+ @SpecAssertion(section = "11.2", id = "eba"),
@SpecAssertion(section = "11.5.7", id = "a"),
- @SpecAssertion(section = "11.5.7", id = "b"),
+ @SpecAssertion(section = "11.5.7", id = "ba"),
@SpecAssertion(section = "11.5.7", id = "c"),
@SpecAssertion(section = "11.5.7", id = "d"),
@SpecAssertion(section = "12.3", id = "hb")
@@ -156,7 +156,7 @@
@Test(groups = "ri-broken")
@SpecAssertions({
- @SpecAssertion(section = "11.2", id = "fa")
+ @SpecAssertion(section = "11.2", id = "faa")
})
public void testProducerForMethodDisposesProduct()
{
@@ -169,7 +169,7 @@
@Test(groups = "ri-broken")
@SpecAssertions({
- @SpecAssertion(section = "11.2", id = "fb")
+ @SpecAssertion(section = "11.2", id = "fba")
})
public void testProducerForFieldDisposesProduct()
{
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-09-29
12:11:06 UTC (rev 3798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-09-29
12:50:49 UTC (rev 3799)
@@ -44,7 +44,7 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.3.5", id = "a"),
+ @SpecAssertion(section = "3.3.5", id = "aa"),
@SpecAssertion(section = "3.3.6", id = "ba")
})
public void testDisposalMethodOnNonBean() throws Exception
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-09-29
12:11:06 UTC (rev 3798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-09-29
12:50:49 UTC (rev 3799)
@@ -75,7 +75,7 @@
@Test(groups = "enterpriseBeans")
@SpecAssertions({
@SpecAssertion(section = "3.2.2", id = "c"),
- @SpecAssertion(section = "3.2.3", id = "a"),
+ @SpecAssertion(section = "3.2.3", id = "aa"),
@SpecAssertion(section = "2.2", id = "l")
})
public void testObjectIsInAPITypes()
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-09-29
12:11:06 UTC (rev 3798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/el/ResolutionByNameTest.java 2009-09-29
12:50:49 UTC (rev 3799)
@@ -32,8 +32,8 @@
public class ResolutionByNameTest extends AbstractJSR299Test
{
- @Test
- @SpecAssertion(section="5.8", id="c")
+ //@Test
+ //(a)SpecAssertion(section="5.8", id="c") removed from spec
public void testQualifiedNameLookup()
{
assert
getCurrentConfiguration().getEl().evaluateValueExpression("#{(game.value ==
'foo' and game.value == 'foo') ? game.value == 'foo' :
false}", Boolean.class);
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-09-29
12:11:06 UTC (rev 3798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-09-29
12:50:49 UTC (rev 3799)
@@ -78,8 +78,8 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "5.2.1", id = "fa"),
- @SpecAssertion(section = "2.6.1", id = "e")
+ @SpecAssertion(section = "5.2.1", id = "fa")
+ //@SpecAssertion(section = "2.6.1", id = "e") removed from
spec
})
public void testProducerPoliciesOnClass() throws Exception
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-09-29
12:11:06 UTC (rev 3798)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/broken/not/policy/stereotype/ClassIsNotPolicyTest.java 2009-09-29
12:50:49 UTC (rev 3799)
@@ -33,7 +33,7 @@
{
@Test(groups = { "policy" })
- @SpecAssertion(section="5.2", id="i")
+ @SpecAssertion(section="5.2.1", id="i")
public void test()
{
assert false;
Modified: tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-09-29 12:11:06 UTC (rev
3798)
+++ tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-09-29 12:50:49 UTC (rev
3799)
@@ -645,9 +645,9 @@
<assertion id="da">
<text>If the bean class of X does not directly extend the bean class of
another managed bean, the container automatically detects the problem and treats it as a
definition error, as defined in Section 12.4, "Problems detected automatically by the
container".</text>
</assertion>
- </section>
-
- <section id="3.1.6" title="Default name for a managed bean">
+ </section>
+
+ <section id="3.1.5" title="Default name for a managed bean">
<assertion id="a">
<text>The default name for a managed bean is the unqualified class name of
the bean class, after converting the first character to lower case</text>
</assertion>
@@ -3339,10 +3339,8 @@
<assertion id="af">
<text>Check |ServletRequestListener|</text>
</assertion>
-
</group>
-
<assertion id="b">
<text>The application scope is active during any Java EE web service
invocation.</text>
</assertion>