From 71e8c7efa9cef900b3307aab0d0fd4d9470810a2 Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Tue, 11 Mar 2014 18:15:47 +0200 Subject: [PATCH] Make ExcludeFromSuite annotation Runtime and Inherited Change-Id: I35169d1560ae5e1b9a057d6350de14947f6155ae --- uitest/src/com/vaadin/tests/tb3/ExcludeFromSuite.java | 9 +++++++++ uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java | 6 +----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/uitest/src/com/vaadin/tests/tb3/ExcludeFromSuite.java b/uitest/src/com/vaadin/tests/tb3/ExcludeFromSuite.java index 722b643f78..5208838028 100644 --- a/uitest/src/com/vaadin/tests/tb3/ExcludeFromSuite.java +++ b/uitest/src/com/vaadin/tests/tb3/ExcludeFromSuite.java @@ -15,6 +15,12 @@ */ package com.vaadin.tests.tb3; +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + /** * Marker interface for a TB3+ test class which will exclude the test from any * test suite which automatically scans for test classes. Mostly useful for long @@ -23,6 +29,9 @@ package com.vaadin.tests.tb3; * @since 7.1.10 * @author Vaadin Ltd */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +@Inherited public @interface ExcludeFromSuite { } diff --git a/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java b/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java index f1576a9393..5878e8ab15 100644 --- a/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java +++ b/uitest/src/com/vaadin/tests/tb3/TB3TestSuite.java @@ -246,11 +246,7 @@ public class TB3TestSuite extends Suite { if (c.getAnnotation(ExcludeFromSuite.class) != null) { return false; } - if (c == Object.class) { - return true; - } - - return includeInSuite(c.getSuperclass()); + return true; } } \ No newline at end of file -- 2.39.5