summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Rudyy <orudyy@apache.org>2015-02-09 16:31:00 +0000
committerAlex Rudyy <orudyy@apache.org>2015-02-09 16:31:00 +0000
commitea2c9f4581ddec8fda51fc9d81146e22ef791921 (patch)
treee495e889adb5bf4892c1834cc6fab151435cd01d
parent5edd1e5f5fac729d719219a1854a97419112e784 (diff)
downloadqpid-python-ea2c9f4581ddec8fda51fc9d81146e22ef791921.tar.gz
QPID-6365: Fix failing tests
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1658452 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
index a19c2e698c..a3bf1ab3cb 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/KeyStoreRestTest.java
@@ -77,7 +77,7 @@ public class KeyStoreRestTest extends QpidRestTestCase
Map<String, Object> keystore = keyStores.get(0);
assertEquals("Unexpected name", name, keystore.get(KeyStore.NAME));
- assertEquals("unexpected path to key store", TestSSLConstants.KEYSTORE, keystore.get(FileKeyStore.STORE_URL));
+ assertEquals("unexpected path to key store", AbstractConfiguredObject.SECURED_STRING_VALUE, keystore.get(FileKeyStore.STORE_URL));
assertEquals("unexpected password", AbstractConfiguredObject.SECURED_STRING_VALUE, keystore.get(FileKeyStore.PASSWORD));
assertEquals("unexpected alias", certAlias, keystore.get(FileKeyStore.CERTIFICATE_ALIAS));
}
@@ -99,7 +99,7 @@ public class KeyStoreRestTest extends QpidRestTestCase
Map<String, Object> keystore = keyStores.get(0);
assertEquals("Unexpected name", name, keystore.get(KeyStore.NAME));
- assertEquals("unexpected data", ConfiguredObject.OVER_SIZED_ATTRIBUTE_ALTERNATIVE_TEXT, keystore.get(FileKeyStore.STORE_URL));
+ assertEquals("unexpected data", AbstractConfiguredObject.SECURED_STRING_VALUE, keystore.get(FileKeyStore.STORE_URL));
assertEquals("unexpected password", AbstractConfiguredObject.SECURED_STRING_VALUE, keystore.get(FileKeyStore.PASSWORD));
assertEquals("unexpected alias", null, keystore.get(FileKeyStore.CERTIFICATE_ALIAS));
}
@@ -151,7 +151,7 @@ public class KeyStoreRestTest extends QpidRestTestCase
Map<String, Object> keystore = keyStores.get(0);
assertEquals("Unexpected name", name, keystore.get(KeyStore.NAME));
- assertEquals("unexpected data", TestSSLConstants.UNTRUSTED_KEYSTORE, keystore.get(FileKeyStore.STORE_URL));
+ assertEquals("unexpected data", AbstractConfiguredObject.SECURED_STRING_VALUE, keystore.get(FileKeyStore.STORE_URL));
assertEquals("unexpected password", AbstractConfiguredObject.SECURED_STRING_VALUE, keystore.get(FileKeyStore.PASSWORD));
assertEquals("unexpected alias", null, keystore.get(FileKeyStore.CERTIFICATE_ALIAS));
}