add test case for the not-modified case

Author: vladak

opengrok-web/src/main/java/org/opengrok/web/PageConfig.java

@@ -1828,18 +1828,7 @@ private SortedSet<AcceptedMessage> getProjectMessages() {
      * @see <a href="https://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html">HTTP Caching</a>
      */
     public boolean isNotModified(HttpServletRequest request, HttpServletResponse response) {
-        String currentEtag = String.format("W/\"%s\"",
-                Objects.hash(
-                        // last modified time as UTC timestamp in millis
-                        getLastModified(),
-                        // all project related messages which changes the view
-                        getProjectMessages(),
-                        // last timestamp value
-                        getEnv().getDateForLastIndexRun() != null ? getEnv().getDateForLastIndexRun().getTime() : 0,
-                        // OpenGrok version has changed since the last time
-                        Info.getVersion()
-                )
-        );
+        String currentEtag = getEtag();
 
         String headerEtag = request.getHeader(HttpHeaders.IF_NONE_MATCH);
         if (headerEtag != null && headerEtag.equals(currentEtag)) {
@@ -1853,6 +1842,21 @@ public boolean isNotModified(HttpServletRequest request, HttpServletResponse res
         return false;
     }
 
+    @VisibleForTesting @NotNull String getEtag() {
+        return String.format("W/\"%s\"",
+                Objects.hash(
+                        // last modified time as UTC timestamp in millis
+                        getLastModified(),
+                        // all project related messages which changes the view
+                        getProjectMessages(),
+                        // last timestamp value
+                        getEnv().getDateForLastIndexRun() != null ? getEnv().getDateForLastIndexRun().getTime() : 0,
+                        // OpenGrok version has changed since the last time
+                        Info.getVersion()
+                )
+        );
+    }
+
     /**
      * @param root root path
      * @param path path

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

@@ -49,7 +49,6 @@
 import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.mockito.Mockito;
 import org.opengrok.indexer.authorization.AuthControlFlag;
 import org.opengrok.indexer.authorization.AuthorizationFramework;
 import org.opengrok.indexer.authorization.AuthorizationPlugin;
@@ -73,6 +72,9 @@
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.startsWith;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static org.opengrok.indexer.condition.RepositoryInstalled.Type.MERCURIAL;
 import static org.opengrok.indexer.history.LatestRevisionUtil.getLatestRevision;
 
@@ -654,7 +656,7 @@ public String getPathInfo() {
     }
 
     @Test
-    void testIsNotModified() {
+    void testIsNotModifiedEtag() {
         HttpServletRequest req = new DummyHttpServletRequest() {
             @Override
             public String getHeader(String name) {
@@ -671,8 +673,20 @@ public String getPathInfo() {
         };
 
         PageConfig cfg = PageConfig.get(req);
-        HttpServletResponse resp = Mockito.mock(HttpServletResponse.class);
+        HttpServletResponse resp = mock(HttpServletResponse.class);
         assertFalse(cfg.isNotModified(req, resp));
-        Mockito.verify(resp).setHeader(eq(HttpHeaders.ETAG), startsWith("W/"));
+        verify(resp).setHeader(eq(HttpHeaders.ETAG), startsWith("W/"));
+    }
+
+    @Test
+    void testIsNotModifiedNotModified() {
+        DummyHttpServletRequest req = mock(DummyHttpServletRequest.class);
+        when(req.getPathInfo()).thenReturn("/");
+        PageConfig cfg = PageConfig.get(req);
+        String etag = cfg.getEtag();
+        when(req.getHeader(HttpHeaders.IF_NONE_MATCH)).thenReturn(etag);
+        HttpServletResponse resp = mock(HttpServletResponse.class);
+        assertTrue(cfg.isNotModified(req, resp));
+        verify(resp).setStatus(eq(HttpServletResponse.SC_NOT_MODIFIED));
     }
 }