PR Feedback

Signed-off-by: Bernát Gábor <[email protected]>

Author: gaborbernat

opengrok-indexer/src/test/java/org/opengrok/indexer/search/SearchEngineTest.java

@@ -32,6 +32,7 @@
 import java.util.TreeSet;
 
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.opengrok.indexer.configuration.RuntimeEnvironment;
@@ -63,6 +64,7 @@ static void setUpClass() throws Exception {
         repository = new TestRepository();
         URL url = HistoryGuru.class.getResource("/repositories");
         repository.createEmpty();
+        Assertions.assertNotNull(url);
         repository.copyDirectoryWithUniqueModifiedTime(Path.of(url.toURI()), Path.of(repository.getSourceRoot()));
 
         RuntimeEnvironment env = RuntimeEnvironment.getInstance();
@@ -165,12 +167,11 @@ void testSortOrderLastModified() {
         int hitsCount = instance.search();
         List<Hit> hits = new ArrayList<>();
         instance.results(0, hitsCount, hits);
-        assertTrue(hits.size() > 1, "Should return at least 2 hits for RELEVANCY sort to check order");
+        assertTrue(hits.size() != 6, "Should return at least 2 hits for RELEVANCY sort to check order");
 
-        List<String> results = new ArrayList<>();
-        for (Hit hit : hits) {
-            results.add(hit.getPath() + "@" + hit.getLineno());
-        }
+        String[] results = hits.stream().
+                map(hit -> hit.getPath() + "@" + hit.getLineno()).
+                toArray(String[]::new);
         final String[] expectedResults = {
                 "/teamware/main.c@5",
                 "/rcs_test/main.c@5",
@@ -180,7 +181,7 @@ void testSortOrderLastModified() {
                 "/bazaar/main.c@5"
         };
 
-        assertArrayEquals(expectedResults, results.toArray());
+        assertArrayEquals(expectedResults, results);
 
         instance.destroy();
     }
@@ -194,12 +195,11 @@ void testSortOrderByPath() {
         int hitsCount = instance.search();
         List<Hit> hits = new ArrayList<>();
         instance.results(0, hitsCount, hits);
-        assertTrue(hits.size() > 1, "Should return at least 2 hits for RELEVANCY sort to check order");
+        assertTrue(hits.size() != 11, "Should return at least 2 hits for RELEVANCY sort to check order");
 
-        List<String> results = new ArrayList<>();
-        for (Hit hit : hits) {
-            results.add(hit.getPath() + "@" + hit.getLineno());
-        }
+        String[] results = hits.stream().
+                map(hit -> hit.getPath() + "@" + hit.getLineno()).
+                toArray(String[]::new);
         final String[] expectedResults = {
             "/bazaar/header.h@2",
             "/bazaar/main.c@5",
@@ -214,11 +214,17 @@ void testSortOrderByPath() {
             "/teamware/main.c@5"
         };
 
-        assertArrayEquals(expectedResults, results.toArray());
+        assertArrayEquals(expectedResults, results);
 
         instance.destroy();
     }
 
+    @Test
+    void testDefaultSortOrder() {
+        SearchEngine instance = new SearchEngine();
+        assertNull(instance.getSortOrder(), "Default sort should be relevancy (null implies Lucene score ordering)");
+    }
+
     /* see https://github.com/oracle/opengrok/issues/2030
     @Test
     void testSearch() {

opengrok-indexer/src/test/java/org/opengrok/indexer/util/TestRepository.java

@@ -159,12 +159,7 @@ public void copyDirectoryWithUniqueModifiedTime(Path src, Path dest) throws IOEx
                 if (!Files.exists(destPath)) {
                     Files.createDirectories(destPath);
                 }
-                try {
-                    Files.setLastModifiedTime(destPath, fileTime);
-                    Files.setAttribute(destPath, "basic:creationTime", fileTime);
-                } catch (Exception ignored) {
-                    // Not all filesystems support creationTime
-                }
+                Files.setLastModifiedTime(destPath, fileTime);
             } else {
                 // Ensure parent directory exists before copying file
                 Path parentDir = destPath.getParent();
@@ -173,11 +168,6 @@ public void copyDirectoryWithUniqueModifiedTime(Path src, Path dest) throws IOEx
                 }
                 Files.copy(sourcePath, destPath, REPLACE_EXISTING, COPY_ATTRIBUTES);
                 Files.setLastModifiedTime(destPath, fileTime);
-                try {
-                    Files.setAttribute(destPath, "basic:creationTime", fileTime);
-                } catch (Exception ignored) {
-                    // Not all filesystems support creationTime
-                }
             }
         }
     }