1 files changed, 8 insertions, 28 deletions

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
index 35a79c36e..50336a9cb 100644
--- 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2004, 2008 Tasktop Technologies and others.
+ * 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
@@ -12,23 +12,16 @@
 
 package org.eclipse.mylyn.tasks.tests.web;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import junit.framework.TestCase;
 
-import org.eclipse.core.runtime.CoreException;
 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.tasks.core.AbstractTask;
-import org.eclipse.mylyn.internal.tasks.core.deprecated.ITaskFactory;
-import org.eclipse.mylyn.internal.tasks.core.deprecated.QueryHitCollector;
-import org.eclipse.mylyn.internal.tasks.core.deprecated.RepositoryTaskData;
 import org.eclipse.mylyn.internal.web.tasks.WebRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.data.TaskDataCollector;
+import org.eclipse.mylyn.tasks.core.data.TaskMapper;
+import org.eclipse.mylyn.tasks.tests.util.TestTaskDataCollector;
 
 /**
  * @author George Lindholm
@@ -40,20 +33,7 @@ public class HtmlDecodeEntityTest extends TestCase {
 
 	private final TaskRepository repository = new TaskRepository("localhost", "file:///tmp/a");
 
-	private final List<RepositoryTaskData> queryHits = new ArrayList<RepositoryTaskData>();
-
-	private final ITaskFactory taskFactory = new ITaskFactory() {
-		public AbstractTask createTask(RepositoryTaskData taskData, IProgressMonitor monitor) throws CoreException {
-			return null;
-		}
-	};
-
-	private final TaskDataCollector resultCollector = new QueryHitCollector(taskFactory) {
-		@Override
-		public void accept(RepositoryTaskData hit) {
-			queryHits.add(hit);
-		}
-	};
+	private final TestTaskDataCollector collector = new TestTaskDataCollector();
 
 	public void testEntities() {
 		assertQuery("1:A quote &quot;", "(\\d+?):(.+)", "A quote \""); // Simple quote
@@ -70,10 +50,10 @@ public class HtmlDecodeEntityTest extends TestCase {
 	}
 
 	private void assertQuery(final String entity, final String regex, final String expected) {
-		queryHits.clear();
-		IStatus status = WebRepositoryConnector.performQuery(entity, regex, "", monitor, resultCollector, repository);
-		assertTrue(status == Status.OK_STATUS);
-		assertEquals(queryHits.get(0).getSummary(), 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());
 	}
 
 }