REOPENED - bug 378230: "Submit failed: invalide severity [...]

'enhancement' 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=378230

Change-Id: Id1d232efb1b5064e54efd4bdd29860c7488978d6

2 files changed, 4 insertions, 101 deletions

diff --git a/org.eclipse.mylyn.tasks.index.tests/src/org/eclipse/mylyn/internal/tasks/index/tests/util/FullMockRepositoryConnector.java b/org.eclipse.mylyn.tasks.index.tests/src/org/eclipse/mylyn/internal/tasks/index/tests/util/FullMockRepositoryConnector.java
deleted file mode 100644
index f14b94d6f..000000000
--- a/org.eclipse.mylyn.tasks.index.tests/src/org/eclipse/mylyn/internal/tasks/index/tests/util/FullMockRepositoryConnector.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.internal.tasks.index.tests.util;
-
-import java.util.Date;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.core.ITaskMapping;
-import org.eclipse.mylyn.tasks.core.RepositoryResponse;
-import org.eclipse.mylyn.tasks.core.RepositoryResponse.ResponseKind;
-import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.core.data.AbstractTaskDataHandler;
-import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
-import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper;
-import org.eclipse.mylyn.tasks.core.data.TaskData;
-import org.eclipse.mylyn.tasks.core.data.TaskMapper;
-import org.eclipse.mylyn.tasks.tests.connector.MockRepositoryConnector;
-
-/**
- * @author David Green
- */
-public class FullMockRepositoryConnector extends MockRepositoryConnector {
-
-	private final AtomicInteger idSeed = new AtomicInteger(9000);
-
-	@Override
-	public boolean hasTaskChanged(TaskRepository taskRepository, ITask task, TaskData taskData) {
-		ITaskMapping taskMapping = getTaskMapping(taskData);
-		Date modificationDate = taskMapping.getModificationDate();
-		return modificationDate != null && !modificationDate.equals(task.getModificationDate());
-	}
-
-	@Override
-	public TaskMapper getTaskMapping(TaskData taskData) {
-		return new TaskMapper(taskData, true);
-	}
-
-	@Override
-	public void updateTaskFromTaskData(TaskRepository taskRepository, ITask task, TaskData taskData) {
-		final Date originalModificationDate = task.getModificationDate();
-
-		TaskMapper taskMapping = getTaskMapping(taskData);
-		taskMapping.applyTo(task);
-
-		if (taskData.isPartial()) {
-			task.setModificationDate(originalModificationDate);
-		}
-	}
-
-	@Override
-	public AbstractTaskDataHandler getTaskDataHandler() {
-		return new AbstractTaskDataHandler() {
-
-			@Override
-			public RepositoryResponse postTaskData(TaskRepository repository, TaskData taskData,
-					Set<TaskAttribute> oldAttributes, IProgressMonitor monitor) throws CoreException {
-				if (taskData.getTaskId() == null || taskData.getTaskId().length() == 0) {
-					return new RepositoryResponse(ResponseKind.TASK_UPDATED, String.valueOf(idSeed.incrementAndGet()));
-				} else {
-					return new RepositoryResponse(ResponseKind.TASK_UPDATED, taskData.getTaskId());
-				}
-			}
-
-			@Override
-			public boolean initializeTaskData(TaskRepository repository, TaskData data,
-					ITaskMapping initializationData, IProgressMonitor monitor) throws CoreException {
-				TaskMapper mapper = getTaskMapping(data);
-				mapper.setCreationDate(new Date());
-				mapper.setDescription("");
-				mapper.setModificationDate(mapper.getCreationDate());
-				mapper.setOwner("");
-				mapper.setProduct("Product1");
-				mapper.setReporter("");
-				mapper.setStatus("NEW");
-				mapper.setSummary("");
-				return false;
-			}
-
-			@Override
-			public TaskAttributeMapper getAttributeMapper(TaskRepository repository) {
-				return new TaskAttributeMapper(repository);
-			}
-		};
-	}
-}
diff --git a/org.eclipse.mylyn.tasks.index.tests/src/org/eclipse/mylyn/internal/tasks/index/tests/util/MockTestContext.java b/org.eclipse.mylyn.tasks.index.tests/src/org/eclipse/mylyn/internal/tasks/index/tests/util/MockTestContext.java
index d183ab944..117b06884 100644
--- a/org.eclipse.mylyn.tasks.index.tests/src/org/eclipse/mylyn/internal/tasks/index/tests/util/MockTestContext.java
+++ b/org.eclipse.mylyn.tasks.index.tests/src/org/eclipse/mylyn/internal/tasks/index/tests/util/MockTestContext.java
@@ -37,6 +37,7 @@ import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
 import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper;
 import org.eclipse.mylyn.tasks.core.data.TaskData;
 import org.eclipse.mylyn.tasks.tests.connector.MockRepositoryConnector;
+import org.eclipse.mylyn.tasks.tests.connector.MockRepositoryConnectorWithTaskDataHandler;
 import org.eclipse.mylyn.tasks.tests.connector.MockTask;
 
 /**
@@ -64,7 +65,7 @@ public class MockTestContext {
 
 	private final AtomicInteger idSeed = new AtomicInteger(1003);
 
-	private final FullMockRepositoryConnector mockRepositoryConnector;
+	private final MockRepositoryConnectorWithTaskDataHandler mockRepositoryConnector;
 
 	private final File dataDir;
 
@@ -72,7 +73,7 @@ public class MockTestContext {
 		taskList = new TaskList();
 		repositoryManager = new TaskRepositoryManager();
 
-		mockRepositoryConnector = new FullMockRepositoryConnector();
+		mockRepositoryConnector = new MockRepositoryConnectorWithTaskDataHandler();
 		repositoryManager.addRepositoryConnector(mockRepositoryConnector);
 		mockRepository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND,
 				MockRepositoryConnector.REPOSITORY_URL);
@@ -163,7 +164,7 @@ public class MockTestContext {
 		return mockRepository;
 	}
 
-	public FullMockRepositoryConnector getMockRepositoryConnector() {
+	public MockRepositoryConnectorWithTaskDataHandler getMockRepositoryConnector() {
 		return mockRepositoryConnector;
 	}