Corrections to other tests affected by use of full githash

Author: harrisric

opengrok-web/src/test/java/org/opengrok/web/PageConfigTest.java

@@ -70,6 +70,8 @@
  * Unit tests for the {@code PageConfig} class.
  */
 public class PageConfigTest {
+    private static final String HASH_BB74B7E8 = "bb74b7e849170c31dc1b1b5801c83bf0094a3b10";
+    private static final String HASH_AA35C258 = "aa35c25882b9a60a97758e0ceb276a3f8cb4ae3a";
     private static TestRepository repository = new TestRepository();
 
     @BeforeAll
@@ -317,7 +319,7 @@ public String getPathInfo() {
         PageConfig cfg = PageConfig.get(req1);
         String rev = getLatestRevision(cfg.getResourceFile());
 
-        assertEquals("aa35c258", rev);
+        assertEquals(HASH_AA35C258, rev);
     }
 
     @Test
@@ -352,7 +354,7 @@ public String getPathInfo() {
         PageConfig cfg = PageConfig.get(req1);
         String rev = LatestRevisionUtil.getLastRevFromIndex(new File(repository.getSourceRoot(), filePath));
         assertNotNull(rev);
-        assertEquals("aa35c258", rev);
+        assertEquals(HASH_AA35C258, rev);
     }
 
     @Test
@@ -378,7 +380,7 @@ public String getQueryString() {
 
         String location = cfg.getRevisionLocation(getLatestRevision(cfg.getResourceFile()));
         assertNotNull(location);
-        assertEquals("source/xref/git/main.c?r=aa35c258&a=true", location);
+        assertEquals("source/xref/git/main.c?r=" + HASH_AA35C258 + "&a=true", location);
     }
 
     @Test
@@ -404,7 +406,7 @@ public String getQueryString() {
 
         String location = cfg.getRevisionLocation(getLatestRevision(cfg.getResourceFile()));
         assertNotNull(location);
-        assertEquals("source/xref/git/main.c?r=aa35c258", location);
+        assertEquals("source/xref/git/main.c?r=" + HASH_AA35C258, location);
     }
 
     @Test
@@ -449,7 +451,7 @@ public String getParameter(String name) {
 
     @Test
     void testGetAnnotation() {
-        final String[] revisions = {"aa35c258", "bb74b7e8"};
+        final String[] revisions = {HASH_AA35C258, HASH_BB74B7E8};
 
         for (int i = 0; i < revisions.length; i++) {
             final int index = i;

opengrok-web/src/test/java/org/opengrok/web/api/v1/controller/AnnotationControllerTest.java

@@ -52,6 +52,9 @@
 
 public class AnnotationControllerTest extends OGKJerseyTest {
 
+    private static final String HASH_BB74B7E8 = "bb74b7e849170c31dc1b1b5801c83bf0094a3b10";
+    private static final String HASH_AA35C258 = "aa35c25882b9a60a97758e0ceb276a3f8cb4ae3a";
+
     private final RuntimeEnvironment env = RuntimeEnvironment.getInstance();
 
     private TestRepository repository;
@@ -121,8 +124,8 @@ public void testAnnotationAPI() throws IOException {
         List<String> ids = annotations.stream().
                 map(AnnotationController.AnnotationDTO::getRevision).
                 collect(Collectors.toList());
-        assertEquals(Arrays.asList("bb74b7e8", "bb74b7e8", "bb74b7e8", "bb74b7e8", "bb74b7e8",
-                "bb74b7e8", "bb74b7e8", "bb74b7e8", "aa35c258", "aa35c258", "aa35c258"), ids);
+        assertEquals(Arrays.asList(HASH_BB74B7E8, HASH_BB74B7E8, HASH_BB74B7E8, HASH_BB74B7E8, HASH_BB74B7E8,
+                HASH_BB74B7E8, HASH_BB74B7E8, HASH_BB74B7E8, HASH_AA35C258, HASH_AA35C258, HASH_AA35C258), ids);
         List<String> versions = annotations.stream().
                 map(AnnotationController.AnnotationDTO::getVersion).
                 collect(Collectors.toList());
@@ -136,7 +139,7 @@ public void testAnnotationAPIWithRevision() {
         final String path = "git/Makefile";
         List<AnnotationController.AnnotationDTO> annotations = target("annotation")
                 .queryParam("path", path)
-                .queryParam("revision", "bb74b7e8")
+                .queryParam("revision", HASH_BB74B7E8)
                 .request()
                 .get(new GenericType<>() {
                 });
@@ -150,6 +153,6 @@ public void testAnnotationAPIWithRevision() {
                 collect(Collectors.toList());
         assertEquals(Arrays.asList("1/1", "1/1", "1/1", "1/1", "1/1", "1/1", "1/1", "1/1"),
                 versions);
-        assertEquals(Collections.singleton("bb74b7e8"), ids);
+        assertEquals(Collections.singleton(HASH_BB74B7E8), ids);
     }
 }