You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2016/05/16 03:54:07 UTC
[32/42] metamodel git commit: Moved test to
DelegatingIntrinsicSwitchColumnNamingStrategyTest
Moved test to DelegatingIntrinsicSwitchColumnNamingStrategyTest
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/41075909
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/41075909
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/41075909
Branch: refs/heads/5.x
Commit: 410759094569f6e12850eb7b24eee8eaf29e0da9
Parents: c1e1d52
Author: kaspersorensen <i....@gmail.com>
Authored: Tue Apr 26 12:39:03 2016 -0700
Committer: kaspersorensen <i....@gmail.com>
Committed: Tue Apr 26 12:39:03 2016 -0700
----------------------------------------------------------------------
.../naming/DefaultColumnNamingStrategyTest.java | 46 ------------------
...IntrinsicSwitchColumnNamingStrategyTest.java | 51 ++++++++++++++++++++
2 files changed, 51 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/41075909/core/src/test/java/org/apache/metamodel/schema/naming/DefaultColumnNamingStrategyTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/metamodel/schema/naming/DefaultColumnNamingStrategyTest.java b/core/src/test/java/org/apache/metamodel/schema/naming/DefaultColumnNamingStrategyTest.java
deleted file mode 100644
index eb618c2..0000000
--- a/core/src/test/java/org/apache/metamodel/schema/naming/DefaultColumnNamingStrategyTest.java
+++ /dev/null
@@ -1,46 +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.metamodel.schema.naming;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class DefaultColumnNamingStrategyTest {
-
- private final ColumnNamingStrategy namingStrategy = ColumnNamingStrategies.defaultStrategy();
-
- @Test
- public void testDuplicateColumnNames() throws Exception {
- try (final ColumnNamingSession session = namingStrategy.startColumnNamingSession()) {
- assertEquals("foo", session.getNextColumnName(new ColumnNamingContextImpl(null, "foo", 0)));
- assertEquals("bar", session.getNextColumnName(new ColumnNamingContextImpl(null, "bar", 1)));
- assertEquals("foo_2", session.getNextColumnName(new ColumnNamingContextImpl(null, "foo", 2)));
- }
- }
-
- @Test
- public void testNoIntrinsicColumnNames() throws Exception {
- try (final ColumnNamingSession session = namingStrategy.startColumnNamingSession()) {
- assertEquals("A", session.getNextColumnName(new ColumnNamingContextImpl(null, "", 0)));
- assertEquals("B", session.getNextColumnName(new ColumnNamingContextImpl(null, null, 1)));
- assertEquals("C", session.getNextColumnName(new ColumnNamingContextImpl(null, "", 2)));
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/41075909/core/src/test/java/org/apache/metamodel/schema/naming/DelegatingIntrinsicSwitchColumnNamingStrategyTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/metamodel/schema/naming/DelegatingIntrinsicSwitchColumnNamingStrategyTest.java b/core/src/test/java/org/apache/metamodel/schema/naming/DelegatingIntrinsicSwitchColumnNamingStrategyTest.java
new file mode 100644
index 0000000..a10ec7c
--- /dev/null
+++ b/core/src/test/java/org/apache/metamodel/schema/naming/DelegatingIntrinsicSwitchColumnNamingStrategyTest.java
@@ -0,0 +1,51 @@
+/**
+ * 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.metamodel.schema.naming;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class DelegatingIntrinsicSwitchColumnNamingStrategyTest {
+
+ private final ColumnNamingStrategy namingStrategy = ColumnNamingStrategies.defaultStrategy();
+
+ @Test
+ public void testItIsTheDefaultStrategy() throws Exception {
+ assertTrue(namingStrategy instanceof DelegatingIntrinsicSwitchColumnNamingStrategy);
+ }
+
+ @Test
+ public void testDuplicateColumnNames() throws Exception {
+ try (final ColumnNamingSession session = namingStrategy.startColumnNamingSession()) {
+ assertEquals("foo", session.getNextColumnName(new ColumnNamingContextImpl(null, "foo", 0)));
+ assertEquals("bar", session.getNextColumnName(new ColumnNamingContextImpl(null, "bar", 1)));
+ assertEquals("foo_2", session.getNextColumnName(new ColumnNamingContextImpl(null, "foo", 2)));
+ }
+ }
+
+ @Test
+ public void testNoIntrinsicColumnNames() throws Exception {
+ try (final ColumnNamingSession session = namingStrategy.startColumnNamingSession()) {
+ assertEquals("A", session.getNextColumnName(new ColumnNamingContextImpl(null, "", 0)));
+ assertEquals("B", session.getNextColumnName(new ColumnNamingContextImpl(null, null, 1)));
+ assertEquals("C", session.getNextColumnName(new ColumnNamingContextImpl(null, "", 2)));
+ }
+ }
+}