rename DummyHttpServletRequest to avoid duplication

Author: Vladimir Kotal

plugins/LdapPlugin/test/opengrok/auth/plugin/LdapAttrTest.java

@@ -35,7 +35,7 @@
 import javax.servlet.http.HttpServletRequest;
 import opengrok.auth.entity.LdapUser;
 import opengrok.auth.plugin.entity.User;
-import opengrok.auth.plugin.util.DummyHttpServletRequest;
+import opengrok.auth.plugin.util.DummyHttpServletRequestLdap;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
@@ -84,7 +84,7 @@ public void setUp() {
     }
 
     private void prepareRequest(String username, String mail, String... ous) {
-        dummyRequest = new DummyHttpServletRequest();
+        dummyRequest = new DummyHttpServletRequestLdap();
         dummyRequest.setAttribute(UserPlugin.REQUEST_ATTR, new User(username, "123", null, false));
         dummyRequest.getSession().setAttribute(LdapUserPlugin.SESSION_ATTR, new LdapUser(mail, "123",
                 new TreeSet<>(Arrays.asList(ous))));

plugins/LdapPlugin/test/opengrok/auth/plugin/util/DummyHttpServletRequest.java renamed to plugins/LdapPlugin/test/opengrok/auth/plugin/util/DummyHttpServletRequestLdap.java

@@ -17,7 +17,7 @@
  * CDDL HEADER END
  */
 
- /*
+/*
  * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
  */
 package opengrok.auth.plugin.util;
@@ -41,7 +41,7 @@
 import opengrok.auth.plugin.UserPlugin;
 import opengrok.auth.plugin.entity.User;
 
-public class DummyHttpServletRequest implements HttpServletRequest {
+public class DummyHttpServletRequestLdap implements HttpServletRequest {
 
     private final Map<String, String> headers = new HashMap<String, String>();
     private final Map<String, Object> attrs = new HashMap<String, Object>();
@@ -70,7 +70,7 @@ public long getLastAccessedTime() {
 
         @Override
         public ServletContext getServletContext() {
-            return (ServletContext) DummyHttpServletRequest.this;
+            return (ServletContext) DummyHttpServletRequestLdap.this;
         }
 
         @Override

plugins/UserPlugin/test/opengrok/auth/plugin/UserPluginTest.java

@@ -24,7 +24,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import opengrok.auth.plugin.entity.User;
-import opengrok.auth.plugin.util.DummyHttpServletRequest;
+import opengrok.auth.plugin.util.DummyHttpServletRequestUser;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -46,10 +46,10 @@ public void setUp() {
 
     @Test
     public void testNoUser() {
-        Assert.assertFalse(plugin.isAllowed(new DummyHttpServletRequest(), new Group()));
-        Assert.assertFalse(plugin.isAllowed(new DummyHttpServletRequest(), new Project()));
-        Assert.assertFalse(plugin.isAllowed(new DummyHttpServletRequest(), createGroup("some group")));
-        Assert.assertFalse(plugin.isAllowed(new DummyHttpServletRequest(), createProject("some project")));
+        Assert.assertFalse(plugin.isAllowed(new DummyHttpServletRequestUser(), new Group()));
+        Assert.assertFalse(plugin.isAllowed(new DummyHttpServletRequestUser(), new Project()));
+        Assert.assertFalse(plugin.isAllowed(new DummyHttpServletRequestUser(), createGroup("some group")));
+        Assert.assertFalse(plugin.isAllowed(new DummyHttpServletRequestUser(), createProject("some project")));
     }
 
     @Test
@@ -83,7 +83,7 @@ protected HttpServletRequest createRequest(String email) {
     }
 
     protected HttpServletRequest createRequest(String email, Boolean timeout) {
-        return new DummyHttpServletRequest() {
+        return new DummyHttpServletRequestUser() {
             {
                 setHeader("osso-user-dn", email);
                 setHeader("osso-user-guid", "100");

plugins/UserPlugin/test/opengrok/auth/plugin/decoders/OSSODecoderTest.java

@@ -29,7 +29,7 @@
 import static opengrok.auth.plugin.decoders.OSSOHeaderDecoder.OSSO_USER_DN_HEADER;
 import static opengrok.auth.plugin.decoders.OSSOHeaderDecoder.OSSO_USER_GUID_HEADER;
 import opengrok.auth.plugin.entity.User;
-import opengrok.auth.plugin.util.DummyHttpServletRequest;
+import opengrok.auth.plugin.util.DummyHttpServletRequestUser;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -41,12 +41,12 @@
  */
 public class OSSODecoderTest {
 
-    DummyHttpServletRequest dummyRequest;
+    DummyHttpServletRequestUser dummyRequest;
     OSSOHeaderDecoder decoder = new OSSOHeaderDecoder();
 
     @Before
     public void setUp() {
-        dummyRequest = new DummyHttpServletRequest();
+        dummyRequest = new DummyHttpServletRequestUser();
         dummyRequest.setHeader(OSSO_COOKIE_TIMESTAMP_HEADER, "5761172f");
         dummyRequest.setHeader(OSSO_TIMEOUT_EXCEEDED_HEADER, "");
         dummyRequest.setHeader(OSSO_SUBSCRIBER_DN_HEADER, "");

plugins/UserPlugin/test/opengrok/auth/plugin/util/DummyHttpServletRequest.java renamed to plugins/UserPlugin/test/opengrok/auth/plugin/util/DummyHttpServletRequestUser.java

@@ -39,7 +39,7 @@
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionContext;
 
-public class DummyHttpServletRequest implements HttpServletRequest {
+public class DummyHttpServletRequestUser implements HttpServletRequest {
 
     private final Map<String, String> headers = new HashMap<String, String>();
     private final Map<String, Object> attrs = new HashMap<String, Object>();
@@ -64,7 +64,7 @@ public long getLastAccessedTime() {
 
         @Override
         public ServletContext getServletContext() {
-            return (ServletContext) DummyHttpServletRequest.this;
+            return (ServletContext) DummyHttpServletRequestUser.this;
         }
 
         @Override