Merge pull request #3913 from Agnul97/fix-junitTestsExclusion

FIX - recently introduced junit tests poorly written
eclipse-kapua · Dec 5, 2023 · 06742b4 · 06742b4
2 parents 46921a5 + 9277ea5
commit 06742b4
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -109,6 +109,7 @@
         <jolokia-jvm.version>1.3.4</jolokia-jvm.version>
         <jose4j.version>0.7.10</jose4j.version>
         <junit.version>4.13.2</junit.version>
+        <jupiter.version>5.9.2</jupiter.version>
         <liquibase.version>3.6.3</liquibase.version>
         <log4j-api.version>2.17.1</log4j-api.version>
         <log4j2-mock.version>0.0.2</log4j2-mock.version>
@@ -1809,6 +1810,11 @@
                 <artifactId>junit</artifactId>
                 <version>${junit.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>${jupiter.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>

diff --git a/...g/eclipse/kapua/service/authentication/shiro/realm/AccessTokenCredentialsHandlerTest.java b/...g/eclipse/kapua/service/authentication/shiro/realm/AccessTokenCredentialsHandlerTest.java
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authentication.shiro.realm;
 
+import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.eclipse.kapua.service.authentication.AccessTokenCredentials;
 import org.eclipse.kapua.service.authentication.exception.KapuaAuthenticationException;
 import org.eclipse.kapua.service.authentication.shiro.AccessTokenCredentialsImpl;
@@ -21,7 +22,9 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+@Category(JUnitTests.class)
 public class AccessTokenCredentialsHandlerTest {
 
     AccessTokenCredentialsHandler instance;

diff --git a/...va/org/eclipse/kapua/service/authentication/shiro/realm/ApiKeyCredentialsHandlerTest.java b/...va/org/eclipse/kapua/service/authentication/shiro/realm/ApiKeyCredentialsHandlerTest.java
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authentication.shiro.realm;
 
+import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.eclipse.kapua.service.authentication.ApiKeyCredentials;
 import org.eclipse.kapua.service.authentication.exception.KapuaAuthenticationException;
 import org.eclipse.kapua.service.authentication.shiro.ApiKeyCredentialsImpl;
@@ -21,7 +22,9 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+@Category(JUnitTests.class)
 public class ApiKeyCredentialsHandlerTest {
 
     ApiKeyCredentialsHandler instance;

diff --git a/.../java/org/eclipse/kapua/service/authentication/shiro/realm/JwtCredentialsHandlerTest.java b/.../java/org/eclipse/kapua/service/authentication/shiro/realm/JwtCredentialsHandlerTest.java
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authentication.shiro.realm;
 
+import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.eclipse.kapua.service.authentication.JwtCredentials;
 import org.eclipse.kapua.service.authentication.exception.KapuaAuthenticationException;
 import org.eclipse.kapua.service.authentication.shiro.JwtCredentialsImpl;
@@ -21,7 +22,9 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+@Category(JUnitTests.class)
 public class JwtCredentialsHandlerTest {
 
     JwtCredentialsHandler instance;

diff --git a/.../org/eclipse/kapua/service/authentication/shiro/realm/UserPassCredentialsHandlerTest.java b/.../org/eclipse/kapua/service/authentication/shiro/realm/UserPassCredentialsHandlerTest.java
@@ -12,6 +12,7 @@
  *******************************************************************************/
 package org.eclipse.kapua.service.authentication.shiro.realm;
 
+import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.eclipse.kapua.service.authentication.UsernamePasswordCredentials;
 import org.eclipse.kapua.service.authentication.exception.KapuaAuthenticationException;
 import org.eclipse.kapua.service.authentication.shiro.UsernamePasswordCredentialsImpl;
@@ -21,7 +22,9 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+@Category(JUnitTests.class)
 public class UserPassCredentialsHandlerTest {
 
     UserPassCredentialsHandler instance;

diff --git a/service/tag/internal/pom.xml b/service/tag/internal/pom.xml
@@ -43,7 +43,6 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...tag/internal/src/test/java/org/eclipse/kapua/service/tag/internal/TagServiceImplTest.java b/...tag/internal/src/test/java/org/eclipse/kapua/service/tag/internal/TagServiceImplTest.java
@@ -18,7 +18,6 @@
 import org.eclipse.kapua.model.domain.Actions;
 import org.eclipse.kapua.model.id.KapuaId;
 import org.eclipse.kapua.model.id.KapuaIdImpl;
-import org.eclipse.kapua.qa.markers.junit.JUnitTests;
 import org.eclipse.kapua.service.authorization.AuthorizationService;
 import org.eclipse.kapua.service.authorization.permission.Permission;
 import org.eclipse.kapua.service.authorization.permission.PermissionFactory;
@@ -27,7 +26,6 @@
 import org.eclipse.kapua.service.tag.TagRepository;
 import org.eclipse.kapua.storage.TxContext;
 import org.eclipse.kapua.storage.TxManager;
-import org.junit.experimental.categories.Category;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -37,7 +35,7 @@
 import java.math.BigInteger;
 import java.util.function.BiConsumer;
 
-@Category(JUnitTests.class)
+@org.junit.jupiter.api.Tag("org.eclipse.kapua.qa.markers.junit.JUnitTests")
 public class TagServiceImplTest {
 
     private static final MockSettings FAIL_ON_UNPREDICTED_METHOD_CALL = Mockito.withSettings()