container: Remove internal BrowserView.

Use RedDeer's WebBrowserView instead.

Change-Id: I178294e70cbc96cfd237c77b1abd6e03f1b07a17
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/111360
Tested-by: Hudson CI

8 files changed, 19 insertions, 233 deletions

diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ExposePortTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ExposePortTest.java
index 9021b65135..3dda6b628a 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ExposePortTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ExposePortTest.java
@@ -16,11 +16,11 @@ import java.io.IOException;
 import org.eclipse.linuxtools.docker.integration.tests.image.AbstractImageBotTest;
 import org.eclipse.linuxtools.docker.integration.tests.mock.MockUtils;
 import org.eclipse.linuxtools.docker.reddeer.core.ui.wizards.ImageRunSelectionPage;
-import org.eclipse.linuxtools.docker.reddeer.ui.BrowserView;
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerImagesTab;
 import org.eclipse.linuxtools.docker.reddeer.utils.BrowserContentsCheck;
 import org.eclipse.reddeer.common.wait.WaitWhile;
 import org.eclipse.reddeer.eclipse.condition.ConsoleHasNoChange;
+import org.eclipse.reddeer.eclipse.ui.browser.WebBrowserView;
 import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Test;
@@ -48,7 +48,7 @@ public class ExposePortTest extends AbstractImageBotTest {
 	}
 
 	private void assertPortIsAccessible(String exposedPort) {
-		BrowserView browserView = new BrowserView();
+		WebBrowserView browserView = new WebBrowserView();
 		browserView.open();
 		String url = createURL(":" + exposedPort);
 		if (!mockitoIsUsed()) {
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VolumeMountTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VolumeMountTest.java
index 5570368d24..fc451935fc 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VolumeMountTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VolumeMountTest.java
@@ -22,7 +22,6 @@ import org.eclipse.linuxtools.docker.integration.tests.mock.MockUtils;
 import org.eclipse.linuxtools.docker.reddeer.condition.ContainerIsDeployedCondition;
 import org.eclipse.linuxtools.docker.reddeer.core.ui.wizards.ImageRunResourceVolumesVariablesPage;
 import org.eclipse.linuxtools.docker.reddeer.core.ui.wizards.ImageRunSelectionPage;
-import org.eclipse.linuxtools.docker.reddeer.ui.BrowserView;
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerImagesTab;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockContainerFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockContainerInfoFactory;
@@ -32,6 +31,7 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
 import org.eclipse.reddeer.common.wait.WaitUntil;
 import org.eclipse.reddeer.common.wait.WaitWhile;
 import org.eclipse.reddeer.eclipse.condition.ConsoleHasNoChange;
+import org.eclipse.reddeer.eclipse.ui.browser.WebBrowserView;
 import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Before;
@@ -92,7 +92,7 @@ public class VolumeMountTest extends AbstractImageBotTest {
 	private String getIndexPageContent() throws IOException {
 		String containerIP = getContainerIP(CONTAINER_NAME);
 		String url = "http://" + containerIP + ":" + HOST_PORT + "/" + INDEX_PAGE;
-		BrowserView browserView = new BrowserView();
+		WebBrowserView browserView = new WebBrowserView();
 		browserView.open();
 		if (mockitoIsUsed()) {
 			browserView = MockUtils.getBrowserView(INDEX_PAGE_PATH, getResourceAsString(INDEX_PAGE_PATH));
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockBrowserView.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockBrowserView.java
index ebb625dbc2..1472d0a256 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockBrowserView.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockBrowserView.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.linuxtools.docker.integration.tests.mock;
 
-import org.eclipse.linuxtools.docker.reddeer.ui.BrowserView;
+import org.eclipse.reddeer.eclipse.ui.browser.WebBrowserView;
 import org.mockito.Mockito;
 
 public class MockBrowserView {
@@ -47,8 +47,8 @@ public class MockBrowserView {
 			return this;
 		}
 
-		public BrowserView build() {
-			final BrowserView browserView = Mockito.mock(BrowserView.class);
+		public WebBrowserView build() {
+			final WebBrowserView browserView = Mockito.mock(WebBrowserView.class);
 			Mockito.when(browserView.getPageURL()).thenReturn(this.url);
 			Mockito.when(browserView.getText()).thenReturn(this.text);
 			return browserView;
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockUtils.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockUtils.java
index dd2493f5e2..684eafcd3b 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockUtils.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockUtils.java
@@ -16,7 +16,6 @@ import java.io.File;
 import java.io.IOException;
 
 import org.eclipse.linuxtools.docker.core.IDockerConnection;
-import org.eclipse.linuxtools.docker.reddeer.ui.BrowserView;
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerExplorerView;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockContainerFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockContainerInfoFactory;
@@ -24,6 +23,7 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerClientFacto
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionSettingsFinder;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
+import org.eclipse.reddeer.eclipse.ui.browser.WebBrowserView;
 import org.eclipse.reddeer.eclipse.ui.console.ConsoleView;
 
 import com.spotify.docker.client.DockerClient;
@@ -84,7 +84,7 @@ public class MockUtils {
 				.from(connectionName, client).withDefaultTCPConnectionSettings();
 		MockDockerConnectionManager.configureConnectionManager(dockerConnection);
 	}
-	
+
 	public static void runContainer(String connectionName, String imageName, String imageTag, String containerName, ContainerInfo containerInfo) {
 		final DockerClient client = MockDockerClientFactory
 				.container(MockContainerFactory.name(containerName).status("Stopped").build(), MockContainerInfoFactory.link("alpine").volume("resources/test-volumes/index.html").id("TestTestTestTestTest")
@@ -100,8 +100,8 @@ public class MockUtils {
 		return cv;
 	}
 
-	public static BrowserView getBrowserView(String url, String text) {
-		final BrowserView browser = MockBrowserView.openPageURL(url).setText(text).build();
+	public static WebBrowserView getBrowserView(String url, String text) {
+		final WebBrowserView browser = MockBrowserView.openPageURL(url).setText(text).build();
 		return browser;
 	}
 
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ComposeTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ComposeTest.java
index a487498704..a048512d58 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ComposeTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ComposeTest.java
@@ -25,7 +25,6 @@ import org.eclipse.linuxtools.docker.core.DockerException;
 import org.eclipse.linuxtools.docker.integration.tests.image.AbstractImageBotTest;
 import org.eclipse.linuxtools.docker.integration.tests.mock.MockUtils;
 import org.eclipse.linuxtools.docker.reddeer.preferences.DockerComposePreferencePage;
-import org.eclipse.linuxtools.docker.reddeer.ui.BrowserView;
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerImagesTab;
 import org.eclipse.linuxtools.docker.reddeer.ui.PackageExplorer;
 import org.eclipse.linuxtools.docker.reddeer.utils.BrowserContentsCheck;
@@ -38,6 +37,7 @@ import org.eclipse.reddeer.common.wait.WaitWhile;
 import org.eclipse.reddeer.core.exception.CoreLayerException;
 import org.eclipse.reddeer.core.matcher.WithTextMatcher;
 import org.eclipse.reddeer.eclipse.condition.ConsoleHasNoChange;
+import org.eclipse.reddeer.eclipse.ui.browser.WebBrowserView;
 import org.eclipse.reddeer.jface.preference.PreferenceDialog;
 import org.eclipse.reddeer.swt.impl.button.FinishButton;
 import org.eclipse.reddeer.swt.impl.button.OkButton;
@@ -55,7 +55,7 @@ import org.mockito.Matchers;
 import org.mockito.Mockito;
 
 /**
- * 
+ *
  * @author jkopriva@redhat.com
  *
  */
@@ -80,7 +80,7 @@ public class ComposeTest extends AbstractImageBotTest {
 			assertTrue(
 					"Please provide -D" + SYSPROP_DOCKER_COMPOSE_PATH
 					+ "=<path to docker-compose binary> in your launch parameters.",
-					!StringUtils.isBlank(this.dockerComposePath));	
+					!StringUtils.isBlank(this.dockerComposePath));
 		}
 		deleteAllConnections();
 		if (mockitoIsUsed()) {
@@ -126,7 +126,7 @@ public class ComposeTest extends AbstractImageBotTest {
 		runDockerCompose(PROJECT_TEST_COMPOSE, FILE_DOCKER_COMPOSE);
 
 		// Check if application is running
-		BrowserView browserView = new BrowserView();
+		WebBrowserView browserView = new WebBrowserView();
 		browserView.open();
 		//Skip browser contents check, if mockito is used
 		if (!mockitoIsUsed()) {
@@ -196,6 +196,7 @@ public class ComposeTest extends AbstractImageBotTest {
 		});
 	}
 
+	@Override
 	@After
 	public void after() {
 		deleteImageContainerAfter("testcompose_web_1", "testcompose_redis_1", "testcompose_web", "test_compose",
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/BrowserHasURL.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/BrowserHasURL.java
deleted file mode 100644
index 077817e636..0000000000
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/BrowserHasURL.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2016 Red Hat, Inc. 
- * Distributed under license by Red Hat, Inc. All rights reserved. 
- * This program is made available under the terms of the 
- * Eclipse Public License v1.0 which accompanies this distribution, 
- * and is available at http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- * Red Hat, Inc. - initial API and implementation 
- ******************************************************************************/ 
-package org.eclipse.linuxtools.docker.reddeer.ui;
-
-import org.hamcrest.Matcher;
-import org.eclipse.reddeer.common.condition.AbstractWaitCondition;
-import org.eclipse.reddeer.eclipse.ui.browser.BrowserEditor;
-
-/**
- * Wait condition which returns true if a given browser has the specified URL.
- */
-public class BrowserHasURL extends AbstractWaitCondition {
-
-	private BrowserView browser;
-	private BrowserEditor browserEditor;
-	private String expectedURL;
-	private Matcher<String> expectedURLMatcher;
-	
-	/**
-	 * Construct a condition with a given browser view and expected URL.
-	 * 
-	 * @param browser Browser view
-	 * @param expectedURL Expected URL
-	 */
-	public BrowserHasURL(BrowserView browser,String expectedURL){
-		this.browser = browser;
-		this.expectedURL = expectedURL;
-	}
-	
-	/**
-	 * Construct a condition with a given browser view and URL matcher.
-	 * 
-	 * @param browser Browser view
-	 * @param expectedURLMatcher URL matcher
-	 */
-	public BrowserHasURL(BrowserView browser,Matcher<String> expectedURLMatcher){
-		this.browser = browser;
-		this.expectedURLMatcher = expectedURLMatcher;
-	}
-	
-	/**
-	 * Construct a condition with a given browser editor and expected URL.
-	 * 
-	 * @param browser Browser editor
-	 * @param expectedURL Expected URL
-	 */
-	public BrowserHasURL(BrowserEditor browser,String expectedURL){
-		this.browserEditor = browser;
-		this.expectedURL = expectedURL;
-	}
-	
-	/**
-	 * Construct a condition with a given browser editor and URL matcher.
-	 *
-	 * @param browser Browser editor
-	 * @param expectedURLMatcher the expected url matcher
-	 */
-	public BrowserHasURL(BrowserEditor browser,Matcher<String> expectedURLMatcher){
-		this.browserEditor = browser;
-		this.expectedURLMatcher = expectedURLMatcher;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.reddeer.common.condition.WaitCondition#test()
-	 */
-	@Override
-	public boolean test() {
-		if (expectedURLMatcher != null){
-			if(browser != null){
-				return expectedURLMatcher.matches(browser.getPageURL());
-			} else {
-				return expectedURLMatcher.matches(browserEditor.getPageURL());
-			}
-		} else {
-			if(browser != null){
-				return browser.getPageURL().equals(expectedURL);
-			} else {
-				return browserEditor.getPageURL().equals(expectedURL);
-			}
-		}
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.reddeer.common.condition.AbstractWaitCondition#description()
-	 */
-	@Override
-	public String description() {
-		if(expectedURLMatcher != null){
-			return "browser is pointed to URL: "+expectedURLMatcher.toString();
-		}
-		return "browser is pointed to URL: "+expectedURL;
-	}
-	}
\ No newline at end of file
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/BrowserView.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/BrowserView.java
deleted file mode 100644
index 9aa7214ac8..0000000000
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/BrowserView.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2016 Red Hat, Inc. 
- * Distributed under license by Red Hat, Inc. All rights reserved. 
- * This program is made available under the terms of the 
- * Eclipse Public License v1.0 which accompanies this distribution, 
- * and is available at http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- * Red Hat, Inc. - initial API and implementation 
- ******************************************************************************/ 
-package org.eclipse.linuxtools.docker.reddeer.ui;
-
-import org.eclipse.reddeer.common.wait.TimePeriod;
-import org.eclipse.reddeer.common.wait.WaitUntil;
-import org.eclipse.reddeer.common.wait.WaitWhile;
-import org.eclipse.reddeer.swt.api.Browser;
-import org.eclipse.reddeer.swt.condition.PageIsLoaded;
-import org.eclipse.reddeer.swt.impl.browser.InternalBrowser;
-
-/**
- * Represents Internal Browser view in Eclipse
- * 
- * @author psuchy
- * 
- */
-public class BrowserView extends WorkbenchView {
-
-	protected Browser browser;
-	protected static final TimePeriod TIMEOUT = TimePeriod.LONG;
-
-	/**
-	 * Constructor of BrowserView Class
-	 * Check if Internal Web Browser view exists.
-	 *
-	 * @see WorkbenchView
-	 */
-	public BrowserView() {
-		super("Internal Web Browser");
-	}
-	
-	/**
-	 * Opens Internal Web Browser view.
-	 */
-	@Override
-	public void open() {
-		if (browser == null){
-			super.open();
-			browser = new InternalBrowser();
-		}
-	};
-
-	/**
-	 * Opens page with given URL in browser.
-	 *
-	 * @param url the url
-	 */
-	public void openPageURL(String url) {
-		activate();
-		browser.setURL(url);
-		new WaitUntil(new PageIsLoaded(browser), TIMEOUT);
-	}
-
-	/**
-	 * Refreshes currently opened page in browser.
-	 */
-	public void refreshPage() {
-		activate();
-		browser.setURL(browser.getURL());
-		new WaitUntil(new PageIsLoaded(browser), TIMEOUT);
-	}
-
-	/**
-	 * Go to the previous page in browser.
-	 */
-	public void back() {
-		activate();
-		String prevUrl = browser.getURL();
-		browser.back();
-		new WaitWhile(new BrowserHasURL(this, prevUrl), TIMEOUT);
-		new WaitUntil(new PageIsLoaded(browser), TIMEOUT);
-	}
-
-	/**
-	 * Go to the next page in browser.
-	 */
-	public void forward() {
-		activate();
-		String prevUrl = browser.getURL();
-		browser.forward();
-		new WaitWhile(new BrowserHasURL(this, prevUrl), TIMEOUT);
-		new WaitUntil(new PageIsLoaded(browser), TIMEOUT);
-	}
-
-	/**
-	 * Gets URL of the currently opened page.
-	 *
-	 * @return String URL of the current page
-	 */
-	public String getPageURL() {
-		activate();
-		return browser.getURL();
-	}
-	
-	/**
-	 * Gets Text of the currently opened page.
-	 *
-	 * @return String Text of the current page
-	 */
-	public String getText() {
-		activate();
-		return browser.getText();
-	}
-}
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/utils/BrowserContentsCheck.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/utils/BrowserContentsCheck.java
index d79b5a57cd..11dd322016 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/utils/BrowserContentsCheck.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/utils/BrowserContentsCheck.java
@@ -13,14 +13,14 @@ package org.eclipse.linuxtools.docker.reddeer.utils;
 
 import static org.junit.Assert.assertFalse;
 
-import org.eclipse.linuxtools.docker.reddeer.ui.BrowserView;
 import org.eclipse.reddeer.common.condition.AbstractWaitCondition;
 import org.eclipse.reddeer.common.matcher.RegexMatcher;
 import org.eclipse.reddeer.common.wait.WaitWhile;
-import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.eclipse.reddeer.core.exception.CoreLayerException;
 import org.eclipse.reddeer.eclipse.ui.browser.BrowserEditor;
+import org.eclipse.reddeer.eclipse.ui.browser.WebBrowserView;
 import org.eclipse.reddeer.eclipse.ui.console.ConsoleView;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 
 /**
  * 
@@ -71,7 +71,7 @@ public class BrowserContentsCheck {
 	 * @param browserView
 	 * @param url
 	 */
-	public static void checkBrowserForErrorPage(BrowserView browserView, String url) {
+	public static void checkBrowserForErrorPage(WebBrowserView browserView, String url) {
 		// Try to refresh page if it is not loaded.
 		if (browserView.getText().contains("Unable") || browserView.getText().contains("404")) {
 			if (url == null) {