This is an automated email from the ASF dual-hosted git repository.
jchen21 pushed a commit to branch feature/GEODE-5875
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 6a53cc1098c925e757af619dcaa3c5f0a25c3bb3
Author: Jianxia Chen <jc...@pivotal.io>
AuthorDate: Fri Oct 12 17:41:43 2018 -0700
GEODE-5875: Add a DUnitTest to reproduce the bug
Co-authored-by: Darrel Schneider <dschnei...@pivotal.io>
Co-authored-by: Jianxia Chen <jc...@pivotal.io>
---
.../DestroySecondJndiBindingCommandDUnitTest.java | 114 +++++++++++++++++++++
1 file changed, 114 insertions(+)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroySecondJndiBindingCommandDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroySecondJndiBindingCommandDUnitTest.java
new file mode 100644
index 0000000..f753cc3
--- /dev/null
+++
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/DestroySecondJndiBindingCommandDUnitTest.java
@@ -0,0 +1,114 @@
+/*
+ * 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.management.internal.cli.commands;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import
org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
+import org.apache.geode.internal.jndi.JNDIInvoker;
+import org.apache.geode.management.internal.configuration.domain.Configuration;
+import org.apache.geode.management.internal.configuration.utils.XmlUtils;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.junit.categories.GfshTest;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
+import org.apache.geode.test.junit.rules.VMProvider;
+
+@Category({GfshTest.class})
+public class DestroySecondJndiBindingCommandDUnitTest {
+
+ private static MemberVM locator, server1, server2;
+
+ @ClassRule
+ public static ClusterStartupRule cluster = new ClusterStartupRule();
+
+ @ClassRule
+ public static GfshCommandRule gfsh = new GfshCommandRule();
+
+ @BeforeClass
+ public static void before() throws Exception {
+ locator = cluster.startLocatorVM(0);
+ server1 = cluster.startServerVM(1, locator.getPort());
+ server2 = cluster.startServerVM(2, locator.getPort());
+
+ gfsh.connectAndVerify(locator);
+
+ gfsh.execute(
+ "create jndi-binding --name=jndi1 --type=SIMPLE
--jdbc-driver-class=org.apache.derby.jdbc.EmbeddedDriver
--connection-url=\"jdbc:derby:newDB;create=true\"");
+
+ gfsh.execute(
+ "create jndi-binding --name=jndi2 --type=SIMPLE
--jdbc-driver-class=org.apache.derby.jdbc.EmbeddedDriver
--connection-url=\"jdbc:derby:newDB;create=true\"");
+ }
+
+ @Test
+ public void testDestroySecondJndiBinding() {
+
+ gfsh.executeAndAssertThat("destroy jndi-binding
--name=jndi2").statusIsSuccess()
+ .tableHasColumnOnlyWithValues("Member", "server-1", "server-2");
+
+ // verify cluster config is updated
+ locator.invoke(() -> {
+ InternalConfigurationPersistenceService ccService =
+ ClusterStartupRule.getLocator().getConfigurationPersistenceService();
+ Configuration configuration = ccService.getConfiguration("cluster");
+ Document document =
XmlUtils.createDocumentFromXml(configuration.getCacheXmlContent());
+ NodeList jndiBindings = document.getElementsByTagName("jndi-binding");
+
+ assertThat(jndiBindings.getLength()).isEqualTo(1);
+
+ boolean found = false;
+ for (int i = 0; i < jndiBindings.getLength(); i++) {
+ Element eachBinding = (Element) jndiBindings.item(i);
+ if (eachBinding.getAttribute("jndi-name").equals("jndi2")) {
+ found = true;
+ break;
+ }
+ }
+ assertThat(found).isFalse();
+
+ found = false;
+ for (int i = 0; i < jndiBindings.getLength(); i++) {
+ Element eachBinding = (Element) jndiBindings.item(i);
+ if (eachBinding.getAttribute("jndi-name").equals("jndi1")) {
+ found = true;
+ break;
+ }
+ }
+ assertThat(found).isTrue();
+ });
+
+ // verify datasource exists
+ VMProvider.invokeInEveryMember(
+ () ->
assertThat(JNDIInvoker.getNoOfAvailableDataSources()).isEqualTo(1), server1,
server2);
+
+ // bounce server1 and assert that there is still no datasource received
from cluster config
+ server1.stop(false);
+ server1 = cluster.startServerVM(1, locator.getPort());
+
+ // verify no datasource from cluster config
+ server1.invoke(() -> {
+ assertThat(JNDIInvoker.getNoOfAvailableDataSources()).isEqualTo(1);
+ });
+ }
+}
