This is an automated email from the ASF dual-hosted git repository.

dschneider pushed a commit to branch feature/GEODE-5935
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-5935 by this 
push:
     new b81b13e  changed the region-mapping element to jdbc:mapping. removed 
the "region" attributes from jdbc:mapping.
b81b13e is described below

commit b81b13e8e620cc2fb134345671c5a025173d9856
Author: Darrel Schneider <[email protected]>
AuthorDate: Fri Oct 26 16:45:20 2018 -0700

    changed the region-mapping element to jdbc:mapping.
    removed the "region" attributes from jdbc:mapping.
---
 .../internal/cli/AlterMappingCommandDUnitTest.java |  4 +-
 .../cli/CreateMappingCommandDUnitTest.java         |  4 +-
 .../cli/DestroyMappingCommandDunitTest.java        |  2 +-
 .../jdbc/internal/configuration/RegionMapping.java | 10 ++--
 .../connectors/jdbc/internal/xml/ElementType.java  | 10 ++--
 .../xml/JdbcConnectorServiceXmlParser.java         |  1 -
 .../geode.apache.org/schema/jdbc/jdbc-1.0.xsd      |  3 +-
 .../configuration/ConnectorServiceTest.java        | 69 ----------------------
 .../jdbc/internal/xml/ElementTypeTest.java         | 11 ++--
 .../xml/JdbcConnectorServiceXmlParserTest.java     | 11 ++--
 .../internal/xml/JdbcServiceConfigurationTest.java | 59 ------------------
 11 files changed, 27 insertions(+), 157 deletions(-)

diff --git 
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
 
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
index cc28e68..f93dc9d 100644
--- 
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
+++ 
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
@@ -98,7 +98,7 @@ public class AlterMappingCommandDUnitTest {
     locator.invoke(() -> {
       String xml = 
InternalLocator.getLocator().getConfigurationPersistenceService()
           .getConfiguration("cluster").getCacheXmlContent();
-      assertThat(xml).isNotNull().contains("jdbc:region-mapping");
+      assertThat(xml).isNotNull().contains("jdbc:mapping");
     });
 
     server.invoke(() -> {
@@ -131,7 +131,7 @@ public class AlterMappingCommandDUnitTest {
     locator.invoke(() -> {
       String xml = 
InternalLocator.getLocator().getConfigurationPersistenceService()
           .getConfiguration("cluster").getCacheXmlContent();
-      assertThat(xml).isNotNull().contains("jdbc:region-mapping");
+      assertThat(xml).isNotNull().contains("jdbc:mapping");
     });
 
     server.invoke(() -> {
diff --git 
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
 
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
index 4f23017..65f93fe 100644
--- 
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
+++ 
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
@@ -83,7 +83,7 @@ public class CreateMappingCommandDUnitTest {
     locator.invoke(() -> {
       String xml = 
InternalLocator.getLocator().getConfigurationPersistenceService()
           .getConfiguration("cluster").getCacheXmlContent();
-      
assertThat(xml).isNotNull().contains("jdbc:region-mapping").contains("jdbc:field-mapping");
+      
assertThat(xml).isNotNull().contains("jdbc:mapping").contains("jdbc:field-mapping");
     });
 
     server.invoke(() -> {
@@ -151,7 +151,7 @@ public class CreateMappingCommandDUnitTest {
     locator.invoke(() -> {
       String xml = 
InternalLocator.getLocator().getConfigurationPersistenceService()
           .getConfiguration("cluster").getCacheXmlContent();
-      assertThat(xml).isNotNull().contains("jdbc:region-mapping");
+      assertThat(xml).isNotNull().contains("jdbc:mapping");
       assertThat(xml).isNotNull().doesNotContain("jdbc:field-mapping");
     });
   }
diff --git 
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
 
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
index fec7dbd..9697532 100644
--- 
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
+++ 
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
@@ -92,7 +92,7 @@ public class DestroyMappingCommandDunitTest implements 
Serializable {
     locator.invoke(() -> {
       String xml = 
InternalLocator.getLocator().getConfigurationPersistenceService()
           .getConfiguration("cluster").getCacheXmlContent();
-      assertThat(xml).doesNotContain("jdbc:region-mapping");
+      assertThat(xml).doesNotContain("jdbc:mapping");
     });
 
     server.invoke(() -> {
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping.java
index 3226411..bfd1280 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping.java
@@ -63,7 +63,6 @@ import org.apache.geode.pdx.internal.TypeRegistry;
  *         &lt;/element>
  *       &lt;/sequence>
  *       &lt;attribute name="connection-name" 
type="{http://www.w3.org/2001/XMLSchema}string"; />
- *       &lt;attribute name="region" 
type="{http://www.w3.org/2001/XMLSchema}string"; />
  *       &lt;attribute name="table" 
type="{http://www.w3.org/2001/XMLSchema}string"; />
  *       &lt;attribute name="pdx-class" 
type="{http://www.w3.org/2001/XMLSchema}string"; />
  *       &lt;attribute name="primary-key-in-value" 
type="{http://www.w3.org/2001/XMLSchema}string"; />
@@ -77,7 +76,7 @@ import org.apache.geode.pdx.internal.TypeRegistry;
 @Experimental
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {"fieldMapping"})
-@XmlRootElement(name = "region-mapping", namespace = 
"http://geode.apache.org/schema/jdbc";)
+@XmlRootElement(name = "mapping", namespace = 
"http://geode.apache.org/schema/jdbc";)
 @XSDRootElement(namespace = "http://geode.apache.org/schema/jdbc";,
     schemaLocation = "http://geode.apache.org/schema/jdbc/jdbc-1.0.xsd";)
 public class RegionMapping implements CacheElement {
@@ -89,8 +88,6 @@ public class RegionMapping implements CacheElement {
   protected boolean fieldMappingModified = false;
   @XmlAttribute(name = "connection-name")
   protected String connectionConfigName;
-  @XmlAttribute(name = "region")
-  protected String regionName;
   @XmlAttribute(name = "table")
   protected String tableName;
   @XmlAttribute(name = "pdx-class")
@@ -98,7 +95,10 @@ public class RegionMapping implements CacheElement {
   @XmlAttribute(name = "primary-key-in-value")
   protected Boolean primaryKeyInValue;
 
-  public static final String ELEMENT_ID = "region-mapping";
+  @XmlTransient
+  protected String regionName;
+
+  public static final String ELEMENT_ID = "jdbc-mapping";
 
   public RegionMapping() {}
 
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java
index a7d5b5f..2f98525 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java
@@ -23,16 +23,16 @@ import 
org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping;
 import org.apache.geode.internal.cache.xmlcache.RegionCreation;
 
 public enum ElementType {
-  REGION_MAPPING("region-mapping") {
+  JDBC_MAPPING("mapping") {
     @Override
     void startElement(Stack<Object> stack, Attributes attributes) {
       if (!(stack.peek() instanceof RegionCreation)) {
         throw new CacheXmlException(
-            "jdbc <region-mapping> elements must occur within <region> 
elements");
+            "<jdbc:mapping> elements must occur within <region> elements");
       }
-      // RegionCreation regionCreation = (RegionCreation) stack.peek();
+      RegionCreation regionCreation = (RegionCreation) stack.peek();
       RegionMapping mapping = new RegionMapping();
-      
mapping.setRegionName(attributes.getValue(JdbcConnectorServiceXmlParser.REGION));
+      mapping.setRegionName(regionCreation.getFullPath().substring(1));
       mapping.setConnectionConfigName(
           attributes.getValue(JdbcConnectorServiceXmlParser.CONNECTION_NAME));
       
mapping.setTableName(attributes.getValue(JdbcConnectorServiceXmlParser.TABLE));
@@ -55,7 +55,7 @@ public enum ElementType {
     void startElement(Stack<Object> stack, Attributes attributes) {
       if (!(stack.peek() instanceof RegionMapping)) {
         throw new CacheXmlException(
-            "jdbc <field-mapping> elements must occur within <region-mapping> 
elements");
+            "<jdbc:field-mapping> elements must occur within <jdbc:mapping> 
elements");
       }
       RegionMapping mapping = (RegionMapping) stack.peek();
       mapping.getFieldMapping()
diff --git 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java
 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java
index 5601593..dc379ac 100644
--- 
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java
+++ 
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java
@@ -27,7 +27,6 @@ public class JdbcConnectorServiceXmlParser extends 
AbstractXmlParser {
   static final String USER = "user";
   static final String PASSWORD = "password";
   static final String PARAMETERS = "parameters";
-  static final String REGION = "region";
   static final String CONNECTION_NAME = "connection-name";
   static final String TABLE = "table";
   static final String PDX_CLASS = "pdx-class";
diff --git 
a/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd
 
b/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd
index 9ef4fee..c48128d 100644
--- 
a/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd
+++ 
b/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd
@@ -38,7 +38,7 @@ XML schema for JDBC Connector Service in Geode.
 
     ]]></xsd:documentation>
     </xsd:annotation>
-        <xsd:element name="region-mapping">
+        <xsd:element name="mapping">
             <xsd:complexType>
                 <xsd:sequence>
                     <xsd:element name="field-mapping" maxOccurs="unbounded" 
minOccurs="0">
@@ -53,7 +53,6 @@ XML schema for JDBC Connector Service in Geode.
                     </xsd:element>
                 </xsd:sequence>
                 <xsd:attribute type="xsd:string" name="connection-name" 
use="optional"/>
-                <xsd:attribute type="xsd:string" name="region" use="optional"/>
                 <xsd:attribute type="xsd:string" name="table" use="optional"/>
                 <xsd:attribute type="xsd:string" name="pdx-class" 
use="optional"/>
                 <xsd:attribute type="xsd:string" name="primary-key-in-value" 
use="optional"/>
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java
deleted file mode 100644
index 71ee902..0000000
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/configuration/ConnectorServiceTest.java
+++ /dev/null
@@ -1,69 +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.connectors.jdbc.internal.configuration;
-//
-//
-//
-//
-//
-//
-// public class ConnectorServiceTest {
-//
-// private JAXBService jaxbService;
-//
-// @Before
-// public void setUp() throws Exception {
-// jaxbService = new JAXBService(CacheConfig.class, ConnectorService.class);
-// // find the local jdbc-1.0.xsd
-// URL local_xsd = ClassPathLoader.getLatest()
-// .getResource("META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd");
-// jaxbService.validateWith(local_xsd);
-// }
-//
-// @Test
-// public void regionMappingTest() {
-// ConnectorService service = new ConnectorService();
-// RegionMapping mapping = new RegionMapping();
-// mapping.setConnectionConfigName("configName");
-// mapping.setPdxClassName("pdxClassName");
-// mapping.setRegionName("regionA");
-// mapping.setTableName("tableName");
-// mapping.getFieldMapping()
-// .add(new RegionMapping.FieldMapping("field1", "column1"));
-// mapping.getFieldMapping()
-// .add(new RegionMapping.FieldMapping("field2", "column2"));
-//
-// service.getRegionMapping().add(mapping);
-// String xml = jaxbService.marshall(service);
-//
-// 
assertThat(xml).contains("jdbc:connector-service").contains("connection-name=\"configName\"
 ")
-// .contains("pdx-class=\"pdxClassName\"")
-// .contains("<jdbc:field-mapping field-name=\"field1\" 
column-name=\"column1\"/>");
-// System.out.println(xml);
-//
-// ConnectorService service2 = jaxbService.unMarshall(xml);
-// assertThat(service2.getRegionMapping()).hasSize(1);
-// List<RegionMapping.FieldMapping> mappings =
-// service2.getRegionMapping().get(0).getFieldMapping();
-//
-// assertThat(mappings.get(0).getFieldName()).isEqualTo("field1");
-// assertThat(mappings.get(0).getColumnName()).isEqualTo("column1");
-// assertThat(mappings.get(1).getFieldName()).isEqualTo("field2");
-// assertThat(mappings.get(1).getColumnName()).isEqualTo("column2");
-// }
-// }
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
index 172d0d5..56e7df8 100644
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
+++ 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
@@ -16,13 +16,12 @@ package org.apache.geode.connectors.jdbc.internal.xml;
 
 
 import static 
org.apache.geode.connectors.jdbc.internal.xml.ElementType.FIELD_MAPPING;
-import static 
org.apache.geode.connectors.jdbc.internal.xml.ElementType.REGION_MAPPING;
+import static 
org.apache.geode.connectors.jdbc.internal.xml.ElementType.JDBC_MAPPING;
 import static 
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.COLUMN_NAME;
 import static 
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.CONNECTION_NAME;
 import static 
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.FIELD_NAME;
 import static 
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.PDX_CLASS;
 import static 
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.PRIMARY_KEY_IN_VALUE;
-import static 
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.REGION;
 import static 
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.TABLE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -106,20 +105,20 @@ public class ElementTypeTest {
   public void startElementRegionMappingThrowsWithoutJdbcServiceConfiguration() 
{
     stack.push(new Object());
 
-    assertThatThrownBy(() -> REGION_MAPPING.startElement(stack, attributes))
+    assertThatThrownBy(() -> JDBC_MAPPING.startElement(stack, attributes))
         .isInstanceOf(CacheXmlException.class);
   }
 
   @Test
   public void startElementRegionMapping() {
-    when(attributes.getValue(REGION)).thenReturn("region");
     when(attributes.getValue(CONNECTION_NAME)).thenReturn("connectionName");
     when(attributes.getValue(TABLE)).thenReturn("table");
     when(attributes.getValue(PDX_CLASS)).thenReturn("pdxClass");
     when(attributes.getValue(PRIMARY_KEY_IN_VALUE)).thenReturn("true");
+    when(regionCreation.getFullPath()).thenReturn("/region");
     stack.push(regionCreation);
 
-    ElementType.REGION_MAPPING.startElement(stack, attributes);
+    ElementType.JDBC_MAPPING.startElement(stack, attributes);
 
     RegionMapping regionMapping = (RegionMapping) stack.pop();
     assertThat(regionMapping.getRegionName()).isEqualTo("region");
@@ -135,7 +134,7 @@ public class ElementTypeTest {
     stack.push(regionCreation);
     stack.push(mapping);
 
-    ElementType.REGION_MAPPING.endElement(stack);
+    ElementType.JDBC_MAPPING.endElement(stack);
 
     assertThat(stack.size()).isEqualTo(1);
   }
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java
index 518662d..afbbec7 100644
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java
+++ 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParserTest.java
@@ -14,7 +14,7 @@
  */
 package org.apache.geode.connectors.jdbc.internal.xml;
 
-import static 
org.apache.geode.connectors.jdbc.internal.xml.ElementType.REGION_MAPPING;
+import static 
org.apache.geode.connectors.jdbc.internal.xml.ElementType.JDBC_MAPPING;
 import static 
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.NAMESPACE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -43,6 +43,7 @@ public class JdbcConnectorServiceXmlParserTest {
   public void setup() {
     attributes = mock(Attributes.class);
     regionCreation = mock(RegionCreation.class);
+    when(regionCreation.getFullPath()).thenReturn("/region");
     extensionPoint = mock(ExtensionPoint.class);
     when(regionCreation.getExtensionPoint()).thenReturn(extensionPoint);
     stack = new Stack<>();
@@ -59,7 +60,7 @@ public class JdbcConnectorServiceXmlParserTest {
     stack.push(regionCreation);
     parser.setStack(stack);
 
-    parser.startElement(NAMESPACE, REGION_MAPPING.getTypeName(), null, 
attributes);
+    parser.startElement(NAMESPACE, JDBC_MAPPING.getTypeName(), null, 
attributes);
 
     assertThat(stack.pop()).isInstanceOf(RegionMapping.class);
   }
@@ -70,7 +71,7 @@ public class JdbcConnectorServiceXmlParserTest {
     stack.push(regionCreation);
     parser.setStack(stack);
 
-    parser.startElement("wrongNamespace", REGION_MAPPING.getTypeName(), null, 
attributes);
+    parser.startElement("wrongNamespace", JDBC_MAPPING.getTypeName(), null, 
attributes);
 
     assertThat(stack.pop()).isEqualTo(regionCreation);
   }
@@ -83,7 +84,7 @@ public class JdbcConnectorServiceXmlParserTest {
     stack.push(regionMapping);
     parser.setStack(stack);
 
-    parser.endElement(NAMESPACE, REGION_MAPPING.getTypeName(), null);
+    parser.endElement(NAMESPACE, JDBC_MAPPING.getTypeName(), null);
 
     assertThat(stack.pop()).isEqualTo(regionCreation);
     verifyZeroInteractions(regionMapping);
@@ -97,7 +98,7 @@ public class JdbcConnectorServiceXmlParserTest {
     stack.push(regionMapping);
     parser.setStack(stack);
 
-    parser.endElement("wrongNamespace", REGION_MAPPING.getTypeName(), null);
+    parser.endElement("wrongNamespace", JDBC_MAPPING.getTypeName(), null);
 
     assertThat(stack.pop()).isEqualTo(regionMapping);
     verifyZeroInteractions(regionMapping);
diff --git 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java
 
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java
deleted file mode 100644
index b6dc521..0000000
--- 
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java
+++ /dev/null
@@ -1,59 +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.connectors.jdbc.internal.xml;
-//
-//
-//
-//
-// public class JdbcServiceConfigurationTest {
-//
-// private InternalCache cache;
-// private JdbcConnectorService service;
-// private RegionMapping mapping1;
-// private RegionMapping mapping2;
-//
-// private JdbcServiceConfiguration configuration;
-//
-// @Before
-// public void setUp() throws Exception {
-// mapping1 = mock(RegionMapping.class);
-// mapping2 = mock(RegionMapping.class);
-// service = mock(JdbcConnectorService.class);
-// cache = mock(InternalCache.class);
-//
-// when(cache.getService(JdbcConnectorService.class)).thenReturn(service);
-//
-// configuration = new JdbcServiceConfiguration();
-// }
-//
-// @Test
-// public void onCreateWithNoConnectionsOrMappings() throws Exception {
-// configuration.onCreate(cache, cache);
-//
-// verifyZeroInteractions(service);
-// }
-//
-// @Test
-// public void onCreateWithRegionMappings() throws Exception {
-// configuration.addRegionMapping(mapping1);
-// configuration.addRegionMapping(mapping2);
-//
-// configuration.onCreate(cache, cache);
-//
-// verify(service, times(1)).createRegionMapping(mapping1);
-// verify(service, times(1)).createRegionMapping(mapping2);
-// }
-//
-// }

Reply via email to