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 2014/11/04 11:02:50 UTC
git commit: Fixed unittest failure when no cassandra port specified
Repository: incubator-metamodel
Updated Branches:
refs/heads/master 23c8f1146 -> 974fe2eaa
Fixed unittest failure when no cassandra port specified
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/974fe2ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/974fe2ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/974fe2ea
Branch: refs/heads/master
Commit: 974fe2eaae556f3d71cacafeaa9af4baf05ce8cc
Parents: 23c8f11
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Nov 4 11:01:28 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Nov 4 11:01:28 2014 +0100
----------------------------------------------------------------------
.../org/apache/metamodel/cassandra/CassandraTestCase.java | 10 ++++++----
.../elasticsearch/ElasticSearchDataContextTest.java | 2 --
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/974fe2ea/cassandra/src/test/java/org/apache/metamodel/cassandra/CassandraTestCase.java
----------------------------------------------------------------------
diff --git a/cassandra/src/test/java/org/apache/metamodel/cassandra/CassandraTestCase.java b/cassandra/src/test/java/org/apache/metamodel/cassandra/CassandraTestCase.java
index 25328d7..18b5fb3 100644
--- a/cassandra/src/test/java/org/apache/metamodel/cassandra/CassandraTestCase.java
+++ b/cassandra/src/test/java/org/apache/metamodel/cassandra/CassandraTestCase.java
@@ -38,8 +38,8 @@ public abstract class CassandraTestCase extends TestCase {
protected void setUp() throws Exception {
super.setUp();
- Properties properties = new Properties();
- File file = new File(getPropertyFilePath());
+ final Properties properties = new Properties();
+ final File file = new File(getPropertyFilePath());
if (file.exists()) {
properties.load(new FileReader(file));
_hostname = properties.getProperty("cassandra.hostname");
@@ -49,9 +49,11 @@ public abstract class CassandraTestCase extends TestCase {
_keySpaceName = DEFAULT_TEST_KEYSPACE_NAME;
}
- _port = new Integer(properties.getProperty("cassandra.port"));
- if (_port == null) {
+ final String portString = properties.getProperty("cassandra.port");
+ if (portString == null || portString.isEmpty()) {
_port = DEFAULT_TEST_PORT;
+ } else {
+ _port = new Integer(portString);
}
_configured = (_hostname != null && !_hostname.isEmpty());
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/974fe2ea/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 20d8a13..449490b 100644
--- a/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchDataContextTest.java
+++ b/elasticsearch/src/test/java/org/apache/metamodel/elasticsearch/ElasticSearchDataContextTest.java
@@ -78,8 +78,6 @@ public class ElasticSearchDataContextTest {
indexOneTweeterDocumentPerIndex(indexType2, 1);
indexBulkDocuments(indexName, bulkIndexType, 10);
- // TODO: Find a better way than sleep to ensure data is in sync.
-
// The refresh API allows to explicitly refresh one or more index,
// making all operations performed since the last refresh available for search
client.admin().indices().prepareRefresh().execute().actionGet();