NEW - bug 247911: [web connector] move web tests into separate plug-in

https://bugs.eclipse.org/bugs/show_bug.cgi?id=247911

5 files changed, 1 insertions, 225 deletions

diff --git a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
index 595faa53e..711910039 100644
--- a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
@@ -19,7 +19,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.mylyn.monitor.ui,
  org.eclipse.ui.forms,
  org.eclipse.mylyn.resources.tests,
- org.eclipse.mylyn.web.tasks,
  org.eclipse.mylyn.monitor.core,
  org.eclipse.mylyn.commons.net,
  org.eclipse.jface.text,
@@ -34,6 +33,5 @@ Export-Package: org.eclipse.mylyn.tasks.tests;x-internal:=true,
  org.eclipse.mylyn.tasks.tests.connector;x-internal:=true,
  org.eclipse.mylyn.tasks.tests.data;x-internal:=true,
  org.eclipse.mylyn.tasks.tests.performance;x-internal:=true,
- org.eclipse.mylyn.tasks.tests.util,
- org.eclipse.mylyn.tasks.tests.web;x-internal:=true
+ org.eclipse.mylyn.tasks.tests.util
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AllTasksTests.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AllTasksTests.java
index bf5b1c4a1..b3a12c93c 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AllTasksTests.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/AllTasksTests.java
@@ -78,11 +78,6 @@ public class AllTasksTests {
 		//suite.addTestSuite(QueryExportImportTest.class);
 		//suite.addTestSuite(BackgroundSaveTest.class);
 
-		// web connector tests
-		suite.addTestSuite(org.eclipse.mylyn.tasks.tests.web.NamedPatternTest.class);
-		suite.addTestSuite(org.eclipse.mylyn.tasks.tests.web.HtmlDecodeEntityTest.class);
-		suite.addTestSuite(org.eclipse.mylyn.tasks.tests.web.WebRepositoryTest.class);
-
 		return suite;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/web/HtmlDecodeEntityTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/web/HtmlDecodeEntityTest.java
deleted file mode 100644
index 50336a9cb..000000000
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/web/HtmlDecodeEntityTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 George Lindholm 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:
- *     George Lindholm - initial API and implementation
- *     Tasktop Technologies - improvements
- *******************************************************************************/
-
-package org.eclipse.mylyn.tasks.tests.web;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.internal.web.tasks.WebRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.data.TaskMapper;
-import org.eclipse.mylyn.tasks.tests.util.TestTaskDataCollector;
-
-/**
- * @author George Lindholm
- * @author Steffen Pingel
- */
-public class HtmlDecodeEntityTest extends TestCase {
-
-	private final IProgressMonitor monitor = new NullProgressMonitor();
-
-	private final TaskRepository repository = new TaskRepository("localhost", "file:///tmp/a");
-
-	private final TestTaskDataCollector collector = new TestTaskDataCollector();
-
-	public void testEntities() {
-		assertQuery("1:A quote "", "(\\d+?):(.+)", "A quote \""); // Simple quote
-		assertQuery("2:A quote '"'", "(\\d+?):(.+)", "A quote '\"'"); // Simple quote
-		assertQuery("3:A quote "" doubled", "({Id}\\d+?):({Description}.+)", "A quote \"\" doubled"); // Double quotes
-		assertQuery("4:A quote &quot ;", "(\\d+?):(.+)", "A quote &quot ;"); // Bad entity syntax
-		assertQuery("5:A quote & quot;", "(\\d+?):(.+)", "A quote & quot;"); // Bad entity syntax
-		assertQuery("6:foo & boo", "(\\d+?):(.+)", "foo & boo"); // Non entity syntax
-		assertQuery("7:foo&boo poo", "(\\d+?):(.+)", "foo&boo poo"); // Non entity  syntax
-		assertQuery("8:foo&boo ;poo", "(\\d+?):(.+)", "foo&boo ;poo"); // Bad, non entity syntax
-		assertQuery("9:foo&boo;poo", "(\\d+?):(.+)", "foo&boo;poo"); // Invalid entity
-		assertQuery("10: ", "(\\d+?):(.+)", " "); // HTML decimal entity
-		assertQuery("11: ", "(\\d+?):(.+)", " "); // Hexadecimal entity
-	}
-
-	private void assertQuery(final String entity, final String regex, final String expected) {
-		collector.results.clear();
-		IStatus status = WebRepositoryConnector.performQuery(entity, regex, "", monitor, collector, repository);
-		assertEquals(Status.OK_STATUS, status);
-		assertEquals(expected, new TaskMapper(collector.results.get(0)).getSummary());
-	}
-
-}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/web/NamedPatternTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/web/NamedPatternTest.java
deleted file mode 100644
index b06c69ea2..000000000
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/web/NamedPatternTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 Eugene Kuleshov 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:
- *     Eugene Kuleshov - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.tasks.tests.web;
-
-import java.util.regex.Matcher;
-
-import junit.framework.TestCase;
-
-import org.eclipse.mylyn.internal.web.tasks.NamedPattern;
-
-/**
- * @author Eugene Kuleshov
- */
-public class NamedPatternTest extends TestCase {
-
-	public void testNamedGroups() {
-		NamedPattern p = new NamedPattern("({Hour}\\d\\d):({Minute}\\d\\d):({Second}\\d\\d)", 0);
-		assertEquals("(\\d\\d):(\\d\\d):(\\d\\d)", p.getPattern().pattern());
-		assertEquals(3, p.getGroups().size());
-		assertEquals("Hour", p.groupName(0));
-		assertEquals("Minute", p.groupName(1));
-		assertEquals("Second", p.groupName(2));
-
-		Matcher m = p.matcher("01:02:03");
-		assertTrue(m.find());
-		assertEquals("01", p.group("Hour", m));
-		assertEquals("02", p.group("Minute", m));
-		assertEquals("03", p.group("Second", m));
-	}
-
-	public void testUnnamedGroups() {
-		NamedPattern p = new NamedPattern("(\\d\\d):(\\d\\d):(\\d\\d)", 0);
-		assertEquals("(\\d\\d):(\\d\\d):(\\d\\d)", p.getPattern().pattern());
-		assertEquals(0, p.getGroups().size());
-
-		Matcher m = p.matcher("01:02:03");
-		assertTrue(m.find());
-		assertEquals("01", m.group(1));
-		assertEquals("02", m.group(2));
-		assertEquals("03", m.group(3));
-	}
-
-	public void testNestedGroups() {
-		NamedPattern p = new NamedPattern(":({a}:({b}:({c}foo)boo)doo)", 0);
-		assertEquals(":(:(:(foo)boo)doo)", p.getPattern().pattern());
-		assertEquals(3, p.getGroups().size());
-
-		Matcher m = p.matcher(":::fooboodoo");
-		assertTrue(m.find());
-		assertEquals("::fooboodoo", p.group("a", m));
-		assertEquals(":fooboo", p.group("b", m));
-		assertEquals("foo", p.group("c", m));
-	}
-
-}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/web/WebRepositoryTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/web/WebRepositoryTest.java
deleted file mode 100644
index 950357375..000000000
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/web/WebRepositoryTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2004, 2008 Tasktop Technologies 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:
- *     Tasktop Technologies - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.mylyn.tasks.tests.web;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
-import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.context.tests.support.TestUtil;
-import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
-import org.eclipse.mylyn.context.tests.support.TestUtil.PrivilegeLevel;
-import org.eclipse.mylyn.internal.web.tasks.WebRepositoryConnector;
-import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.ITaskMapping;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.tests.util.TestTaskDataCollector;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
-
-/**
- * @author Steffen Pingel
- */
-public class WebRepositoryTest extends TestCase {
-
-	private static final String TEST_URL_AUTHENTICATED = "http://mylyn.eclipse.org/authenticated";
-
-	private WebRepositoryConnector connector;
-
-	private TaskRepository taskRepository;
-
-	@Override
-	protected void setUp() throws Exception {
-		connector = (WebRepositoryConnector) TasksUi.getRepositoryConnector(WebRepositoryConnector.REPOSITORY_TYPE);
-	}
-
-	private void init(String url, PrivilegeLevel privilegeLevel) {
-		taskRepository = new TaskRepository(WebRepositoryConnector.REPOSITORY_TYPE, url);
-		if (privilegeLevel != null) {
-			Credentials credentials = TestUtil.readCredentials(privilegeLevel);
-			taskRepository.setCredentials(AuthenticationType.HTTP, new AuthenticationCredentials(credentials.username,
-					credentials.password), false);
-		}
-	}
-
-//	private void init(String url) {
-//		init(url, null);
-//	}
-
-	public void testAuthentication() {
-		init(TEST_URL_AUTHENTICATED, PrivilegeLevel.USER);
-
-		IRepositoryQuery query = TasksUi.getRepositoryModel().createRepositoryQuery(taskRepository);
-		query.setUrl(TEST_URL_AUTHENTICATED);
-		query.setAttribute(WebRepositoryConnector.KEY_QUERY_TEMPLATE, "${serverUrl}");
-		query.setAttribute(WebRepositoryConnector.KEY_QUERY_PATTERN, "(\\d{3})\\s+([A-Za-z ]+)");
-		query.setAttribute(WebRepositoryConnector.KEY_TASK_PREFIX, "task url");
-		TestTaskDataCollector collector = new TestTaskDataCollector();
-
-		IStatus status = connector.performQuery(taskRepository, query, collector, null, null);
-		assertEquals(Status.OK_STATUS, status);
-		assertEquals(1, collector.results.size());
-		ITaskMapping task = connector.getTaskMapping(collector.results.get(0));
-		assertEquals("200", task.getTaskData().getTaskId());
-		assertEquals("Success", task.getSummary());
-	}
-
-	public void testAuthenticationRss() {
-		init(TEST_URL_AUTHENTICATED, PrivilegeLevel.USER);
-
-		IRepositoryQuery query = TasksUi.getRepositoryModel().createRepositoryQuery(taskRepository);
-		query.setUrl(TEST_URL_AUTHENTICATED + "/rss.html");
-		query.setAttribute(WebRepositoryConnector.KEY_QUERY_TEMPLATE, "${serverUrl}");
-		query.setAttribute(WebRepositoryConnector.KEY_QUERY_PATTERN, "(\\d{3})\\s+([A-Za-z ]+)");
-		TestTaskDataCollector collector = new TestTaskDataCollector();
-
-		IStatus status = connector.performQuery(taskRepository, query, collector, null, null);
-		assertEquals(Status.OK_STATUS, status);
-		assertEquals(1, collector.results.size());
-		ITaskMapping task = connector.getTaskMapping(collector.results.get(0));
-		assertEquals("rss", task.getTaskData().getTaskId());
-		assertEquals("Success", task.getSummary());
-	}
-
-}