:fix: importing org.junit.Assert and explicitly referencing its metho…

…ds instead of having test classes extend it Signed-off-by: dseurotech <davide.salvador@eurotech.com>
eclipse · Nov 2, 2022 · 3b100a1 · 3b100a1
1 parent 42940f7
commit 3b100a1
Show file tree

Hide file tree

Showing 46 changed files with 714 additions and 668 deletions.
diff --git a/...a/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionQueryImplTest.java b/...a/org/eclipse/kapua/service/authorization/access/shiro/AccessPermissionQueryImplTest.java
@@ -18,30 +18,31 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+
 @Category(JUnitTests.class)
-public class AccessPermissionQueryImplTest extends Assert {
+public class AccessPermissionQueryImplTest {
 
     @Test
     public void accessPermissionQueryImplWithoutParametersTest() {
         AccessPermissionQueryImpl accessPermissionQueryImpl = new AccessPermissionQueryImpl();
-        assertNull("Null expected.", accessPermissionQueryImpl.getScopeId());
-        assertNull("accessPermissionQueryImpl.sortCriteria", accessPermissionQueryImpl.getSortCriteria());
-        assertNotNull("accessPermissionQueryImpl.defaultSortCriteria", accessPermissionQueryImpl.getDefaultSortCriteria());
+        Assert.assertNull("Null expected.", accessPermissionQueryImpl.getScopeId());
+        Assert.assertNull("accessPermissionQueryImpl.sortCriteria", accessPermissionQueryImpl.getSortCriteria());
+        Assert.assertNotNull("accessPermissionQueryImpl.defaultSortCriteria", accessPermissionQueryImpl.getDefaultSortCriteria());
     }
 
     @Test
     public void accessPermissionQueryImplScopeIdParameterTest() {
         AccessPermissionQueryImpl accessPermissionQueryImpl = new AccessPermissionQueryImpl(KapuaId.ONE);
-        assertEquals("Expected and actual values should be the same.", KapuaId.ONE, accessPermissionQueryImpl.getScopeId());
-        assertNull("accessPermissionQueryImpl.sortCriteria", accessPermissionQueryImpl.getSortCriteria());
-        assertNotNull("accessPermissionQueryImpl.defaultSortCriteria", accessPermissionQueryImpl.getDefaultSortCriteria());
+        Assert.assertEquals("Expected and actual values should be the same.", KapuaId.ONE, accessPermissionQueryImpl.getScopeId());
+        Assert.assertNull("accessPermissionQueryImpl.sortCriteria", accessPermissionQueryImpl.getSortCriteria());
+        Assert.assertNotNull("accessPermissionQueryImpl.defaultSortCriteria", accessPermissionQueryImpl.getDefaultSortCriteria());
     }
 
     @Test
     public void accessPermissionQueryImplNullScopeIdParameterTest() {
         AccessPermissionQueryImpl accessPermissionQueryImpl = new AccessPermissionQueryImpl(null);
-        assertNull("Null expected.", accessPermissionQueryImpl.getScopeId());
-        assertNull("accessPermissionQueryImpl.sortCriteria", accessPermissionQueryImpl.getSortCriteria());
-        assertNotNull("accessPermissionQueryImpl.defaultSortCriteria", accessPermissionQueryImpl.getDefaultSortCriteria());
+        Assert.assertNull("Null expected.", accessPermissionQueryImpl.getScopeId());
+        Assert.assertNull("accessPermissionQueryImpl.sortCriteria", accessPermissionQueryImpl.getSortCriteria());
+        Assert.assertNotNull("accessPermissionQueryImpl.defaultSortCriteria", accessPermissionQueryImpl.getDefaultSortCriteria());
     }
 }
diff --git a/...java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleCacheFactoryTest.java b/...java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleCacheFactoryTest.java
@@ -20,20 +20,21 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 
+
 @Category(JUnitTests.class)
-public class AccessRoleCacheFactoryTest extends Assert {
+public class AccessRoleCacheFactoryTest {
 
     @Test
     public void accessRoleCacheFactoryTest() throws Exception {
         Constructor<AccessRoleCacheFactory> accessRoleCacheFactory = AccessRoleCacheFactory.class.getDeclaredConstructor();
         accessRoleCacheFactory.setAccessible(true);
         accessRoleCacheFactory.newInstance();
-        assertTrue("True expected.", Modifier.isPrivate(accessRoleCacheFactory.getModifiers()));
+        Assert.assertTrue("True expected.", Modifier.isPrivate(accessRoleCacheFactory.getModifiers()));
     }
 
     @Test
     public void getInstanceTest() {
-        assertTrue("True expected.", AccessRoleCacheFactory.getInstance() instanceof AccessRoleCacheFactory);
-        assertEquals("Expected and actual values should be the same.", "AccessRoleId", AccessRoleCacheFactory.getInstance().getEntityIdCacheName());
+        Assert.assertTrue("True expected.", AccessRoleCacheFactory.getInstance() instanceof AccessRoleCacheFactory);
+        Assert.assertEquals("Expected and actual values should be the same.", "AccessRoleId", AccessRoleCacheFactory.getInstance().getEntityIdCacheName());
     }
 }
diff --git a/.../java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleCreatorImplTest.java b/.../java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleCreatorImplTest.java
@@ -19,8 +19,9 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+
 @Category(JUnitTests.class)
-public class AccessRoleCreatorImplTest extends Assert {
+public class AccessRoleCreatorImplTest {
 
     AccessRoleCreatorImpl accessRoleCreatorImpl;
 
@@ -31,34 +32,34 @@ public void initialize() {
 
     @Test
     public void accessRoleCreatorImplTest() {
-        assertEquals("Expected and actual values should be the same.", KapuaId.ONE, accessRoleCreatorImpl.getScopeId());
-        assertNull("Null expected.", accessRoleCreatorImpl.getAccessInfoId());
-        assertNull("Null expected.", accessRoleCreatorImpl.getRoleId());
+        Assert.assertEquals("Expected and actual values should be the same.", KapuaId.ONE, accessRoleCreatorImpl.getScopeId());
+        Assert.assertNull("Null expected.", accessRoleCreatorImpl.getAccessInfoId());
+        Assert.assertNull("Null expected.", accessRoleCreatorImpl.getRoleId());
     }
 
     @Test
     public void accessRoleCreatorImplNullTest() {
         AccessRoleCreatorImpl accessRoleCreatorImplNullId = new AccessRoleCreatorImpl(null);
-        assertNull("Null expected.", accessRoleCreatorImplNullId.getScopeId());
-        assertNull("Null expected.", accessRoleCreatorImplNullId.getAccessInfoId());
-        assertNull("Null expected.", accessRoleCreatorImplNullId.getRoleId());
+        Assert.assertNull("Null expected.", accessRoleCreatorImplNullId.getScopeId());
+        Assert.assertNull("Null expected.", accessRoleCreatorImplNullId.getAccessInfoId());
+        Assert.assertNull("Null expected.", accessRoleCreatorImplNullId.getRoleId());
     }
 
     @Test
     public void setAndGetAccessInfoIdTest() {
         accessRoleCreatorImpl.setAccessInfoId(KapuaId.ANY);
-        assertEquals("Expected and actual values should be the same.", KapuaId.ANY, accessRoleCreatorImpl.getAccessInfoId());
+        Assert.assertEquals("Expected and actual values should be the same.", KapuaId.ANY, accessRoleCreatorImpl.getAccessInfoId());
 
         accessRoleCreatorImpl.setAccessInfoId(null);
-        assertNull("Null expected.", accessRoleCreatorImpl.getAccessInfoId());
+        Assert.assertNull("Null expected.", accessRoleCreatorImpl.getAccessInfoId());
     }
 
     @Test
     public void setAndGetRoleIdTest() {
         accessRoleCreatorImpl.setRoleId(KapuaId.ONE);
-        assertEquals("Expected and actual values should be the same.", KapuaId.ONE, accessRoleCreatorImpl.getRoleId());
+        Assert.assertEquals("Expected and actual values should be the same.", KapuaId.ONE, accessRoleCreatorImpl.getRoleId());
 
         accessRoleCreatorImpl.setRoleId(null);
-        assertNull("Null expected.", accessRoleCreatorImpl.getRoleId());
+        Assert.assertNull("Null expected.", accessRoleCreatorImpl.getRoleId());
     }
 }
diff --git a/.../java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleFactoryImplTest.java b/.../java/org/eclipse/kapua/service/authorization/access/shiro/AccessRoleFactoryImplTest.java
@@ -27,8 +27,9 @@
 
 import java.util.Date;
 
+
 @Category(JUnitTests.class)
-public class AccessRoleFactoryImplTest extends Assert {
+public class AccessRoleFactoryImplTest {
 
     AccessRoleFactoryImpl accessRoleFactoryImpl;
     AccessRole accessRole;
@@ -51,56 +52,56 @@ public void initialize() {
     @Test
     public void newEntityTest() {
         AccessRole accessRole = accessRoleFactoryImpl.newEntity(KapuaId.ONE);
-        assertEquals("Expected and actual values should be the same.", KapuaId.ONE, accessRole.getScopeId());
+        Assert.assertEquals("Expected and actual values should be the same.", KapuaId.ONE, accessRole.getScopeId());
     }
 
     @Test
     public void newEntityNullTest() {
         AccessRole accessRole = accessRoleFactoryImpl.newEntity(null);
-        assertNull("Null expected.", accessRole.getScopeId());
+        Assert.assertNull("Null expected.", accessRole.getScopeId());
     }
 
     @Test
     public void newCreatorTest() {
         AccessRoleCreator accessRoleCreator = accessRoleFactoryImpl.newCreator(KapuaId.ONE);
-        assertEquals("Expected and actual values should be the same.", KapuaId.ONE, accessRoleCreator.getScopeId());
+        Assert.assertEquals("Expected and actual values should be the same.", KapuaId.ONE, accessRoleCreator.getScopeId());
     }
 
     @Test
     public void newCreatorNullTest() {
         AccessRoleCreator accessRoleCreator = accessRoleFactoryImpl.newCreator(null);
-        assertNull("Null expected.", accessRoleCreator.getScopeId());
+        Assert.assertNull("Null expected.", accessRoleCreator.getScopeId());
     }
 
     @Test
     public void newQueryTest() {
         AccessRoleQuery accessRoleQuery = accessRoleFactoryImpl.newQuery(KapuaId.ONE);
-        assertEquals("Expected and actual values should be the same.", KapuaId.ONE, accessRoleQuery.getScopeId());
+        Assert.assertEquals("Expected and actual values should be the same.", KapuaId.ONE, accessRoleQuery.getScopeId());
     }
 
     @Test
     public void newQueryNullTest() {
         AccessRoleQuery accessRoleQuery = accessRoleFactoryImpl.newQuery(null);
-        assertNull("Null expected.", accessRoleQuery.getScopeId());
+        Assert.assertNull("Null expected.", accessRoleQuery.getScopeId());
     }
 
     @Test
     public void newListResultTest() {
         AccessRoleListResult accessRoleListResult = accessRoleFactoryImpl.newListResult();
-        assertTrue("True expected.", accessRoleListResult.isEmpty());
+        Assert.assertTrue("True expected.", accessRoleListResult.isEmpty());
     }
 
     @Test
     public void cloneTest() {
         accessRoleFactoryImpl.clone(accessRole);
 
         AccessRole resultAccessRole = accessRoleFactoryImpl.clone(accessRole);
-        assertEquals("Expected and actual values should be the same.", KapuaId.ANY, resultAccessRole.getId());
-        assertEquals("Expected and actual values should be the same.", KapuaId.ONE, resultAccessRole.getScopeId());
-        assertEquals("Expected and actual values should be the same.", KapuaId.ANY, resultAccessRole.getCreatedBy());
-        assertEquals("Expected and actual values should be the same.", createdOn, resultAccessRole.getCreatedOn());
-        assertEquals("Expected and actual values should be the same.", KapuaId.ONE, resultAccessRole.getAccessInfoId());
-        assertEquals("Expected and actual values should be the same.", KapuaId.ANY, resultAccessRole.getRoleId());
+        Assert.assertEquals("Expected and actual values should be the same.", KapuaId.ANY, resultAccessRole.getId());
+        Assert.assertEquals("Expected and actual values should be the same.", KapuaId.ONE, resultAccessRole.getScopeId());
+        Assert.assertEquals("Expected and actual values should be the same.", KapuaId.ANY, resultAccessRole.getCreatedBy());
+        Assert.assertEquals("Expected and actual values should be the same.", createdOn, resultAccessRole.getCreatedOn());
+        Assert.assertEquals("Expected and actual values should be the same.", KapuaId.ONE, resultAccessRole.getAccessInfoId());
+        Assert.assertEquals("Expected and actual values should be the same.", KapuaId.ANY, resultAccessRole.getRoleId());
     }
 
     @Test(expected = KapuaEntityCloneException.class)