geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [01/50] [abbrv] incubator-geode git commit: GEODE-420: amended tests to fix tests
Date Tue, 13 Sep 2016 19:11:48 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 74e773299 -> a325d074f


GEODE-420: amended tests to fix tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/887f1df3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/887f1df3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/887f1df3

Branch: refs/heads/develop
Commit: 887f1df370eeabd583bec2010928725a78212006
Parents: bc2868a
Author: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Authored: Tue Aug 16 08:32:29 2016 +1000
Committer: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Committed: Tue Aug 16 08:32:29 2016 +1000

----------------------------------------------------------------------
 .../distributed/internal/AbstractDistributionConfig.java      | 1 +
 .../distributed/internal/DistributionConfigJUnitTest.java     | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/887f1df3/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index e070cf4..ce835c5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -996,6 +996,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig
implemen
     m.put(SSL_KEYSTORE_PASSWORD, "Password to access the private key from the keystore.");
     m.put(SSL_TRUSTSTORE, "Location of the Java keystore file containing the collection of
trusted certificates.");
     m.put(SSL_TRUSTSTORE_PASSWORD, "Password to unlock the truststore.");
+    m.put(SSL_DEFAULT_ALIAS, "The default certificate alias to be used in a multi-key keystore");
 
     dcAttDescriptions = Collections.unmodifiableMap(m);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/887f1df3/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
index 08a1726..ad10f0c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
@@ -78,7 +78,7 @@ public class DistributionConfigJUnitTest {
   @Test
   public void testGetAttributeNames() {
     String[] attNames = AbstractDistributionConfig._getAttNames();
-    assertEquals(attNames.length, 153);
+    assertEquals(attNames.length, 154);
 
     List boolList = new ArrayList();
     List intList = new ArrayList();
@@ -113,7 +113,7 @@ public class DistributionConfigJUnitTest {
     //TODO - This makes no sense. One has no idea what the correct expected number of attributes
are.
     assertEquals(28, boolList.size());
     assertEquals(33, intList.size());
-    assertEquals(83, stringList.size());
+    assertEquals(84, stringList.size());
     assertEquals(5, fileList.size());
     assertEquals(4, otherList.size());
   }
@@ -279,6 +279,7 @@ public class DistributionConfigJUnitTest {
   @Test(expected = UnmodifiableException.class)
   public void testSetUnmodifiableAttributeObject() {
     config.setAttributeObject(ARCHIVE_DISK_SPACE_LIMIT, 0, ConfigSource.api());
+    config.checkAttribute(ARCHIVE_DISK_SPACE_LIMIT, 0);
   }
 
   @Test
@@ -290,6 +291,7 @@ public class DistributionConfigJUnitTest {
   @Test(expected = IllegalArgumentException.class)
   public void testOutOfRangeAttributeObject() {
     config.setAttributeObject(HTTP_SERVICE_PORT, -1, ConfigSource.api());
+    config.checkAttribute(HTTP_SERVICE_PORT, -1);
   }
 
   @Test
@@ -316,6 +318,7 @@ public class DistributionConfigJUnitTest {
     config.modifiable = true;
 //    config.setStartLocator(address);
     config.setAttributeObject(START_LOCATOR,address,ConfigSource.api());
+    config.checkAttribute(START_LOCATOR,address);
   }
 
   @Test


Mime
View raw message