Fix unit tests

ORCID · Feb 24, 2025 · adb1782 · adb1782
1 parent d41d686
commit adb1782
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 32 deletions.
diff --git a/orcid-core/src/main/java/org/orcid/core/utils/cache/redis/RedisClient.java b/orcid-core/src/main/java/org/orcid/core/utils/cache/redis/RedisClient.java
@@ -183,30 +183,4 @@ public HashMap<String, JSONObject> getAllValuesForKeyPattern(String matchKey) th
 
         return mappedValuesForKey;
     }
-
-    public static void main(String [] args) {
-        RedisClient client = new RedisClient("xxxxx", 6379, "xxxxxxx");
-        client.init();
-        System.out.println("Connected");
-        Jedis r = client.pool.getResource();
-
-        Set<String> keys = r.keys("spring:session:sessions:*");
-
-        for (String key : keys) {
-            System.out.println("----------------------------------------------");
-            System.out.println(key);
-            String keyType = r.type(key);
-            System.out.println(keyType);
-            if ("hash".equals(keyType)) {
-                Map<String, String> myMap = r.hgetAll(key);
-                for (String tkey : myMap.keySet()) {
-                    System.out.println(tkey + ":     " + myMap.get(tkey));
-                }
-            }
-            if ("string".equals(keyType)) {
-                System.out.println(key + ":     " + r.get("key"));
-            }
-            System.out.println("----------------------------------------------");
-        }
-    }
 }
diff --git a/orcid-web/src/main/java/org/orcid/frontend/spring/configuration/SessionCacheConfig.java b/orcid-web/src/main/java/org/orcid/frontend/spring/configuration/SessionCacheConfig.java
@@ -5,6 +5,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 import org.springframework.data.redis.connection.jedis.JedisClientConfiguration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
@@ -16,10 +17,8 @@
 import java.time.Duration;
 
 @Configuration
-//TODO: Trying to make a custom Redis http session configuration to filter the number of times we commit the transaction
-//Remove this comment once it is working!
-//@EnableRedisHttpSession
 @OrcidEnableRedisHttpSession
+@Profile("!unitTests")
 public class SessionCacheConfig extends AbstractHttpSessionApplicationInitializer {
 
     @Value("${org.orcid.core.utils.cache.session.redis.pool.idle.max:30}")
@@ -29,9 +28,9 @@ public class SessionCacheConfig extends AbstractHttpSessionApplicationInitialize
     @Value("${org.orcid.core.utils.cache.session.redis.pool.wait.millis:1500}")
     private int poolWaitMillis;
 
-    @Value("${org.orcid.core.utils.cache.session.redis.host}")
+    @Value("${org.orcid.core.utils.cache.session.redis.host:localhost}")
     private String host;
-    @Value("${org.orcid.core.utils.cache.session.redis.port}")
+    @Value("${org.orcid.core.utils.cache.session.redis.port:6379}")
     private int port;
     @Value("${org.orcid.core.utils.cache.session.redis.password}")
     private String password;
@@ -66,7 +65,6 @@ public static ConfigureRedisAction configureRedisAction() {
         return ConfigureRedisAction.NO_OP;
     }
 
-    //TODO ... how do we put the cookie on the . domain
     @Bean
     public CookieSerializer cookieSerializer() {
         DefaultCookieSerializer serializer = new DefaultCookieSerializer();

diff --git a/...main/java/org/orcid/frontend/spring/session/redis/OrcidRedisHttpSessionConfiguration.java b/...main/java/org/orcid/frontend/spring/session/redis/OrcidRedisHttpSessionConfiguration.java
@@ -12,6 +12,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportAware;
+import org.springframework.context.annotation.Profile;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.data.redis.connection.RedisConnection;
@@ -56,6 +57,7 @@
 @Configuration(
         proxyBeanMethods = false
 )
+@Profile("!unitTests")
 public class OrcidRedisHttpSessionConfiguration extends SpringHttpSessionConfiguration implements BeanClassLoaderAware, EmbeddedValueResolverAware, ImportAware {
 
     static final String DEFAULT_CLEANUP_CRON = "0 * * * * *";

diff --git a/orcid-web/src/test/java/org/orcid/frontend/web/controllers/AdminControllerTest.java b/orcid-web/src/test/java/org/orcid/frontend/web/controllers/AdminControllerTest.java
@@ -47,6 +47,7 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.util.ReflectionTestUtils;

diff --git a/orcid-web/src/test/java/org/orcid/frontend/web/util/BaseControllerTest.java b/orcid-web/src/test/java/org/orcid/frontend/web/util/BaseControllerTest.java
@@ -9,28 +9,37 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
+import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.orcid.core.manager.v3.read_only.EmailManagerReadOnly;
 import org.orcid.core.manager.v3.read_only.ProfileEntityManagerReadOnly;
 import org.orcid.core.security.OrcidUserDetailsService;
 import org.orcid.core.security.OrcidRoles;
+import org.orcid.frontend.spring.session.redis.OrcidEnableRedisHttpSession;
 import org.orcid.jaxb.model.v3.release.record.Email;
 import org.orcid.persistence.jpa.entities.ProfileEntity;
 import org.orcid.test.DBUnitTest;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.test.context.ActiveProfiles;
 
 /**
  * @author Declan Newman (declan) Date: 23/02/2012
  */
 @Ignore
+@ActiveProfiles("unitTests")
 public class BaseControllerTest extends DBUnitTest {
 
     @Resource