CDITCK-574 relax test assertion wrt method count little bit.

jakartaee · May 18, 2017 · 1909d33 · 1909d33
1 parent 4e5a203
commit 1909d33
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/...main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java b/...main/java/org/jboss/cdi/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java
@@ -132,7 +132,7 @@ private void validateServletListenerAnnotatedType(AnnotatedType<TestListener> ty
         assertEquals(type.getBaseType(), TestListener.class);
         assertTrue(type.getAnnotations().isEmpty());
         assertEquals(type.getFields().size(), 2);
-        assertEquals(type.getMethods().size(), 3);
+        assertTrue(type.getMethods().stream().anyMatch(m -> m.getJavaMember().getName().equals("contextInitialized")));
 
         int initializers = 0;
         for (AnnotatedMethod<?> method : type.getMethods()) {
@@ -159,7 +159,7 @@ private void validateTagLibraryListenerAnnotatedType(AnnotatedType<TagLibraryLis
                 EventListener.class, Object.class));
         assertEquals(type.getFields().size(), 2);
         assertEquals(type.getConstructors().size(), 1);
-        assertEquals(type.getMethods().size(), 3);
+        assertTrue(type.getMethods().stream().anyMatch(m -> m.getJavaMember().getName().equals("contextInitialized")));
     }
 
     private void validateServletAnnotatedType(AnnotatedType<TestServlet> type) {
@@ -175,7 +175,7 @@ private void validateFilterAnnotatedType(AnnotatedType<TestFilter> type) {
         assertEquals(type.getFields().size(), 12);
         assertEquals(type.getConstructors().size(), 1);
         assertTrue(type.getConstructors().iterator().next().getParameters().isEmpty());
-        assertEquals(type.getMethods().size(), 8);
+        assertTrue(type.getMethods().stream().anyMatch(m -> m.getJavaMember().getName().equals("doFilter")));
     }
 
     private void validateJsfManagedBeanAnnotatedType(AnnotatedType<Farm> type) {

diff --git a/impl/src/main/resources/tck-tests.xml b/impl/src/main/resources/tck-tests.xml
@@ -31,6 +31,15 @@
                 </methods>
             </class>
 
+            <!-- CDITCK-574 -->
+            <class name="org.jboss.cdi.tck.tests.lookup.injection.non.contextual.ContainerEventTest">
+                <methods>
+                    <exclude name="testProcessAnnotatedTypeEventFiredForFilter"/>
+                    <exclude name="testProcessAnnotatedTypeEventFiredForTagLibraryListener"/>
+                    <exclude name="testProcessAnnotatedTypeEventFiredForServletListener"/>
+                </methods>
+            </class>
+
         </classes>
 
     </test>