This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ca-certificates-java.
commit f89113030db007cc2df83a0876a6b7124cccae5a Author: Emmanuel Bourg <[email protected]> Date: Mon Mar 24 13:26:07 2014 +0000 Use a local test certificate to avoid future breakages when the ca-certificates package changes --- .../debian/security/UpdateCertificatesTest.java | 43 ++++++++++---------- src/test/resources/spi-cacert-2008.crt | 46 ++++++++++++++++++++++ 2 files changed, 68 insertions(+), 21 deletions(-) diff --git a/src/test/java/org/debian/security/UpdateCertificatesTest.java b/src/test/java/org/debian/security/UpdateCertificatesTest.java index d0d1094..53a3e2a 100644 --- a/src/test/java/org/debian/security/UpdateCertificatesTest.java +++ b/src/test/java/org/debian/security/UpdateCertificatesTest.java @@ -33,10 +33,11 @@ import static org.junit.Assert.*; */ public class UpdateCertificatesTest { - private static final String ALIAS_CACERT = "debian:spi-cacert-2008.crt"; - private static final String INVALID_CACERT = "x/usr/share/ca-certificates/spi-inc.org/spi-cacert-2008.crt"; - private static final String REMOVE_CACERT = "-/usr/share/ca-certificates/spi-inc.org/spi-cacert-2008.crt"; - private static final String ADD_CACERT = "+/usr/share/ca-certificates/spi-inc.org/spi-cacert-2008.crt"; + private static final String CERT_ALIAS = "debian:spi-cacert-2008.crt"; + private static final String CERT_PATH = "target/test-classes/spi-cacert-2008.crt"; + private static final String INVALID_CERT_CMD = "x" + CERT_PATH; + private static final String REMOVE_CERT_CMD = "-" + CERT_PATH; + private static final String ADD_CERT_CMD = "+" + CERT_PATH; private String ksFilename = "./target/test-classes/tests-cacerts"; private String ksPassword = "changeit"; @@ -55,10 +56,10 @@ public class UpdateCertificatesTest { public void testWrongCommand() throws Exception { UpdateCertificates uc = new UpdateCertificates(ksFilename, ksPassword); try { - uc.parseLine(INVALID_CACERT); + uc.parseLine(INVALID_CERT_CMD); fail(); } catch (UnknownInputException e) { - assertEquals(INVALID_CACERT, e.getMessage()); + assertEquals(INVALID_CERT_CMD, e.getMessage()); } } @@ -68,11 +69,11 @@ public class UpdateCertificatesTest { @Test public void testAdd() throws Exception { UpdateCertificates uc = new UpdateCertificates(ksFilename, ksPassword); - uc.parseLine(ADD_CACERT); + uc.parseLine(ADD_CERT_CMD); uc.finish(); KeyStoreHandler keystore = new KeyStoreHandler(ksFilename, ksPassword.toCharArray()); - assertEquals(true, keystore.contains(ALIAS_CACERT)); + assertEquals(true, keystore.contains(CERT_ALIAS)); } /** @@ -96,12 +97,12 @@ public class UpdateCertificatesTest { @Test public void testReplace() throws Exception { UpdateCertificates uc = new UpdateCertificates(ksFilename, ksPassword); - uc.parseLine(ADD_CACERT); - uc.parseLine(ADD_CACERT); + uc.parseLine(ADD_CERT_CMD); + uc.parseLine(ADD_CERT_CMD); uc.finish(); KeyStoreHandler keystore = new KeyStoreHandler(ksFilename, ksPassword.toCharArray()); - assertEquals(true, keystore.contains(ALIAS_CACERT)); + assertEquals(true, keystore.contains(CERT_ALIAS)); } /** @@ -110,12 +111,12 @@ public class UpdateCertificatesTest { @Test public void testRemove() throws Exception { UpdateCertificates uc = new UpdateCertificates(ksFilename, ksPassword); - uc.parseLine(REMOVE_CACERT); + uc.parseLine(REMOVE_CERT_CMD); uc.finish(); // We start with empty KS, so it shouldn't do anything KeyStoreHandler keystore = new KeyStoreHandler(ksFilename, ksPassword.toCharArray()); - assertEquals(false, keystore.contains(ALIAS_CACERT)); + assertEquals(false, keystore.contains(CERT_ALIAS)); } /** @@ -124,27 +125,27 @@ public class UpdateCertificatesTest { @Test public void testAddThenRemove() throws Exception { UpdateCertificates ucAdd = new UpdateCertificates(ksFilename, ksPassword); - ucAdd.parseLine(ADD_CACERT); + ucAdd.parseLine(ADD_CERT_CMD); ucAdd.finish(); KeyStoreHandler keystore = new KeyStoreHandler(ksFilename, ksPassword.toCharArray()); - assertEquals(true, keystore.contains(ALIAS_CACERT)); + assertEquals(true, keystore.contains(CERT_ALIAS)); UpdateCertificates ucRemove = new UpdateCertificates(ksFilename, ksPassword); - ucRemove.parseLine(REMOVE_CACERT); + ucRemove.parseLine(REMOVE_CERT_CMD); ucRemove.finish(); keystore.load(); - assertEquals(false, keystore.contains(ALIAS_CACERT)); + assertEquals(false, keystore.contains(CERT_ALIAS)); } - + @Test public void testProcessChanges() throws Exception { UpdateCertificates uc = new UpdateCertificates(ksFilename, ksPassword); - uc.processChanges(new StringReader(ADD_CACERT + "\n" + INVALID_CACERT + "\n" + REMOVE_CACERT + "\n")); + uc.processChanges(new StringReader(ADD_CERT_CMD + "\n" + INVALID_CERT_CMD + "\n" + REMOVE_CERT_CMD + "\n")); uc.finish(); - + KeyStoreHandler keystore = new KeyStoreHandler(ksFilename, ksPassword.toCharArray()); - assertEquals(false, keystore.contains(ALIAS_CACERT)); + assertEquals(false, keystore.contains(CERT_ALIAS)); } } diff --git a/src/test/resources/spi-cacert-2008.crt b/src/test/resources/spi-cacert-2008.crt new file mode 100644 index 0000000..f2edccf --- /dev/null +++ b/src/test/resources/spi-cacert-2008.crt @@ -0,0 +1,46 @@ +-----BEGIN CERTIFICATE----- +MIIIDjCCBfagAwIBAgIJAOiOtsn4KhQoMA0GCSqGSIb3DQEBBQUAMIG8MQswCQYD +VQQGEwJVUzEQMA4GA1UECBMHSW5kaWFuYTEVMBMGA1UEBxMMSW5kaWFuYXBvbGlz +MSgwJgYDVQQKEx9Tb2Z0d2FyZSBpbiB0aGUgUHVibGljIEludGVyZXN0MRMwEQYD +VQQLEwpob3N0bWFzdGVyMR4wHAYDVQQDExVDZXJ0aWZpY2F0ZSBBdXRob3JpdHkx +JTAjBgkqhkiG9w0BCQEWFmhvc3RtYXN0ZXJAc3BpLWluYy5vcmcwHhcNMDgwNTEz +MDgwNzU2WhcNMTgwNTExMDgwNzU2WjCBvDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT +B0luZGlhbmExFTATBgNVBAcTDEluZGlhbmFwb2xpczEoMCYGA1UEChMfU29mdHdh +cmUgaW4gdGhlIFB1YmxpYyBJbnRlcmVzdDETMBEGA1UECxMKaG9zdG1hc3RlcjEe +MBwGA1UEAxMVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSUwIwYJKoZIhvcNAQkBFhZo +b3N0bWFzdGVyQHNwaS1pbmMub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC +CgKCAgEA3DbmR0LCxFF1KYdAw9iOIQbSGE7r7yC9kDyFEBOMKVuUY/b0LfEGQpG5 +GcRCaQi/izZF6igFM0lIoCdDkzWKQdh4s/Dvs24t3dHLfer0dSbTPpA67tfnLAS1 +fOH1fMVO73e9XKKTM5LOfYFIz2u1IiwIg/3T1c87Lf21SZBb9q1NE8re06adU1Fx +Y0b4ShZcmO4tbZoWoXaQ4mBDmdaJ1mwuepiyCwMs43pPx93jzONKao15Uvr0wa8u +jyoIyxspgpJyQ7zOiKmqp4pRQ1WFmjcDeJPI8L20QcgHQprLNZd6ioFl3h1UCAHx +ZFy3FxpRvB7DWYd2GBaY7r/2Z4GLBjXFS21ZGcfSxki+bhQog0oQnBv1b7ypjvVp +/rLBVcznFMn5WxRTUQfqzj3kTygfPGEJ1zPSbqdu1McTCW9rXRTunYkbpWry9vjQ +co7qch8vNGopCsUK7BxAhRL3pqXTT63AhYxMfHMgzFMY8bJYTAH1v+pk1Vw5xc5s +zFNaVrpBDyXfa1C2x4qgvQLCxTtVpbJkIoRRKFauMe5e+wsWTUYFkYBE7axt8Feo ++uthSKDLG7Mfjs3FIXcDhB78rKNDCGOM7fkn77SwXWfWT+3Qiz5dW8mRvZYChD3F +TbxCP3T9PF2sXEg2XocxLxhsxGjuoYvJWdAY4wCAs1QnLpnwFVMCAwEAAaOCAg8w +ggILMB0GA1UdDgQWBBQ0cdE41xU2g0dr1zdkQjuOjVKdqzCB8QYDVR0jBIHpMIHm +gBQ0cdE41xU2g0dr1zdkQjuOjVKdq6GBwqSBvzCBvDELMAkGA1UEBhMCVVMxEDAO +BgNVBAgTB0luZGlhbmExFTATBgNVBAcTDEluZGlhbmFwb2xpczEoMCYGA1UEChMf +U29mdHdhcmUgaW4gdGhlIFB1YmxpYyBJbnRlcmVzdDETMBEGA1UECxMKaG9zdG1h +c3RlcjEeMBwGA1UEAxMVQ2VydGlmaWNhdGUgQXV0aG9yaXR5MSUwIwYJKoZIhvcN +AQkBFhZob3N0bWFzdGVyQHNwaS1pbmMub3JnggkA6I62yfgqFCgwDwYDVR0TAQH/ +BAUwAwEB/zARBglghkgBhvhCAQEEBAMCAAcwCQYDVR0SBAIwADAuBglghkgBhvhC +AQ0EIRYfU29mdHdhcmUgaW4gdGhlIFB1YmxpYyBJbnRlcmVzdDAwBglghkgBhvhC +AQQEIxYhaHR0cHM6Ly9jYS5zcGktaW5jLm9yZy9jYS1jcmwucGVtMDIGCWCGSAGG ++EIBAwQlFiNodHRwczovL2NhLnNwaS1pbmMub3JnL2NlcnQtY3JsLnBlbTAhBgNV +HREEGjAYgRZob3N0bWFzdGVyQHNwaS1pbmMub3JnMA4GA1UdDwEB/wQEAwIBBjAN +BgkqhkiG9w0BAQUFAAOCAgEAtM294LnqsgMrfjLp3nI/yUuCXp3ir1UJogxU6M8Y +PCggHam7AwIvUjki+RfPrWeQswN/2BXja367m1YBrzXU2rnHZxeb1NUON7MgQS4M +AcRb+WU+wmHo0vBqlXDDxm/VNaSsWXLhid+hoJ0kvSl56WEq2dMeyUakCHhBknIP +qxR17QnwovBc78MKYiC3wihmrkwvLo9FYyaW8O4x5otVm6o6+YI5HYg84gd1GuEP +sTC8cTLSOv76oYnzQyzWcsR5pxVIBcDYLXIC48s9Fmq6ybgREOJJhcyWR2AFJS7v +dVkz9UcZFu/abF8HyKZQth3LZjQl/GaD68W2MEH4RkRiqMEMVObqTFoo5q7Gt/5/ +O5aoLu7HaD7dAD0prypjq1/uSSotxdz70cbT0ZdWUoa2lOvUYFG3/B6bzAKb1B+P ++UqPti4oOxfMxaYF49LTtcYDyeFIQpvLP+QX4P4NAZUJurgNceQJcHdC2E3hQqlg +g9cXiUPS1N2nGLar1CQlh7XU4vwuImm9rWgs/3K1mKoGnOcqarihk3bOsPN/nOHg +T7jYhkalMwIsJWE3KpLIrIF0aGOHM3a9BX9e1dUCbb2v/ypaqknsmHlHU5H2DjRa +yaXG67Ljxay2oHA1u8hRadDytaIybrw/oDc5fHE2pgXfDBLkFqfF1stjo5VwP+YE +o2A= +-----END CERTIFICATE----- -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ca-certificates-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
