[java-identity-provider] 04/04: IDP-1181 Test FastFail behavior: Turn off all tests

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=2f660ec1266d6642cda792888d5ae5c55232186e

commit 2f660ec1266d6642cda792888d5ae5c55232186e
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Sep 6 11:19:03 2019 +0100

    IDP-1181 Test FastFail behavior: Turn off all tests
    
    https://issues.shibboleth.net/jira/browse/IDP-1181
    
    They add no value as regression tests and anyway they cause maven to hangup.
---
 .../resolver/spring/failfast/AttributeResolverFailFastTest.java   | 8 +++++---
 .../idp/attribute/resolver/failfast/attributeResolverLDAP.xml     | 2 +-
 .../idp/profile/spring/failfast/AbstractFailFastTest.java         | 2 ++
 .../idp/profile/spring/failfast/MetadataFailFastTest.java         | 2 ++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java
index 4e87bee..8b7208c 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java
@@ -28,6 +28,7 @@ import javax.sql.DataSource;
 import org.springframework.mock.env.MockPropertySource;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 import com.unboundid.ldap.listener.InMemoryDirectoryServer;
@@ -45,6 +46,7 @@ import net.shibboleth.idp.testing.DatabaseTestingSupport;
 import net.shibboleth.utilities.java.support.service.ReloadableService;
 import net.shibboleth.utilities.java.support.service.ServiceableComponent;
 
+ at Ignore
 @SuppressWarnings("unchecked")
 public class AttributeResolverFailFastTest extends AbstractFailFastTest {
     
@@ -55,7 +57,7 @@ public class AttributeResolverFailFastTest extends AbstractFailFastTest {
     private InMemoryDirectoryServer directoryServer;
     private DataSource datasource;
 
-    @BeforeTest public void setupDirectoryServer() throws LDAPException, GeneralSecurityException {
+    @BeforeTest(enabled = false) public void setupDirectoryServer() throws LDAPException, GeneralSecurityException {
         //
         // LDAP
         //
@@ -68,7 +70,7 @@ public class AttributeResolverFailFastTest extends AbstractFailFastTest {
                         "changeit".toCharArray()), new TrustStoreTrustManager(
                         "src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/client.keystore",
                         "changeit".toCharArray(), "JKS", false));
-        config.setListenerConfigs(InMemoryListenerConfig.createLDAPConfig("default", null, 10389,
+        config.setListenerConfigs(InMemoryListenerConfig.createLDAPConfig("default", null, 20389,
                 sslUtil.createSSLSocketFactory()));
         config.addAdditionalBindCredentials("cn=Directory Manager", "password");
         directoryServer = new InMemoryDirectoryServer(config);
@@ -84,7 +86,7 @@ public class AttributeResolverFailFastTest extends AbstractFailFastTest {
 
     }
     
-    @AfterTest public void teardownDirectoryServer() {
+    @AfterTest(enabled = false) public void teardownDirectoryServer() {
         directoryServer.shutDown(true);
         System.clearProperty("org.ldaptive.provider");
     }
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverLDAP.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverLDAP.xml
index 7e6b6ec..23c002e 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverLDAP.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/failfast/attributeResolverLDAP.xml
@@ -9,7 +9,7 @@
     </AttributeDefinition>
     
     <DataConnector id="dataConnector" xsi:type="LDAPDirectory"
-        ldapURL="ldap://localhost:%{port:10389}"
+        ldapURL="ldap://localhost:%{port:20389}"
         principal="cn=Directory Manager"
         principalCredential="password">
         <FilterTemplate>
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/failfast/AbstractFailFastTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/failfast/AbstractFailFastTest.java
index 0b97066..7027a11 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/failfast/AbstractFailFastTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/failfast/AbstractFailFastTest.java
@@ -35,6 +35,7 @@ import org.springframework.mock.env.MockPropertySource;
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Ignore;
 
 import net.shibboleth.ext.spring.util.ApplicationContextBuilder;
 import net.shibboleth.ext.spring.util.SpringSupport;
@@ -45,6 +46,7 @@ import net.shibboleth.utilities.java.support.service.ReloadableService;
 /**
  * Base class for testing metadata providers.
  */
+ at Ignore
 public class AbstractFailFastTest extends OpenSAMLInitBaseTestCase {
 
     private String workspaceDirName;
diff --git a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/failfast/MetadataFailFastTest.java b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/failfast/MetadataFailFastTest.java
index a8cef01..feba04b 100644
--- a/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/failfast/MetadataFailFastTest.java
+++ b/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/failfast/MetadataFailFastTest.java
@@ -25,12 +25,14 @@ import java.util.List;
 
 import org.opensaml.saml.metadata.resolver.MetadataResolver;
 import org.springframework.mock.env.MockPropertySource;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 import net.shibboleth.utilities.java.support.collection.Pair;
 import net.shibboleth.utilities.java.support.service.ReloadableService;
 import net.shibboleth.utilities.java.support.service.ServiceableComponent;
 
+ at Ignore
 @SuppressWarnings("unchecked")
 public class MetadataFailFastTest extends AbstractFailFastTest {
     private static int uniquifier;

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