You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by zh...@apache.org on 2018/12/21 23:10:03 UTC
[geode] branch feature/GEODE-6143-12 updated (ce9c9e3 -> 0b22af1)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a change to branch feature/GEODE-6143-12
in repository https://gitbox.apache.org/repos/asf/geode.git.
discard ce9c9e3 GEODE-6143: remove PowerMock from GatewayReceiverXmlParsingValidationsJUnitTest
new 0b22af1 GEODE-6143: remove PowerMock from GatewayReceiverXmlParsingValidationsJUnitTest
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ce9c9e3)
\
N -- N -- N refs/heads/feature/GEODE-6143-12 (0b22af1)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...ewayReceiverXmlParsingValidationsJUnitTest.java | 90 +++++++++++++
.../geode/internal/cache/wan/MyWANFactoryImpl.java | 144 ---------------------
2 files changed, 90 insertions(+), 144 deletions(-)
delete mode 100644 geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/MyWANFactoryImpl.java
[geode] 01/01: GEODE-6143: remove PowerMock from
GatewayReceiverXmlParsingValidationsJUnitTest
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-6143-12
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 0b22af12981b4cf4b695aa6497d8029797f9185c
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Fri Dec 21 15:00:02 2018 -0800
GEODE-6143: remove PowerMock from GatewayReceiverXmlParsingValidationsJUnitTest
---
...ewayReceiverXmlParsingValidationsJUnitTest.java | 110 ------------
...ewayReceiverXmlParsingValidationsJUnitTest.java | 190 +++++++++++++++++++++
...nsJUnitTest.correctConfiguration[DTD].cache.xml | 0
...nsJUnitTest.correctConfiguration[XSD].cache.xml | 0
...pleReceiversShouldThrowException[DTD].cache.xml | 0
...pleReceiversShouldThrowException[XSD].cache.xml | 0
6 files changed, 190 insertions(+), 110 deletions(-)
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
deleted file mode 100644
index 9461abd..0000000
--- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.internal.cache.wan;
-
-import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.powermock.api.mockito.PowerMockito.mockStatic;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.modules.junit4.PowerMockRunnerDelegate;
-
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.CacheXmlException;
-import org.apache.geode.cache.wan.GatewayReceiverFactory;
-import org.apache.geode.test.junit.categories.WanTest;
-import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
-import org.apache.geode.util.test.TestUtil;
-
-@RunWith(PowerMockRunner.class)
-@Category({WanTest.class})
-@PrepareForTest(WANServiceProvider.class)
-@PowerMockRunnerDelegate(Parameterized.class)
-@PowerMockIgnore({"javax.management.*", "javax.security.*", "*.IntegrationTest"})
-@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
-public class GatewayReceiverXmlParsingValidationsJUnitTest {
- private Cache cache;
- private GatewayReceiverFactory receiverFactory;
-
- @Parameterized.Parameter
- public static String validationStrategy;
-
- @Rule
- public TestName testName = new SerializableTestName();
-
- @Parameterized.Parameters(name = "{0}")
- public static Collection<String> strategies() throws Exception {
- return Arrays.asList("DTD", "XSD");
- }
-
- @Before
- public void setUp() throws Exception {
- mockStatic(WANServiceProvider.class);
- receiverFactory = spy(GatewayReceiverFactory.class);
- when(WANServiceProvider.createGatewayReceiverFactory(any())).thenReturn(receiverFactory);
- }
-
- @Test(expected = CacheXmlException.class)
- public void multipleReceiversShouldThrowException() {
- String cacheXmlFileName = TestUtil.getResourcePath(getClass(),
- getClass().getSimpleName() + "." + testName.getMethodName() + ".cache.xml");
- cache = new CacheFactory().set(MCAST_PORT, "0").set(CACHE_XML_FILE, cacheXmlFileName).create();
- }
-
- @Test
- public void correctConfiguration() {
- String cacheXmlFileName = TestUtil.getResourcePath(getClass(),
- getClass().getSimpleName() + "." + testName.getMethodName() + ".cache.xml");
- cache = new CacheFactory().set(MCAST_PORT, "0").set(CACHE_XML_FILE, cacheXmlFileName).create();
-
- assertThat(cache.getGatewayReceivers()).isNotNull();
- verify(receiverFactory, times(1)).setEndPort(1501);
- verify(receiverFactory, times(1)).setStartPort(1500);
- verify(receiverFactory, times(1)).setManualStart(true);
- verify(receiverFactory, times(1)).setSocketBufferSize(32768);
- verify(receiverFactory, times(1)).setBindAddress("localhost");
- verify(receiverFactory, times(1)).setHostnameForSenders("localhost");
- verify(receiverFactory, times(1)).setMaximumTimeBetweenPings(60000);
- verify(receiverFactory, times(1)).create();
- }
-
- @After
- public void tearDown() {
- if (cache != null) {
- cache.close();
- }
- }
-}
diff --git a/geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java b/geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
new file mode 100644
index 0000000..a5f2cbf
--- /dev/null
+++ b/geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.java
@@ -0,0 +1,190 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.internal.cache.wan;
+
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.internal.Assert.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.CacheXmlException;
+import org.apache.geode.cache.wan.GatewayReceiver;
+import org.apache.geode.cache.wan.GatewayReceiverFactory;
+import org.apache.geode.cache.wan.GatewayTransportFilter;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.wan.spi.WANFactory;
+import org.apache.geode.test.junit.categories.WanTest;
+import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
+import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;
+import org.apache.geode.util.test.TestUtil;
+
+@Category({WanTest.class})
+@RunWith(Parameterized.class)
+@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
+public class GatewayReceiverXmlParsingValidationsJUnitTest {
+ private Cache cache;
+ private GatewayReceiverFactory receiverFactory;
+
+ @Parameterized.Parameter
+ public static String validationStrategy;
+
+ @Rule
+ public TestName testName = new SerializableTestName();
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Collection<String> strategies() throws Exception {
+ return Arrays.asList("DTD", "XSD");
+ }
+
+ @Test(expected = CacheXmlException.class)
+ public void multipleReceiversShouldThrowException() {
+ String cacheXmlFileName = TestUtil.getResourcePath(getClass(),
+ getClass().getSimpleName() + "." + testName.getMethodName() + ".cache.xml");
+ cache = new CacheFactory().set(MCAST_PORT, "0").set(CACHE_XML_FILE, cacheXmlFileName).create();
+ }
+
+ @Test
+ public void correctConfiguration() {
+ String cacheXmlFileName = TestUtil.getResourcePath(getClass(),
+ getClass().getSimpleName() + "." + testName.getMethodName() + ".cache.xml");
+ cache = new CacheFactory().set(MCAST_PORT, "0").set(CACHE_XML_FILE, cacheXmlFileName).create();
+
+ assertThat(cache.getGatewayReceivers()).isNotEmpty();
+ GatewayReceiver receiver = cache.getGatewayReceivers().iterator().next();
+
+ ServiceLoader<WANFactory> loader = ServiceLoader.load(WANFactory.class);
+ Iterator<WANFactory> itr = loader.iterator();
+ assertThat(itr.hasNext()).isTrue();
+
+ assertEquals(1501, receiver.getEndPort());
+ assertEquals(1500, receiver.getStartPort());
+ assertTrue(receiver.isManualStart());
+ assertEquals(32768, receiver.getSocketBufferSize());
+ assertTrue(receiver.getBindAddress().equals("localhost"));
+ assertTrue(receiver.getHostnameForSenders().equals("localhost"));
+ assertEquals(60000, receiver.getMaximumTimeBetweenPings());
+ }
+
+ @After
+ public void tearDown() {
+ if (cache != null) {
+ cache.close();
+ }
+ }
+
+ static class MyGatewayReceiverFactoryImpl implements GatewayReceiverFactory {
+ InternalCache cache;
+ int startPort;
+ int endPort;
+ int socketBuffSize;
+ int timeBetPings;
+ boolean manualStart;
+ String bindAdd;
+ String hostnameForSenders;
+
+ public MyGatewayReceiverFactoryImpl(InternalCache cache) {
+ this.cache = cache;
+ }
+
+ @Override
+ public GatewayReceiverFactory setStartPort(int startPort) {
+ this.startPort = startPort;
+ return this;
+ }
+
+ @Override
+ public GatewayReceiverFactory setEndPort(int endPort) {
+ this.endPort = endPort;
+ return this;
+ }
+
+ @Override
+ public GatewayReceiverFactory setSocketBufferSize(int socketBufferSize) {
+ this.socketBuffSize = socketBufferSize;
+ return this;
+ }
+
+ @Override
+ public GatewayReceiverFactory setBindAddress(String address) {
+ this.bindAdd = address;
+ return this;
+ }
+
+ @Override
+ public GatewayReceiverFactory addGatewayTransportFilter(GatewayTransportFilter filter) {
+ return null;
+ }
+
+ @Override
+ public GatewayReceiverFactory removeGatewayTransportFilter(GatewayTransportFilter filter) {
+ return null;
+ }
+
+ @Override
+ public GatewayReceiverFactory setMaximumTimeBetweenPings(int time) {
+ this.timeBetPings = time;
+ return this;
+ }
+
+ @Override
+ public GatewayReceiverFactory setHostnameForSenders(String address) {
+ this.hostnameForSenders = address;
+ return this;
+ }
+
+ @Override
+ public GatewayReceiverFactory setManualStart(boolean start) {
+ this.manualStart = start;
+ return this;
+ }
+
+ @Override
+ public GatewayReceiver create() {
+ GatewayReceiver receiver = mock(GatewayReceiver.class);
+ when(receiver.isManualStart()).thenReturn(this.manualStart);
+ when(receiver.getBindAddress()).thenReturn(this.bindAdd);
+ when(receiver.getEndPort()).thenReturn(this.endPort);
+ when(receiver.getStartPort()).thenReturn(this.startPort);
+ when(receiver.getSocketBufferSize()).thenReturn(this.socketBuffSize);
+ when(receiver.getHostnameForSenders()).thenReturn(this.hostnameForSenders);
+ when(receiver.getMaximumTimeBetweenPings()).thenReturn(this.timeBetPings);
+ this.cache.addGatewayReceiver(receiver);
+ return receiver;
+ }
+
+ public boolean isManualStart() {
+ return this.manualStart;
+ }
+ }
+
+}
diff --git a/geode-core/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.correctConfiguration[DTD].cache.xml b/geode-wan/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.correctConfiguration[DTD].cache.xml
similarity index 100%
rename from geode-core/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.correctConfiguration[DTD].cache.xml
rename to geode-wan/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.correctConfiguration[DTD].cache.xml
diff --git a/geode-core/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.correctConfiguration[XSD].cache.xml b/geode-wan/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.correctConfiguration[XSD].cache.xml
similarity index 100%
rename from geode-core/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.correctConfiguration[XSD].cache.xml
rename to geode-wan/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.correctConfiguration[XSD].cache.xml
diff --git a/geode-core/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.multipleReceiversShouldThrowException[DTD].cache.xml b/geode-wan/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.multipleReceiversShouldThrowException[DTD].cache.xml
similarity index 100%
rename from geode-core/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.multipleReceiversShouldThrowException[DTD].cache.xml
rename to geode-wan/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.multipleReceiversShouldThrowException[DTD].cache.xml
diff --git a/geode-core/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.multipleReceiversShouldThrowException[XSD].cache.xml b/geode-wan/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.multipleReceiversShouldThrowException[XSD].cache.xml
similarity index 100%
rename from geode-core/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.multipleReceiversShouldThrowException[XSD].cache.xml
rename to geode-wan/src/integrationTest/resources/org/apache/geode/internal/cache/wan/GatewayReceiverXmlParsingValidationsJUnitTest.multipleReceiversShouldThrowException[XSD].cache.xml