[java-idp-integration-tests COMMIT] in /trunk: pom.xml src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Dec  2 17:51:20 2014
New Revision: 38

URL: http://svn.shibboleth.net/view/java-idp-integration-tests?rev=38&view=rev
Log:
Fix integration tests after renaming 'idp-distribution' to 'shibboleth-identity-provider'.

Modified:
    trunk/pom.xml
    trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-integration-tests/trunk/pom.xml?rev=38&r1=37&r2=38&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Tue Dec  2 17:51:20 2014
@@ -184,7 +184,7 @@
                                     <includes>**/credentials/*</includes>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${test-distributions.directory}/idp-distribution-${idp.version}</outputDirectory>
+                            <outputDirectory>${test-distributions.directory}/shibboleth-identity-provider-${idp.version}</outputDirectory>
                         </configuration>
                     </execution>
                     <!-- Unpack jetty-distribution to test-distributions directory. -->
@@ -223,7 +223,7 @@
                                     <destFileName>idp-testbed.war</destFileName>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${test-distributions.directory}/idp-distribution-${idp.version}/testbed-war/</outputDirectory>
+                            <outputDirectory>${test-distributions.directory}/shibboleth-identity-provider-${idp.version}/testbed-war/</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
@@ -244,7 +244,7 @@
                                     <directory>src/test/webapps</directory>
                                 </resource>
                             </resources>
-                            <outputDirectory>${test-distributions.directory}/idp-distribution-${idp.version}/jetty-base/webapps/</outputDirectory>
+                            <outputDirectory>${test-distributions.directory}/shibboleth-identity-provider-${idp.version}/jetty-base/webapps/</outputDirectory>
                         </configuration>
                     </execution>
                     <!-- Copy example metadata-providers.xml. -->
@@ -260,7 +260,7 @@
                                     <directory>src/test/conf</directory>
                                 </resource>
                             </resources>
-                            <outputDirectory>${test-distributions.directory}/idp-distribution-${idp.version}/conf/</outputDirectory>
+                            <outputDirectory>${test-distributions.directory}/shibboleth-identity-provider-${idp.version}/conf/</outputDirectory>
                             <overwrite>true</overwrite>
                         </configuration>
                     </execution>
@@ -277,7 +277,7 @@
                                     <directory>src/test/metadata</directory>
                                 </resource>
                             </resources>
-                            <outputDirectory>${test-distributions.directory}/idp-distribution-${idp.version}/metadata/</outputDirectory>
+                            <outputDirectory>${test-distributions.directory}/shibboleth-identity-provider-${idp.version}/metadata/</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>

Modified: trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
URL: http://svn.shibboleth.net/view/java-idp-integration-tests/trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java?rev=38&r1=37&r2=38&view=diff
==============================================================================
--- trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java (original)
+++ trunk/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java Tue Dec  2 17:51:20 2014
@@ -126,7 +126,7 @@
         Assert.assertTrue(pathToJettyHome.toAbsolutePath().toFile().exists(), "Path to jetty.home '{}' not found");
 
         // Path to idp.home
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(buildPath, "*idp-distribution-*")) {
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(buildPath, "*shibboleth-identity-provider-*")) {
             for (Path entry : stream) {
                 pathToIdPHome = entry;
                 break;