Merge pull request #227 from fogbow/develop

giovannifs · giovannifs · commit 1d2251df8ec3 · 2015-09-18T12:08:56.000-03:00
Updating x509 certificate for testing
diff --git a/src/test/java/org/fogbowcloud/manager/core/plugins/identity/saml/TestSAMLIdentityPlugin.java b/src/test/java/org/fogbowcloud/manager/core/plugins/identity/saml/TestSAMLIdentityPlugin.java
@@ -1,18 +1,7 @@
 package org.fogbowcloud.manager.core.plugins.identity.saml;
 
-import java.io.FileInputStream;
-import java.util.Properties;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
 
 public class TestSAMLIdentityPlugin {
 
-	@Test
-	public void testValidSAMLAssertion() throws Exception {
-		SAMLIdentityPlugin identityPlugin = new SAMLIdentityPlugin(new Properties());
-		identityPlugin.getToken(IOUtils.toString(
-				new FileInputStream("src/test/resources/saml/gisela.example")));
-	}
 	
 }
diff --git a/src/test/java/org/fogbowcloud/manager/core/plugins/identity/x509/TestX509IdentityPlugin.java b/src/test/java/org/fogbowcloud/manager/core/plugins/identity/x509/TestX509IdentityPlugin.java
@@ -38,7 +38,7 @@ public void setup() throws CertificateException, IOException, ParseException {
 		CERTIFICATE_ACCESS_ID = CertificateUtils.generateAccessId(CertificateUtils
 				.getCertificateChainFromFile(CERTIFICATE_PATH));
 		SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
-		CERTIFICATE_EXPIRATION_DATE = sdf.parse("2015-08-26");
+		CERTIFICATE_EXPIRATION_DATE = sdf.parse("2025-09-15");
 	}
 
 	@Test
diff --git a/src/test/resources/x509/CAdir/selfsigned.pem b/src/test/resources/x509/CAdir/selfsigned.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICITCCAYoCCQDwd50rfgKScjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJC
+MIICITCCAYoCCQD5siB21lblXzANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJC
 cjELMAkGA1UECAwCUEIxCzAJBgNVBAcMAkNHMQwwCgYDVQQKDANMU0QxDzANBgNV
-BAsMBkZvZ2JvdzENMAsGA1UEAwwEVGVzdDAeFw0xNDA4MjYxODU0MTNaFw0xNTA4
-MjYxODU0MTNaMFUxCzAJBgNVBAYTAkJyMQswCQYDVQQIDAJQQjELMAkGA1UEBwwC
+BAsMBkZvZ2JvdzENMAsGA1UEAwwEVGVzdDAeFw0xNTA5MTgxNDQyNDlaFw0yNTA5
+MTUxNDQyNDlaMFUxCzAJBgNVBAYTAkJyMQswCQYDVQQIDAJQQjELMAkGA1UEBwwC
 Q0cxDDAKBgNVBAoMA0xTRDEPMA0GA1UECwwGRm9nYm93MQ0wCwYDVQQDDARUZXN0
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDLUPEQyqxx5xwgojznrnAzUSbS
-w+psV5gcTSpTpmn6t3H+XcvQqSgqdCMgLa6WBNeDdG91fYTTXs8XrktJpYM3Tol8
-HOk7w5gplHlfEjVn9PYPDP7NYQdq18x1xJJ/ogpJPvWfWDDiW4isJRASPxWOJXvq
-jCoUBXjfpuyj9R1ePQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFtdz18FZAU8X2YA
-I2BPs9JG5wD9Zt8WpFLK8SwLFs0aZz2GOBeZkfSs9XRZaJFb6Gi9Xe7weaIFxr4M
-HXDU7NmiFizbbfYBFkJYKiPb9+xmQsSVj9Oz5UnWvzd6YqB24Ck6SVvfPYPy9I59
-gPvte3H5ZOyJmZYh3dP2pDMAJ9Sv
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSRT1LfyBkpMoc5AM6W/PYVn7t
+rBCMvPbOSQy3ZwWV7YevI0O7ex/SYqa+mLqZyBDU68YnFFAfg3/kh5/7ZBj73tAK
+XRyUzkJInrHFKMJ7xR8fPBeH2EH6ZxpqoTL8U9rpJ8wgAa1xnZFjI6tRtpNlT/R+
+yQXKnPX7OpmkHoUp1QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBALTi0yQ2XyE4aGuQ
+oOWudOBukJSZu5ZqnkIJMyekbK7zTwurC1jbdgu3UupknReRnFBnglByv0P/E16R
+RSIlKC334tpiTh4i+NG2m9XbwTWggLoL17o4CBR88ewtvYVEom59ScuUlPrnPrdc
+UCF7MfuaoUJIvNErQskeZsNMEGv8
 -----END CERTIFICATE-----
diff --git a/src/test/resources/x509/cert.pem b/src/test/resources/x509/cert.pem
@@ -1,14 +1,14 @@
 -----BEGIN CERTIFICATE-----
-MIICITCCAYoCCQDwd50rfgKScjANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJC
+MIICITCCAYoCCQD5siB21lblXzANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJC
 cjELMAkGA1UECAwCUEIxCzAJBgNVBAcMAkNHMQwwCgYDVQQKDANMU0QxDzANBgNV
-BAsMBkZvZ2JvdzENMAsGA1UEAwwEVGVzdDAeFw0xNDA4MjYxODU0MTNaFw0xNTA4
-MjYxODU0MTNaMFUxCzAJBgNVBAYTAkJyMQswCQYDVQQIDAJQQjELMAkGA1UEBwwC
+BAsMBkZvZ2JvdzENMAsGA1UEAwwEVGVzdDAeFw0xNTA5MTgxNDQyNDlaFw0yNTA5
+MTUxNDQyNDlaMFUxCzAJBgNVBAYTAkJyMQswCQYDVQQIDAJQQjELMAkGA1UEBwwC
 Q0cxDDAKBgNVBAoMA0xTRDEPMA0GA1UECwwGRm9nYm93MQ0wCwYDVQQDDARUZXN0
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDLUPEQyqxx5xwgojznrnAzUSbS
-w+psV5gcTSpTpmn6t3H+XcvQqSgqdCMgLa6WBNeDdG91fYTTXs8XrktJpYM3Tol8
-HOk7w5gplHlfEjVn9PYPDP7NYQdq18x1xJJ/ogpJPvWfWDDiW4isJRASPxWOJXvq
-jCoUBXjfpuyj9R1ePQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFtdz18FZAU8X2YA
-I2BPs9JG5wD9Zt8WpFLK8SwLFs0aZz2GOBeZkfSs9XRZaJFb6Gi9Xe7weaIFxr4M
-HXDU7NmiFizbbfYBFkJYKiPb9+xmQsSVj9Oz5UnWvzd6YqB24Ck6SVvfPYPy9I59
-gPvte3H5ZOyJmZYh3dP2pDMAJ9Sv
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSRT1LfyBkpMoc5AM6W/PYVn7t
+rBCMvPbOSQy3ZwWV7YevI0O7ex/SYqa+mLqZyBDU68YnFFAfg3/kh5/7ZBj73tAK
+XRyUzkJInrHFKMJ7xR8fPBeH2EH6ZxpqoTL8U9rpJ8wgAa1xnZFjI6tRtpNlT/R+
+yQXKnPX7OpmkHoUp1QIDAQABMA0GCSqGSIb3DQEBBQUAA4GBALTi0yQ2XyE4aGuQ
+oOWudOBukJSZu5ZqnkIJMyekbK7zTwurC1jbdgu3UupknReRnFBnglByv0P/E16R
+RSIlKC334tpiTh4i+NG2m9XbwTWggLoL17o4CBR88ewtvYVEom59ScuUlPrnPrdc
+UCF7MfuaoUJIvNErQskeZsNMEGv8
 -----END CERTIFICATE-----

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public void setup() throws CertificateException, IOException, ParseException {`
`38`	`38`	`CERTIFICATE_ACCESS_ID = CertificateUtils.generateAccessId(CertificateUtils`
`39`	`39`	`.getCertificateChainFromFile(CERTIFICATE_PATH));`
`40`	`40`	`SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);`
`41`		`- CERTIFICATE_EXPIRATION_DATE = sdf.parse("2015-08-26");`
	`41`	`+ CERTIFICATE_EXPIRATION_DATE = sdf.parse("2025-09-15");`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@Test`