orcid-api-common

ORCID · Jan 19, 2023 · dc09ebf · dc09ebf
1 parent 2de2280
commit dc09ebf
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 9 deletions.
diff --git a/orcid-api-common/src/main/resources/orcid-oauth2-api-common-config.xml b/orcid-api-common/src/main/resources/orcid-oauth2-api-common-config.xml
@@ -4,6 +4,8 @@
 	xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
+
+    <import resource="classpath*:orcid-core-context.xml"/>
 
 	<!-- As we have a Jersey endpoint, we need to create an extension to the 
 		Spring MVC, so we use a delegator -->

diff --git a/orcid-api-common/src/test/java/org/orcid/api/common/analytics/APIEndpointParserTest.java b/orcid-api-common/src/test/java/org/orcid/api/common/analytics/APIEndpointParserTest.java
@@ -9,7 +9,6 @@
 import javax.ws.rs.core.HttpHeaders;
 
 import org.junit.Test;
-import org.orcid.api.common.analytics.APIEndpointParser;
 
 import com.sun.jersey.core.header.InBoundHeaders;
 import com.sun.jersey.server.impl.application.WebApplicationImpl;

diff --git a/orcid-api-common/src/test/java/org/orcid/api/common/analytics/AnalyticsProcessTest.java b/orcid-api-common/src/test/java/org/orcid/api/common/analytics/AnalyticsProcessTest.java
@@ -34,7 +34,7 @@
 import com.sun.jersey.spi.container.ContainerResponse;
 
 @RunWith(OrcidJUnit4ClassRunner.class)
-@ContextConfiguration(locations = { "classpath:orcid-core-context.xml" })
+@ContextConfiguration(locations = { "classpath:test-orcid-api-common-context.xml" })
 public class AnalyticsProcessTest {
 
     @Mock

diff --git a/.../src/test/java/org/orcid/api/common/oauth/OrcidClientCredentialEndPointDelegatorTest.java b/.../src/test/java/org/orcid/api/common/oauth/OrcidClientCredentialEndPointDelegatorTest.java
@@ -23,7 +23,6 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.orcid.api.common.oauth.OrcidClientCredentialEndPointDelegator;
 import org.orcid.core.oauth.openid.OpenIDConnectKeyService;
 import org.orcid.core.utils.SecurityContextTestUtils;
 import org.orcid.jaxb.model.message.ScopePathType;
@@ -46,7 +45,7 @@
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 
 @RunWith(OrcidJUnit4ClassRunner.class)
-@ContextConfiguration(locations = { "classpath:orcid-core-context.xml", "classpath:orcid-oauth2-common-config.xml", "classpath*:orcid-oauth2-api-common-config.xml", "classpath:test-orcid-persistence-context.xml"})
+@ContextConfiguration(locations = { "classpath:test-orcid-api-common-context.xml"})
 public class OrcidClientCredentialEndPointDelegatorTest extends DBUnitTest {
 
     private static final String CLIENT_ID_1 = "APP-5555555555555555";

diff --git a/orcid-api-common/src/test/resources/test-orcid-api-common-context.xml b/orcid-api-common/src/test/resources/test-orcid-api-common-context.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:jms="http://www.springframework.org/schema/jms"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+       		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd
+       		http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-4.3.xsd">
+
+    <context:property-placeholder
+        location="classpath:/properties/test-core.properties,classpath:/properties/test-db.properties"
+        ignore-resource-not-found="true" 
+        ignore-unresolvable="true" />
+
+	<import  resource="classpath*:orcid-oauth2-common-config.xml"/>
+	<import  resource="classpath*:orcid-oauth2-api-common-config.xml"/>  
+
+</beans>
diff --git a/orcid-core/src/main/resources/orcid-core-context.xml b/orcid-core/src/main/resources/orcid-core-context.xml
@@ -19,10 +19,8 @@
 
 	<bean id="httpRequestUtils" class="org.orcid.core.utils.http.HttpRequestUtils" />
 	<bean id="identityProviderManager" class="org.orcid.core.manager.impl.IdentityProviderManagerImpl" />
-
 	<import resource="classpath*:orcid-core-cache-config.xml" />
 
-
 	<!-- Commenting out whilst the auditing is still being discussed -->
 	<!-- <import resource="classpath*:orcid-audit-context.xml" /> -->
 

diff --git a/orcid-core/src/test/java/org/orcid/core/oauth/OrcidRefreshTokenTokenGranterTest.java b/orcid-core/src/test/java/org/orcid/core/oauth/OrcidRefreshTokenTokenGranterTest.java
@@ -36,7 +36,7 @@
 import org.springframework.test.context.ContextConfiguration;
 
 @RunWith(OrcidJUnit4ClassRunner.class)
-@ContextConfiguration(locations = { "classpath:test-orcid-core-context.xml", "classpath:orcid-oauth2-common-config.xml", "classpath*:orcid-oauth2-api-common-config.xml" })
+@ContextConfiguration(locations = { "classpath:test-orcid-core-context.xml", "classpath:orcid-oauth2-common-config.xml" })
 public class OrcidRefreshTokenTokenGranterTest extends DBUnitTest {
 
     private static final String CLIENT_ID_1 = "APP-5555555555555555";

diff --git a/orcid-test/src/main/java/org/orcid/test/DBUnitTest.java b/orcid-test/src/main/java/org/orcid/test/DBUnitTest.java
@@ -1,5 +1,7 @@
 package org.orcid.test;
 
+import static org.junit.Assert.fail;
+
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
@@ -33,6 +35,8 @@
 @Ignore
 public class DBUnitTest {
 
+    private static final String API_COMMON_CONTEXT = "classpath:test-orcid-api-common-context.xml";
+
     private static final String PERSISTENCE_CONTEXT = "classpath:test-orcid-persistence-context.xml";
 
     private static final String CORE_CONTEXT = "classpath:test-orcid-core-context.xml";
@@ -46,11 +50,38 @@ public class DBUnitTest {
 
     private static ApplicationContext context;
 
-    static {
+    static {        
+        Exception last = null;
         try {
             context = new ClassPathXmlApplicationContext(CORE_CONTEXT);
         } catch (Exception e) {
-            context = new ClassPathXmlApplicationContext(PERSISTENCE_CONTEXT);
+            System.out.println("Unable to load context from " + CORE_CONTEXT);
+            last = e;
+        }
+
+        if(context == null) {
+            try {
+                context = new ClassPathXmlApplicationContext(PERSISTENCE_CONTEXT);
+            } catch (Exception e) {
+                System.out.println("Unable to load context from " + PERSISTENCE_CONTEXT);
+                last = e;
+            }    
+        }
+
+        if(context == null) {
+            try {
+                context = new ClassPathXmlApplicationContext(API_COMMON_CONTEXT);
+            } catch (Exception e) {
+                System.out.println("Unable to load context from " + API_COMMON_CONTEXT);
+                last = e;
+            }    
+        }
+
+        if(context == null) {
+            if(last != null) {
+                last.printStackTrace();
+            } 
+            fail();
         }
     }