Repository: metamodel Updated Branches: refs/heads/master 6862d39b7 -> 7bd8ad494
METAMODEL-1206: Solved Maven version dependent unit test issues. Closes #198 Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/7bd8ad49 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/7bd8ad49 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/7bd8ad49 Branch: refs/heads/master Commit: 7bd8ad494b6db0af997eb10c50efb20fb2737449 Parents: 6862d39 Author: Kasper Sørensen <[email protected]> Authored: Thu Nov 29 08:22:26 2018 -0800 Committer: Kasper Sørensen <[email protected]> Committed: Thu Nov 29 08:22:26 2018 -0800 ---------------------------------------------------------------------- CHANGES.md | 1 + .../common/ElasticSearchMetaDataParserTest.java | 65 +++++++++++++++++++ .../ElasticSearchMetaDataParserTest.java | 67 -------------------- 3 files changed, 66 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/7bd8ad49/CHANGES.md ---------------------------------------------------------------------- diff --git a/CHANGES.md b/CHANGES.md index a426d3a..d573809 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,7 @@ ### Apache MetaModel 5.x (WIP) * [METAMODEL-1205] - Updated build and dependencies to be JDK8-11 compatible. Important updates include Guava, POI, Cassandra, Hadoop. + * [METAMODEL-1206] - Solved Maven version dependent unit test issues in ElasticSearch-native module. ### Apache MetaModel 5.1.1 http://git-wip-us.apache.org/repos/asf/metamodel/blob/7bd8ad49/elasticsearch/common/src/test/java/org/apache/metamodel/elasticsearch/common/ElasticSearchMetaDataParserTest.java ---------------------------------------------------------------------- diff --git a/elasticsearch/common/src/test/java/org/apache/metamodel/elasticsearch/common/ElasticSearchMetaDataParserTest.java b/elasticsearch/common/src/test/java/org/apache/metamodel/elasticsearch/common/ElasticSearchMetaDataParserTest.java new file mode 100644 index 0000000..a5b4217 --- /dev/null +++ b/elasticsearch/common/src/test/java/org/apache/metamodel/elasticsearch/common/ElasticSearchMetaDataParserTest.java @@ -0,0 +1,65 @@ +/** + * 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.elasticsearch.common; + +import java.util.LinkedHashMap; +import java.util.Map; + +import junit.framework.TestCase; + +import org.apache.metamodel.schema.ColumnType; +import org.elasticsearch.common.collect.MapBuilder; + +public class ElasticSearchMetaDataParserTest extends TestCase { + + public void testParseMetadataInfo() throws Exception { + Map<String, Object> metadata = new LinkedHashMap<>(); + metadata.put("message", MapBuilder.newMapBuilder().put("type", "long").immutableMap()); + metadata.put("postDate", MapBuilder.newMapBuilder().put("type", "date").put("format", "dateOptionalTime").immutableMap()); + metadata.put("anotherDate", MapBuilder.newMapBuilder().put("type", "date").put("format", "dateOptionalTime").immutableMap()); + metadata.put("user", MapBuilder.newMapBuilder().put("type", "string").immutableMap()); + metadata.put("critical", MapBuilder.newMapBuilder().put("type", "boolean").immutableMap()); + metadata.put("income", MapBuilder.newMapBuilder().put("type", "double").immutableMap()); + metadata.put("untypedthingie", MapBuilder.newMapBuilder().put("foo", "bar").immutableMap()); + + ElasticSearchMetaData metaData = ElasticSearchMetaDataParser.parse(metadata); + String[] columnNames = metaData.getColumnNames(); + ColumnType[] columnTypes = metaData.getColumnTypes(); + + assertTrue(columnNames.length == 8); + assertEquals(columnNames[0], "_id"); + assertEquals(columnNames[1], "message"); + assertEquals(columnNames[2], "postDate"); + assertEquals(columnNames[3], "anotherDate"); + assertEquals(columnNames[4], "user"); + assertEquals(columnNames[5], "critical"); + assertEquals(columnNames[6], "income"); + assertEquals(columnNames[7], "untypedthingie"); + + assertTrue(columnTypes.length == 8); + assertEquals(columnTypes[0], ColumnType.STRING); + assertEquals(columnTypes[1], ColumnType.BIGINT); + assertEquals(columnTypes[2], ColumnType.DATE); + assertEquals(columnTypes[3], ColumnType.DATE); + assertEquals(columnTypes[4], ColumnType.STRING); + assertEquals(columnTypes[5], ColumnType.BOOLEAN); + assertEquals(columnTypes[6], ColumnType.DOUBLE); + assertEquals(columnTypes[7], ColumnType.STRING); + } +} http://git-wip-us.apache.org/repos/asf/metamodel/blob/7bd8ad49/elasticsearch/native/src/test/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchMetaDataParserTest.java ---------------------------------------------------------------------- diff --git a/elasticsearch/native/src/test/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchMetaDataParserTest.java b/elasticsearch/native/src/test/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchMetaDataParserTest.java deleted file mode 100644 index e08f715..0000000 --- a/elasticsearch/native/src/test/java/org/apache/metamodel/elasticsearch/nativeclient/ElasticSearchMetaDataParserTest.java +++ /dev/null @@ -1,67 +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.elasticsearch.nativeclient; - -import java.util.LinkedHashMap; -import java.util.Map; - -import junit.framework.TestCase; - -import org.apache.metamodel.elasticsearch.common.ElasticSearchMetaData; -import org.apache.metamodel.elasticsearch.common.ElasticSearchMetaDataParser; -import org.apache.metamodel.schema.ColumnType; -import org.elasticsearch.common.collect.MapBuilder; - -public class ElasticSearchMetaDataParserTest extends TestCase { - - public void testParseMetadataInfo() throws Exception { - Map<String, Object> metadata = new LinkedHashMap<>(); - metadata.put("message", MapBuilder.newMapBuilder().put("type", "long").immutableMap()); - metadata.put("postDate", MapBuilder.newMapBuilder().put("type", "date").put("format", "dateOptionalTime").immutableMap()); - metadata.put("anotherDate", MapBuilder.newMapBuilder().put("type", "date").put("format", "dateOptionalTime").immutableMap()); - metadata.put("user", MapBuilder.newMapBuilder().put("type", "string").immutableMap()); - metadata.put("critical", MapBuilder.newMapBuilder().put("type", "boolean").immutableMap()); - metadata.put("income", MapBuilder.newMapBuilder().put("type", "double").immutableMap()); - metadata.put("untypedthingie", MapBuilder.newMapBuilder().put("foo", "bar").immutableMap()); - - ElasticSearchMetaData metaData = ElasticSearchMetaDataParser.parse(metadata); - String[] columnNames = metaData.getColumnNames(); - ColumnType[] columnTypes = metaData.getColumnTypes(); - - assertTrue(columnNames.length == 8); - assertEquals(columnNames[0], "_id"); - assertEquals(columnNames[1], "message"); - assertEquals(columnNames[2], "postDate"); - assertEquals(columnNames[3], "anotherDate"); - assertEquals(columnNames[4], "user"); - assertEquals(columnNames[5], "critical"); - assertEquals(columnNames[6], "income"); - assertEquals(columnNames[7], "untypedthingie"); - - assertTrue(columnTypes.length == 8); - assertEquals(columnTypes[0], ColumnType.STRING); - assertEquals(columnTypes[1], ColumnType.BIGINT); - assertEquals(columnTypes[2], ColumnType.DATE); - assertEquals(columnTypes[3], ColumnType.DATE); - assertEquals(columnTypes[4], ColumnType.STRING); - assertEquals(columnTypes[5], ColumnType.BOOLEAN); - assertEquals(columnTypes[6], ColumnType.DOUBLE); - assertEquals(columnTypes[7], ColumnType.STRING); - } -}
