[19/50] [abbrv] incubator-geode git commit: GEODE-1993: allow LocatorServerStartupRule to save server's ports as well.

2016-10-31 Thread klund
GEODE-1993: allow LocatorServerStartupRule to save server's ports as well.

* added more tetss


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

Branch: refs/heads/feature/GEODE-1930
Commit: 5abe957ca1cd42eeaf82549c275711e6e94dddec
Parents: 1fb0d0a
Author: Jinmei Liao 
Authored: Mon Oct 17 08:08:39 2016 -0700
Committer: Jinmei Liao 
Committed: Mon Oct 17 08:08:39 2016 -0700

--
 .../ClusterConfigWithoutSecurityDUnitTest.java  |   4 +-
 .../security/PeerAuthenticatorDUnitTest.java|  63 
 ...eerSecurityWithEmbeddedLocatorDUnitTest.java | 102 +++
 .../SecurityClusterConfigDUnitTest.java |  10 +-
 .../SecurityWithoutClusterConfigDUnitTest.java  |   2 +-
 .../security/StartServerAuthorizationTest.java  |   4 +-
 .../dunit/rules/LocatorServerStartupRule.java   |  12 ++-
 .../LuceneClusterConfigurationDUnitTest.java|   2 +-
 8 files changed, 140 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5abe957c/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
index 72dbd1a..1bbfa0f 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
@@ -71,7 +71,7 @@ public class ClusterConfigWithoutSecurityDUnitTest extends 
JUnit4DistributedTest
 
 // initial security properties should only contain initial set of values
 ServerStarter serverStarter = new ServerStarter(props);
-serverStarter.startServer(lsRule.getLocatorPort(0));
+serverStarter.startServer(lsRule.getPort(0));
 DistributedSystem ds = serverStarter.cache.getDistributedSystem();
 
 // after cache is created, the configuration won't chagne
@@ -92,7 +92,7 @@ public class ClusterConfigWithoutSecurityDUnitTest extends 
JUnit4DistributedTest
 
 ServerStarter serverStarter = new ServerStarter(props);
 
-assertThatThrownBy(() -> 
serverStarter.startServer(lsRule.getLocatorPort(0)))
+assertThatThrownBy(() -> serverStarter.startServer(lsRule.getPort(0)))
   .isInstanceOf(GemFireConfigException.class)
   
.hasMessage(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toLocalizedString());
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5abe957c/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
index bb147c7..b12ea43 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
@@ -20,73 +20,50 @@ package org.apache.geode.security;
 import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.io.File;
 import java.util.Properties;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.distributed.Locator;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.security.templates.DummyAuthenticator;
-import org.apache.geode.test.dunit.Host;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.ServerStarter;
 import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.categories.SecurityTest;
 
 @Category({ DistributedTest.class, SecurityTest.class })
 public class PeerAuthenticatorDUnitTest extends JUnit4DistributedTestCase {
-  protected VM locator = null;
-  protected VM server = null;
-  protected VM server1 = null;
+  @Rule
+  public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
 
   @Before
   public void before() throws Exception {
-final Host host = Host.getHost(0);
-

[37/50] [abbrv] incubator-geode git commit: GEODE-1993: allow LocatorServerStartupRule to save server's ports as well.

2016-10-19 Thread udo
GEODE-1993: allow LocatorServerStartupRule to save server's ports as well.

* added more tetss


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

Branch: refs/heads/feature/GEODE-1874
Commit: 5abe957ca1cd42eeaf82549c275711e6e94dddec
Parents: 1fb0d0a
Author: Jinmei Liao 
Authored: Mon Oct 17 08:08:39 2016 -0700
Committer: Jinmei Liao 
Committed: Mon Oct 17 08:08:39 2016 -0700

--
 .../ClusterConfigWithoutSecurityDUnitTest.java  |   4 +-
 .../security/PeerAuthenticatorDUnitTest.java|  63 
 ...eerSecurityWithEmbeddedLocatorDUnitTest.java | 102 +++
 .../SecurityClusterConfigDUnitTest.java |  10 +-
 .../SecurityWithoutClusterConfigDUnitTest.java  |   2 +-
 .../security/StartServerAuthorizationTest.java  |   4 +-
 .../dunit/rules/LocatorServerStartupRule.java   |  12 ++-
 .../LuceneClusterConfigurationDUnitTest.java|   2 +-
 8 files changed, 140 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5abe957c/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
index 72dbd1a..1bbfa0f 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
@@ -71,7 +71,7 @@ public class ClusterConfigWithoutSecurityDUnitTest extends 
JUnit4DistributedTest
 
 // initial security properties should only contain initial set of values
 ServerStarter serverStarter = new ServerStarter(props);
-serverStarter.startServer(lsRule.getLocatorPort(0));
+serverStarter.startServer(lsRule.getPort(0));
 DistributedSystem ds = serverStarter.cache.getDistributedSystem();
 
 // after cache is created, the configuration won't chagne
@@ -92,7 +92,7 @@ public class ClusterConfigWithoutSecurityDUnitTest extends 
JUnit4DistributedTest
 
 ServerStarter serverStarter = new ServerStarter(props);
 
-assertThatThrownBy(() -> 
serverStarter.startServer(lsRule.getLocatorPort(0)))
+assertThatThrownBy(() -> serverStarter.startServer(lsRule.getPort(0)))
   .isInstanceOf(GemFireConfigException.class)
   
.hasMessage(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toLocalizedString());
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5abe957c/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
index bb147c7..b12ea43 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
@@ -20,73 +20,50 @@ package org.apache.geode.security;
 import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.io.File;
 import java.util.Properties;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.distributed.Locator;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.security.templates.DummyAuthenticator;
-import org.apache.geode.test.dunit.Host;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.ServerStarter;
 import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.categories.SecurityTest;
 
 @Category({ DistributedTest.class, SecurityTest.class })
 public class PeerAuthenticatorDUnitTest extends JUnit4DistributedTestCase {
-  protected VM locator = null;
-  protected VM server = null;
-  protected VM server1 = null;
+  @Rule
+  public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
 
   @Before
   public void before() throws Exception {
-final Host host = Host.getHost(0);
-

incubator-geode git commit: GEODE-1993: allow LocatorServerStartupRule to save server's ports as well.

2016-10-17 Thread jinmeiliao
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 1fb0d0a9d -> 5abe957ca


GEODE-1993: allow LocatorServerStartupRule to save server's ports as well.

* added more tetss


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

Branch: refs/heads/develop
Commit: 5abe957ca1cd42eeaf82549c275711e6e94dddec
Parents: 1fb0d0a
Author: Jinmei Liao 
Authored: Mon Oct 17 08:08:39 2016 -0700
Committer: Jinmei Liao 
Committed: Mon Oct 17 08:08:39 2016 -0700

--
 .../ClusterConfigWithoutSecurityDUnitTest.java  |   4 +-
 .../security/PeerAuthenticatorDUnitTest.java|  63 
 ...eerSecurityWithEmbeddedLocatorDUnitTest.java | 102 +++
 .../SecurityClusterConfigDUnitTest.java |  10 +-
 .../SecurityWithoutClusterConfigDUnitTest.java  |   2 +-
 .../security/StartServerAuthorizationTest.java  |   4 +-
 .../dunit/rules/LocatorServerStartupRule.java   |  12 ++-
 .../LuceneClusterConfigurationDUnitTest.java|   2 +-
 8 files changed, 140 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5abe957c/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
index 72dbd1a..1bbfa0f 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
@@ -71,7 +71,7 @@ public class ClusterConfigWithoutSecurityDUnitTest extends 
JUnit4DistributedTest
 
 // initial security properties should only contain initial set of values
 ServerStarter serverStarter = new ServerStarter(props);
-serverStarter.startServer(lsRule.getLocatorPort(0));
+serverStarter.startServer(lsRule.getPort(0));
 DistributedSystem ds = serverStarter.cache.getDistributedSystem();
 
 // after cache is created, the configuration won't chagne
@@ -92,7 +92,7 @@ public class ClusterConfigWithoutSecurityDUnitTest extends 
JUnit4DistributedTest
 
 ServerStarter serverStarter = new ServerStarter(props);
 
-assertThatThrownBy(() -> 
serverStarter.startServer(lsRule.getLocatorPort(0)))
+assertThatThrownBy(() -> serverStarter.startServer(lsRule.getPort(0)))
   .isInstanceOf(GemFireConfigException.class)
   
.hasMessage(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toLocalizedString());
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5abe957c/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
index bb147c7..b12ea43 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
@@ -20,73 +20,50 @@ package org.apache.geode.security;
 import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.io.File;
 import java.util.Properties;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.distributed.Locator;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.security.templates.DummyAuthenticator;
-import org.apache.geode.test.dunit.Host;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.ServerStarter;
 import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.categories.SecurityTest;
 
 @Category({ DistributedTest.class, SecurityTest.class })
 public class PeerAuthenticatorDUnitTest extends JUnit4DistributedTestCase {
-  protected VM locator = null;
-  protected VM server = null;
-  protected VM server1 = null;
+  @Rule
+  public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
 
   @Before
   public