378101: add activity provider for related tasks such as reviews

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=378101
Change-Id: Ib63e5f52780d82cf90364921edecb0ac5c38e627

2 files changed, 50 insertions, 18 deletions

diff --git a/org.eclipse.mylyn.tasks.activity.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.activity.tests/META-INF/MANIFEST.MF
index e2e12c11d..1ec9035e4 100644
--- a/org.eclipse.mylyn.tasks.activity.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.activity.tests/META-INF/MANIFEST.MF
@@ -9,8 +9,10 @@ Require-Bundle: org.junit;bundle-version="4.5.0",
  org.eclipse.core.runtime,
  org.eclipse.mylyn.commons.core,
  org.eclipse.mylyn.commons.sdk.util,
+ org.eclipse.jface,
  org.eclipse.mylyn.tasks.core,
  org.eclipse.mylyn.tasks.activity.core,
  org.eclipse.mylyn.tasks.activity.ui,
- org.eclipse.jface
+ org.eclipse.mylyn.tasks.index.core;bundle-version="3.9.0",
+ org.eclipse.mylyn.tasks.index.ui;bundle-version="3.9.0"
 Export-Package: org.eclipse.mylyn.tasks.activity.tests;x-internal:=true
diff --git a/org.eclipse.mylyn.tasks.activity.tests/src/org/eclipse/mylyn/tasks/activity/tests/TaskActivityProviderTest.java b/org.eclipse.mylyn.tasks.activity.tests/src/org/eclipse/mylyn/tasks/activity/tests/TaskActivityProviderTest.java
index eed2b3f2f..b9734d58a 100644
--- a/org.eclipse.mylyn.tasks.activity.tests/src/org/eclipse/mylyn/tasks/activity/tests/TaskActivityProviderTest.java
+++ b/org.eclipse.mylyn.tasks.activity.tests/src/org/eclipse/mylyn/tasks/activity/tests/TaskActivityProviderTest.java
@@ -19,35 +19,65 @@ import java.util.Date;
 import java.util.List;
 
 import org.eclipse.mylyn.internal.tasks.activity.core.TaskActivityProvider;
-import org.eclipse.mylyn.internal.tasks.core.LocalTask;
+import org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector;
 import org.eclipse.mylyn.internal.tasks.core.TaskList;
-import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
+import org.eclipse.mylyn.internal.tasks.core.TaskTask;
+import org.eclipse.mylyn.internal.tasks.index.core.TaskListIndex;
+import org.eclipse.mylyn.internal.tasks.index.ui.IndexReference;
 import org.eclipse.mylyn.tasks.activity.core.ActivityEvent;
 import org.eclipse.mylyn.tasks.activity.core.IActivityManager;
 import org.eclipse.mylyn.tasks.activity.core.TaskActivityScope;
 import org.eclipse.mylyn.tasks.activity.core.spi.IActivitySession;
-import org.eclipse.mylyn.tasks.core.IRepositoryManager;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
  * @author Steffen Pingel
+ * @author Timur Achmetow
  */
+@SuppressWarnings("restriction")
 public class TaskActivityProviderTest {
-
 	protected List<ActivityEvent> events = new ArrayList<ActivityEvent>();
 
-	@Test
-	public void testActivityStream() throws Exception {
-		IRepositoryManager repositoryManager = new TaskRepositoryManager();
-		TaskList taskList = new TaskList();
-		LocalTask searchTask = new LocalTask("1", "summary");
-		LocalTask task1 = new LocalTask("2", "1: hit");
+	private IndexReference reference;
+
+	private TaskTask task1;
+
+	@Before
+	public void setUp() throws Exception {
+		task1 = new TaskTask(LocalRepositoryConnector.CONNECTOR_KIND, LocalRepositoryConnector.REPOSITORY_URL, "2");
+		task1.setSummary("1: hit");
+		task1.setTaskKey("2");
 		task1.setCreationDate(new Date());
-		LocalTask task2 = new LocalTask("3", "2: miss");
+
+		TaskTask task2 = new TaskTask(LocalRepositoryConnector.CONNECTOR_KIND, LocalRepositoryConnector.REPOSITORY_URL,
+				"3");
+		task2.setSummary("2: miss");
+		task2.setTaskKey("3");
 		task2.setCreationDate(new Date());
-		taskList.addTask(task1);
-		taskList.addTask(task2);
-		TaskActivityProvider provider = new TaskActivityProvider(repositoryManager, taskList);
+
+		reference = new IndexReference();
+		TaskListIndex taskListIndex = reference.index();
+		taskListIndex.getTaskList().addTask(task1);
+		taskListIndex.getTaskList().addTask(task2);
+		taskListIndex.waitUntilIdle();
+	}
+
+	@After
+	public void tearDown() {
+		((TaskList) reference.index().getTaskList()).reset();
+		reference.dispose();
+	}
+
+	@Test
+	public void testActivityStream() throws Exception {
+		TaskTask searchTask = new TaskTask(LocalRepositoryConnector.CONNECTOR_KIND,
+				LocalRepositoryConnector.REPOSITORY_URL, "1");
+		searchTask.setSummary("summary");
+		searchTask.setTaskKey("1");
+
+		TaskActivityProvider provider = new TaskActivityProvider();
 		IActivitySession session = new IActivitySession() {
 			public IActivityManager getManger() {
 				return null;
@@ -60,9 +90,9 @@ public class TaskActivityProviderTest {
 		provider.open(session);
 		provider.query(new TaskActivityScope(searchTask), null);
 
-		ActivityEvent expected = new ActivityEvent(task1.getHandleIdentifier(), TaskActivityProvider.ID_PROVIDER,
+		ActivityEvent expected = new ActivityEvent(task1.getHandleIdentifier(), task1.getConnectorKind(),
 				task1.getSummary(), task1.getCreationDate(), null);
+
 		assertEquals(Collections.singletonList(expected), events);
 	}
-
-}
+}
\ No newline at end of file