Repository: ignite Updated Branches: refs/heads/master f76422600 -> 005798f00
IGNITE-10828 GridAbstractTest calculates test count incorrectly - Fixes #5756. Signed-off-by: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/005798f0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/005798f0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/005798f0 Branch: refs/heads/master Commit: 005798f00fe8d07c46543c75bd579b1988fce727 Parents: f764226 Author: Eduard Shangareev <eshangar...@gridgain.com> Authored: Thu Dec 27 19:38:23 2018 +0300 Committer: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com> Committed: Thu Dec 27 19:38:23 2018 +0300 ---------------------------------------------------------------------- .../testframework/junits/GridAbstractTest.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/005798f0/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 600985c..97791c9 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -43,7 +43,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import java.util.function.BiPredicate; import javax.cache.configuration.Factory; import javax.cache.configuration.FactoryBuilder; import org.apache.ignite.Ignite; @@ -128,6 +127,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; import org.junit.runners.model.Statement; +import org.junit.runners.model.TestClass; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.FileSystemXmlApplicationContext; @@ -2591,16 +2591,12 @@ public abstract class GridAbstractTest extends JUnit3TestLegacySupport { if (this0.forceTestCnt) cnt = this0.testCnt; - else { - BiPredicate<Method, Class<? extends Annotation>> annotated - = (m, cls) -> m.getAnnotation(cls) != null; - - cnt = 0; - - for (Method m : this0.getClass().getMethods()) - if (annotated.test(m, Test.class) && !annotated.test(m, Ignore.class)) - cnt++; - } + else + cnt = (int)new TestClass(this0.getClass()) + .getAnnotatedMethods(Test.class) + .stream() + .filter(method -> method.getAnnotation(Ignore.class) == null) + .count(); numOfTests = cnt; }
