You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/02/24 23:07:32 UTC
[13/20] incubator-geode git commit: GEODE-448: Minor changes due to
subproject renaming
GEODE-448: Minor changes due to subproject renaming
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9e8543ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9e8543ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9e8543ab
Branch: refs/heads/feature/GEODE-953
Commit: 9e8543ab2e6e72d0a6aadebe2616128054b5399b
Parents: 177f12c
Author: Jens Deppe <jd...@pivotal.io>
Authored: Tue Feb 23 14:44:05 2016 -0800
Committer: Jens Deppe <jd...@pivotal.io>
Committed: Tue Feb 23 14:45:31 2016 -0800
----------------------------------------------------------------------
.../tools/pulse/tests/PulseAutomatedTest.java | 18 ++++--------------
.../gemfire/tools/pulse/tests/PulseBaseTest.java | 6 +++++-
.../gemfire/tools/pulse/tests/PulseTest.java | 4 ++--
3 files changed, 11 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9e8543ab/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTest.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTest.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTest.java
index 848cf62..1ecb7d6 100644
--- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTest.java
+++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseAutomatedTest.java
@@ -30,25 +30,15 @@
package com.vmware.gemfire.tools.pulse.tests;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.TimeUnit;
-import java.util.TreeMap;
-
import junit.framework.Assert;
-
import org.junit.Ignore;
import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.Actions;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.List;
public class PulseAutomatedTest extends PulseBaseTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9e8543ab/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseBaseTest.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseBaseTest.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseBaseTest.java
index f82b10f..9f5523a 100644
--- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseBaseTest.java
+++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseBaseTest.java
@@ -26,7 +26,11 @@ import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
public class PulseBaseTest extends PulseTest {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9e8543ab/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTest.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTest.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTest.java
index 3bf7ecc..c5ece20 100644
--- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTest.java
+++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/PulseTest.java
@@ -152,7 +152,7 @@ public class PulseTest {
pulseURL = "http://" + host + ":" + port + context;
- Thread.sleep(5000); // wait till tomcat settles down
+ Thread.sleep(5000); // wait till the container settles down
driver = new FirefoxDriver();
driver.manage().window().maximize();
@@ -190,7 +190,7 @@ public class PulseTest {
Properties properties = new Properties();
properties.load(inputStream);
String version = properties.getProperty("Product-Version");
- warPath = "gemfire-pulse-" + version + ".war";
+ warPath = "geode-pulse-" + version + ".war";
String propFilePath = classLoader.getResource("GemFireVersion.properties").getPath();
warPath = propFilePath.substring(0, propFilePath.indexOf("generated-resources")) + "libs/" + warPath;
return warPath;