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 2015/08/18 21:48:45 UTC

[3/5] metamodel git commit: METAMODEL-170: Removed hack to avoid invalid test under ES version 0.x

METAMODEL-170: Removed hack to avoid invalid test under ES version 0.x

Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/132901d0
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/132901d0
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/132901d0

Branch: refs/heads/master
Commit: 132901d06134b0e4e62e323c4def22b3b68ac2d4
Parents: 26a64bd
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sat Aug 15 19:54:00 2015 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sat Aug 15 19:54:00 2015 +0200

----------------------------------------------------------------------
 .../metamodel/elasticsearch/ElasticSearchDataContextTest.java | 7 -------
 1 file changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/metamodel/blob/132901d0/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchDataContextTest.java
----------------------------------------------------------------------
diff --git a/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchDataContextTest.java b/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchDataContextTest.java
index 07c6181..d421b99 100644
--- a/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchDataContextTest.java
+++ b/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchDataContextTest.java
@@ -525,13 +525,6 @@ public class ElasticSearchDataContextTest {
 
     @Test
     public void testNonDynamicMapingTableNames() throws Exception {
-        if (Version.CURRENT.major == 0) {
-            // this test is omitted on v. 0.x versions of ElasticSearch since
-            // the put mapping API is incompatible with 1.x so we cannot create
-            // the same prerequisites in the test.
-            return;
-        }
-
         createIndex();
 
         ElasticSearchDataContext dataContext2 = new ElasticSearchDataContext(client, indexName2);