[spring-extensions] 01/03: IDP-1380 Use RepositorySupport to get URLS

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch maint-5
in repository spring-extensions.

View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=aba39eb47bc1f56689c0279e1d8e4ef0f004d302

commit aba39eb47bc1f56689c0279e1d8e4ef0f004d302
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Dec 13 11:29:17 2018 +0000

    IDP-1380 Use RepositorySupport to get URLS
    
    https://issues.shibboleth.net/jira/browse/IDP-1380
    
    http: ones at that
---
 pom.xml                                                    |  9 +++++++++
 .../ext/spring/resource/ConditionalResourceTest.java       | 14 ++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8b6a126..2e64ca0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,15 @@
           <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>net.shibboleth.utilities</groupId>
+            <artifactId>java-support</artifactId>
+            <version>${java-support.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+
+
     </dependencies>
 
     <build>
diff --git a/src/test/java/net/shibboleth/ext/spring/resource/ConditionalResourceTest.java b/src/test/java/net/shibboleth/ext/spring/resource/ConditionalResourceTest.java
index 4fa9ce1..acb1ae0 100644
--- a/src/test/java/net/shibboleth/ext/spring/resource/ConditionalResourceTest.java
+++ b/src/test/java/net/shibboleth/ext/spring/resource/ConditionalResourceTest.java
@@ -23,6 +23,7 @@ import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
+import net.shibboleth.utilities.java.support.repository.RepositorySupport;
 
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpUriRequest;
@@ -39,11 +40,9 @@ import org.testng.annotations.Test;
  */
 public class ConditionalResourceTest {
 
-    private final String existsURL =
-            "https://git.shibboleth.net/view/?p=spring-extensions.git;a=blob_plain;f=src/test/resources/data/document.xml;h=e8ec7c0d20c7a6b8193e1868398cda0c28df45ed;hb=HEAD";
+    private final String existsURL = RepositorySupport.buildHTTPResourceURL("spring-extensions", "src/test/resources/net/shibboleth/ext/spring/resource/document.xml",false);
 
-    private final String nonExistsURL =
-            "http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/test/resources/data/documxent.xml?view=co";
+    private final String nonExistsURL = RepositorySupport.buildHTTPResourceURL("spring-extensions.git", "trunk/src/test/resources/data/document.xml",false);
 
     private HttpClient client;
 
@@ -60,10 +59,13 @@ public class ConditionalResourceTest {
         
         existsResource.setId("test");
         existsResource.initialize();
-        
+
         notExistsResource.setId("test");
         notExistsResource.initialize();
 
+        Assert.assertTrue(existsHTTPResource.exists());
+        Assert.assertFalse(notExistsHTTPResource.exists());
+
         Assert.assertTrue(existsResource.exists());
         Assert.assertTrue(notExistsResource.exists());
     }
@@ -110,7 +112,7 @@ public class ConditionalResourceTest {
         final ConditionalResource existsResource = new ConditionalResource(existsHTTPResource);
         existsResource.setId("test");
         existsResource.initialize();
-        
+
         Assert.assertTrue(ResourceTestHelper.compare(existsResource, new ClassPathResource(
                 "net/shibboleth/ext/spring/resource/document.xml")));
     }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.