[ignite-3] branch ignite-20086 updated: minor.

[amashenkov]

This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a commit to branch ignite-20086
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/ignite-20086 by this push:
     new 860165b904 minor.
860165b904 is described below

commit 860165b90446d390d93a210c1a11877f298c6ef1
Author: amashenkov <andrey.mashen...@gmail.com>
AuthorDate: Fri Jul 28 20:09:33 2023 +0300

    minor.
---
 .../ignite/internal/TestsExtendsBaseTestClass.java   | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git 
a/modules/arch-test/src/test/java/org/apache/ignite/internal/TestsExtendsBaseTestClass.java
 
b/modules/arch-test/src/test/java/org/apache/ignite/internal/TestsExtendsBaseTestClass.java
index 56b551f1f9..0fed28afa6 100644
--- 
a/modules/arch-test/src/test/java/org/apache/ignite/internal/TestsExtendsBaseTestClass.java
+++ 
b/modules/arch-test/src/test/java/org/apache/ignite/internal/TestsExtendsBaseTestClass.java
@@ -17,7 +17,9 @@
 
 package org.apache.ignite.internal;
 
+import static 
com.tngtech.archunit.core.domain.JavaClass.Predicates.containAnyMethodsThat;
 import static 
com.tngtech.archunit.core.domain.properties.CanBeAnnotated.Predicates.annotatedWith;
+import static 
com.tngtech.archunit.lang.conditions.ArchConditions.beAssignableTo;
 
 import com.tngtech.archunit.base.DescribedPredicate;
 import com.tngtech.archunit.core.domain.JavaClass;
@@ -45,7 +47,7 @@ public class TestsExtendsBaseTestClass {
             // do not extend base class
             
.that().areNotAssignableTo("org.apache.ignite.internal.testframework.BaseIgniteAbstractTest")
             // are classes with tests
-            
.and().containAnyMethodsThat(annotatedWith(Test.class)).or(annotatedWith(ParameterizedTest.class))
+            
.and(containAnyMethodsThat(annotatedWith(Test.class).or(annotatedWith(ParameterizedTest.class))))
             // uses Mockito framework
             .and(new DescribedPredicate<>("uses Mockito framework") {
                 @Override
@@ -54,18 +56,6 @@ public class TestsExtendsBaseTestClass {
                             .anyMatch(dep -> 
"org.mockito.Mockito".equals(dep.getTargetClass().getFullName()));
                 }
             })
-            .should()
-            
.beAssignableTo("org.apache.ignite.internal.testframework.BaseIgniteAbstractTest")
-            .because("Test classes, which uses Mockito framework, must extends 
BaseIgniteAbstractTest");
-
-    //TODO: remove or enable.
-    public static final ArchRule TEST_CLASS_EXTENDS_BASE_TEST_CLASS = 
ArchRuleDefinition
-            .classes()
-            // do not extend base class
-            
.that().areNotAssignableTo("org.apache.ignite.internal.testframework.BaseIgniteAbstractTest")
-            // are classes with tests
-            
.and().containAnyMethodsThat(annotatedWith(Test.class)).or(annotatedWith(ParameterizedTest.class))
-            .should()
-            
.beAssignableTo("org.apache.ignite.internal.testframework.BaseIgniteAbstractTest")
-            .because("All test classes must extends BaseIgniteAbstractTest");
+            
.should(beAssignableTo("org.apache.ignite.internal.testframework.BaseIgniteAbstractTest"))
+            .because("Test class, which uses Mockito framework, must extends 
BaseIgniteAbstractTest");
 }