Bug 464474 - move UA browser tests to o.e.ui.tests.browserI20180227-2000I20180226-2000I20180225-2000I20180224-1500I20180223-2000I20180222-2000I20180221-2000I20180220-2000I20180219-2000I20180218-2000I20180217-1500I20180216-2000

Remove tests from ua.tests.

Change-Id: I46d1c2053b55e3253397da90c8c45a5167b59f1f
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

7 files changed, 3 insertions, 275 deletions

diff --git a/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/org.eclipse.ua.tests/META-INF/MANIFEST.MF
index e8b1dc5d1..16e72e6ec 100644
--- a/org.eclipse.ua.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.ua.tests/META-INF/MANIFEST.MF
@@ -29,9 +29,6 @@ Import-Package: javax.servlet;version="3.1.0",
  javax.servlet.http;version="3.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.ua.tests,
- org.eclipse.ua.tests.browser,
- org.eclipse.ua.tests.browser.external,
- org.eclipse.ua.tests.browser.other,
  org.eclipse.ua.tests.browser.servlet,
  org.eclipse.ua.tests.cheatsheet,
  org.eclipse.ua.tests.cheatsheet.composite,
@@ -63,7 +60,6 @@ Export-Package: org.eclipse.ua.tests,
  org.eclipse.ua.tests.intro.performance,
  org.eclipse.ua.tests.intro.util,
  org.eclipse.ua.tests.plugin,
- org.eclipse.ua.tests.util,
- org.eclipse.ua.tests.browser
+ org.eclipse.ua.tests.util
 Eclipse-BundleShape: dir
 Automatic-Module-Name: org.eclipse.ua.tests
diff --git a/org.eclipse.ua.tests/base/org/eclipse/ua/tests/AllTests.java b/org.eclipse.ua.tests/base/org/eclipse/ua/tests/AllTests.java
index 7f7de2fae..ce2ef3c4b 100644
--- a/org.eclipse.ua.tests/base/org/eclipse/ua/tests/AllTests.java
+++ b/org.eclipse.ua.tests/base/org/eclipse/ua/tests/AllTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2016 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.ua.tests;
 
-import org.eclipse.ua.tests.browser.AllBrowserTests;
 import org.eclipse.ua.tests.cheatsheet.AllCheatSheetTests;
 import org.eclipse.ua.tests.help.AllHelpTests;
 import org.eclipse.ua.tests.intro.AllIntroTests;
@@ -21,9 +20,6 @@ import org.junit.runners.Suite;
  * Tests all user assistance functionality (automated).
  */
 @RunWith(Suite.class)
-@Suite.SuiteClasses({AllCheatSheetTests.class,
-AllIntroTests.class,
-AllHelpTests.class,
-AllBrowserTests.class})
+@Suite.SuiteClasses({ AllCheatSheetTests.class, AllIntroTests.class, AllHelpTests.class })
 public class AllTests {
 }
diff --git a/org.eclipse.ua.tests/browser/org/eclipse/ua/tests/browser/AllBrowserTests.java b/org.eclipse.ua.tests/browser/org/eclipse/ua/tests/browser/AllBrowserTests.java
deleted file mode 100644
index ae99d5929..000000000
--- a/org.eclipse.ua.tests/browser/org/eclipse/ua/tests/browser/AllBrowserTests.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ua.tests.browser;
-
-import org.eclipse.ua.tests.browser.external.AllExternalBrowserTests;
-import org.eclipse.ua.tests.browser.other.AllOtherBrowserTests;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-/*
- * Tests all cheat sheet functionality (automated).
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-	AllExternalBrowserTests.class,
-	AllOtherBrowserTests.class
-})
-public class AllBrowserTests {
-}
diff --git a/org.eclipse.ua.tests/browser/org/eclipse/ua/tests/browser/external/AllExternalBrowserTests.java b/org.eclipse.ua.tests/browser/org/eclipse/ua/tests/browser/external/AllExternalBrowserTests.java
deleted file mode 100644
index c490d346e..000000000
--- a/org.eclipse.ua.tests/browser/org/eclipse/ua/tests/browser/external/AllExternalBrowserTests.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ua.tests.browser.external;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-	TestParameterSubstitution.class
-})
-public class AllExternalBrowserTests {
-}
diff --git a/org.eclipse.ua.tests/browser/org/eclipse/ua/tests/browser/external/TestParameterSubstitution.java b/org.eclipse.ua.tests/browser/org/eclipse/ua/tests/browser/external/TestParameterSubstitution.java
deleted file mode 100644
index 2772e4462..000000000
--- a/org.eclipse.ua.tests/browser/org/eclipse/ua/tests/browser/external/TestParameterSubstitution.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ua.tests.browser.external;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
-import org.eclipse.ui.internal.browser.WebBrowserUtil;
-import org.junit.Test;
-
-public class TestParameterSubstitution {
-
-	private static final String URL = "http://127.0.0.1:3873/help/index.jsp";
-
-	@SuppressWarnings("deprecation")
-	@Test
-	public void testNullParameters() {
-		assertEquals(URL, WebBrowserUtil.createParameterString(null, URL));
-	}
-
-	@SuppressWarnings("deprecation")
-	@Test
-	public void testEmptyParameters() {
-		assertEquals(URL, WebBrowserUtil.createParameterString("", URL));
-	}
-
-	@SuppressWarnings("deprecation")
-	@Test
-	public void testNullURL() {
-		assertEquals("", WebBrowserUtil.createParameterString("", null));
-	}
-
-	@SuppressWarnings("deprecation")
-	@Test
-	public void testNoSubstitution() {
-		assertEquals("-console " + URL, WebBrowserUtil.createParameterString("-console", URL));
-	}
-
-	@SuppressWarnings("deprecation")
-	@Test
-	public void testSubstitution() {
-		assertEquals("-url " + URL + " -console", WebBrowserUtil.createParameterString("-url %URL% -console", URL));
-	}
-
-	@Test
-	public void testArrayNullParameters() {
-		assertArrayEquals(new String[] { URL }, WebBrowserUtil.createParameterArray(null, URL));
-	}
-
-	@Test
-	public void testArrayEmptyParameters() {
-		assertArrayEquals(new String[] { URL }, WebBrowserUtil.createParameterArray("", URL));
-	}
-
-	@Test
-	public void testArrayNullURL() {
-		assertArrayEquals(new String[0], WebBrowserUtil.createParameterArray("", null));
-	}
-
-	@Test
-	public void testArrayNoSubstitution() {
-		assertArrayEquals(new String[] { "-console", URL }, WebBrowserUtil.createParameterArray("-console", URL));
-	}
-
-	@Test
-	public void testArraySubstitution() {
-		assertArrayEquals(new String[] { "-url", URL, "-console"}, WebBrowserUtil.createParameterArray("-url %URL% -console", URL));
-	}
-
-}
diff --git a/org.eclipse.ua.tests/browser/org/eclipse/ua/tests/browser/other/AllOtherBrowserTests.java b/org.eclipse.ua.tests/browser/org/eclipse/ua/tests/browser/other/AllOtherBrowserTests.java
deleted file mode 100644
index c5f6b1040..000000000
--- a/org.eclipse.ua.tests/browser/org/eclipse/ua/tests/browser/other/AllOtherBrowserTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ua.tests.browser.other;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-	TestInput.class
-})
-public class AllOtherBrowserTests {
-
-}
diff --git a/org.eclipse.ua.tests/browser/org/eclipse/ua/tests/browser/other/TestInput.java b/org.eclipse.ua.tests/browser/org/eclipse/ua/tests/browser/other/TestInput.java
deleted file mode 100644
index 62b16184f..000000000
--- a/org.eclipse.ua.tests/browser/org/eclipse/ua/tests/browser/other/TestInput.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2016 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are 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:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ua.tests.browser.other;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.ui.internal.browser.WebBrowserEditorInput;
-import org.junit.Test;
-
-public class TestInput {
-
-	private final String URL1 = "http://www.eclipse.org";
-	private final String URL2 = "http://bugs.eclipse.org";
-	private static final String ID1 = "browser.id1";
-	private static final String ID2 = "browser.id2";
-
-	@Test
-	public void testCompareWithNull() throws MalformedURLException {
-		WebBrowserEditorInput input = new WebBrowserEditorInput(new URL(URL1),
-				0, ID1);
-		assertFalse(input.equals(null));
-	}
-
-	@Test
-	public void testCompareWithNullURL() throws MalformedURLException {
-		WebBrowserEditorInput input = new WebBrowserEditorInput(new URL(URL1),
-				0, ID1);
-		WebBrowserEditorInput input2 = new WebBrowserEditorInput(null,
-				0, ID1);
-		assertFalse(input.equals(input2));
-		assertFalse(input2.equals(input));
-	}
-
-	@Test
-	public void testCompareWithSelf() throws MalformedURLException {
-		WebBrowserEditorInput input = new WebBrowserEditorInput(new URL(URL1),
-				0, ID1);
-		assertTrue(input.equals(input));
-	}
-
-	@Test
-	public void testCompareWithSimilar() throws MalformedURLException {
-		WebBrowserEditorInput input = new WebBrowserEditorInput(new URL(URL1),
-				0, ID1);
-		WebBrowserEditorInput input2 = new WebBrowserEditorInput(new URL(URL1),
-						0, ID1);
-		assertTrue(input.equals(input2));
-		assertTrue(input.hashCode() == input2.hashCode());
-	}
-
-	@Test
-	public void testCompareWithDifferentUrl() throws MalformedURLException {
-		WebBrowserEditorInput input = new WebBrowserEditorInput(new URL(URL1),
-				0, ID1);
-		WebBrowserEditorInput input2 = new WebBrowserEditorInput(new URL(URL2),
-						0, ID1);
-		assertFalse(input.equals(input2));
-	}
-
-	@Test
-	public void testCompareWithDifferentId() throws MalformedURLException {
-		WebBrowserEditorInput input = new WebBrowserEditorInput(new URL(URL1),
-				0, ID1);
-		WebBrowserEditorInput input2 = new WebBrowserEditorInput(new URL(URL1),
-						0, ID2);
-		assertFalse(input.equals(input2));
-	}
-
-	@Test
-	public void testCompareWithDifferentStyle() throws MalformedURLException {
-		WebBrowserEditorInput input = new WebBrowserEditorInput(new URL(URL1),
-				0, ID1);
-		WebBrowserEditorInput input2 = new WebBrowserEditorInput(new URL(URL1),
-						1, ID1);
-		assertTrue(input.equals(input2));
-		assertTrue(input.hashCode() == input2.hashCode());
-	}
-
-	@Test
-	public void testCompareWithStatusbarVisible() throws MalformedURLException {
-		WebBrowserEditorInput input = new WebBrowserEditorInput(new URL(URL1),
-				0, ID1);
-		WebBrowserEditorInput input2 = new WebBrowserEditorInput(new URL(URL1),
-				IWorkbenchBrowserSupport.STATUS, ID1);
-		assertFalse(input.equals(input2));
-	}
-
-	@Test
-	public void testHashWithNullURL() {
-		WebBrowserEditorInput input = new WebBrowserEditorInput(null,0, ID1);
-		input.hashCode();  // Fails if exception thrown
-	}
-
-	@Test
-	public void testHashWithNullID() throws MalformedURLException {
-		WebBrowserEditorInput input = new WebBrowserEditorInput(new URL(URL1),0, null);
-		input.hashCode();  // Fails if exception thrown
-	}
-
-}