Fix tests import

keeps · Nov 8, 2023 · 5568877 · 5568877
1 parent b09d52e
commit 5568877
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/roda-core/roda-core-tests/src/main/java/org/roda/core/index/FilterTest.java b/roda-core/roda-core-tests/src/main/java/org/roda/core/index/FilterTest.java
@@ -7,8 +7,9 @@
  */
 package org.roda.core.index;
 
-import static org.junit.Assert.assertTrue;
 import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+import static org.testng.AssertJUnit.fail;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -60,19 +61,15 @@
 @Test(groups = {RodaConstants.TEST_GROUP_DEV})
 public class FilterTest {
   private static final Logger LOGGER = LoggerFactory.getLogger(FilterTest.class);
-
+  private static final int PAGE_SIZE = 5;
+  private static final int PREMIS_CORPORA_SIZE = 8474;
+  private static final String REPRESENTATION_ID = CorporaConstants.REPRESENTATION_1_ID;
   private static Path basePath;
-
   private static Path corporaPath;
   private static StorageService corporaService;
-
   private static ModelService model;
   private static IndexService index;
 
-  private static final int PAGE_SIZE = 5;
-  private static final int PREMIS_CORPORA_SIZE = 8474;
-  private static final String REPRESENTATION_ID = CorporaConstants.REPRESENTATION_1_ID;
-
   @BeforeClass
   public static void setUp() throws URISyntaxException, GenericException {
     URL corporaURL = ModelServiceTest.class.getResource("/corpora");
@@ -283,9 +280,9 @@ public void run() {
         IndexedFile file = index.retrieve(IndexedFile.class, uuid,
           Arrays.asList(RodaConstants.INDEX_UUID, RodaConstants.FILE_HASH));
 
-        assertTrue("File " + id + " has no hash field", 0 < file.getHash().size());
+        assertTrue("File " + id + " has no hash field", file.getHash().isEmpty());
       } catch (NotFoundException e) {
-        assertTrue("File " + id + " was not found on index", false);
+        fail("File " + id + " was not found on index");
       }
     }
 

diff --git a/roda-core/roda-core-tests/src/main/java/org/roda/core/index/SolrUtilsTest.java b/roda-core/roda-core-tests/src/main/java/org/roda/core/index/SolrUtilsTest.java
@@ -8,9 +8,9 @@
 package org.roda.core.index;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertTrue;
 
 import java.io.IOException;
 import java.net.URISyntaxException;

diff --git a/roda-core/roda-core-tests/src/main/java/org/roda/core/model/LiteRODAObjectsTest.java b/roda-core/roda-core-tests/src/main/java/org/roda/core/model/LiteRODAObjectsTest.java
@@ -7,7 +7,7 @@
  */
 package org.roda.core.model;
 
-import static org.junit.Assert.fail;
+import static org.testng.AssertJUnit.fail;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertTrue;