NEW - bug 175211: Support Trac 0.11

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

7 files changed, 156 insertions, 17 deletions

diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientSearchTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientSearchTest.java
index 4299a800b..5ad624e1d 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientSearchTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientSearchTest.java
@@ -47,8 +47,6 @@ public abstract class AbstractTracClientSearchTest extends AbstractTracClientTes
 
 		data = TestFixture.init010();
 		tickets = data.tickets;
-
-		connect010();
 	}
 
 	@Override
@@ -68,7 +66,17 @@ public abstract class AbstractTracClientSearchTest extends AbstractTracClientTes
 		}
 	}
 
-	public void testGetTicket() throws Exception {
+	public void testGetTicket010() throws Exception {
+		connect010();
+		getTickets();
+	}
+
+//	public void testGetTicket011() throws Exception {
+//		connect011();
+//		getTickets();
+//	}
+
+	private void getTickets() throws Exception {
 		TracTicket ticket = repository.getTicket(tickets.get(0).getId());
 		assertTicketEquals(tickets.get(0), ticket);
 
@@ -76,7 +84,17 @@ public abstract class AbstractTracClientSearchTest extends AbstractTracClientTes
 		assertTicketEquals(tickets.get(1), ticket);
 	}
 
-	public void testGetTicketInvalidId() throws Exception {
+	public void testGetTicketInvalidId010() throws Exception {
+		connect010();
+		getTicketInvalidId();
+	}
+
+	public void testGetTicketInvalidId011() throws Exception {
+		connect011();
+		getTicketInvalidId();
+	}
+
+	private void getTicketInvalidId() throws Exception {
 		try {
 			repository.getTicket(Integer.MAX_VALUE);
 			fail("Expected TracException");
@@ -84,7 +102,17 @@ public abstract class AbstractTracClientSearchTest extends AbstractTracClientTes
 		}
 	}
 
-	public void testGetTicketUmlaute() throws Exception {
+	public void testGetTicketUmlaute010() throws Exception {
+		connect010();
+		getTicketUmlaute();
+	}
+
+//	public void testGetTicketUmlaute011() throws Exception {
+//		connect011();
+//		getTicketUmlaute();
+//	}
+
+	private void getTicketUmlaute() throws Exception {
 		TracTicket ticket = repository.getTicket(data.htmlEntitiesTicketId);
 		assertEquals("test html entities: \u00E4\u00F6\u00FC", ticket.getValue(Key.SUMMARY));
 		if (version == Version.XML_RPC) {
@@ -94,14 +122,34 @@ public abstract class AbstractTracClientSearchTest extends AbstractTracClientTes
 		}
 	}
 
-	public void testSearchAll() throws Exception {
+	public void testSearchAll010() throws Exception {
+		connect010();
+		searchAll();
+	}
+
+//	public void testSearchAll011() throws Exception {
+//		connect011();
+//		searchAll();
+//	}
+
+	private void searchAll() throws Exception {
 		TracSearch search = new TracSearch();
 		List<TracTicket> result = new ArrayList<TracTicket>();
 		repository.search(search, result);
 		assertEquals(tickets.size(), result.size());
 	}
 
-	public void testSearchEmpty() throws Exception {
+	public void testSearchEmpty010() throws Exception {
+		connect010();
+		searchEmpty();		
+	}
+
+//	public void testSearchEmpty011() throws Exception {
+//		connect011();
+//		searchEmpty();
+//	}
+
+	private void searchEmpty() throws Exception {
 		TracSearch search = new TracSearch();
 		search.addFilter("milestone", "does not exist");
 		List<TracTicket> result = new ArrayList<TracTicket>();
@@ -109,7 +157,17 @@ public abstract class AbstractTracClientSearchTest extends AbstractTracClientTes
 		assertEquals(0, result.size());
 	}
 
-	public void testSearchMilestone1() throws Exception {
+	public void testSearchMilestone1010() throws Exception {
+		connect010();
+		searchMilestone1();
+	}
+
+//	public void testSearchMilestone1011() throws Exception {
+//		connect011();
+//		searchMilestone1();
+//	}
+
+	private void searchMilestone1() throws Exception {
 		TracSearch search = new TracSearch();
 		search.addFilter("milestone", "milestone1");
 		List<TracTicket> result = new ArrayList<TracTicket>();
@@ -118,7 +176,17 @@ public abstract class AbstractTracClientSearchTest extends AbstractTracClientTes
 		assertTicketEquals(tickets.get(0), result.get(0));
 	}
 
-	public void testSearchMilestone2() throws Exception {
+	public void testSearchMilestone2010() throws Exception {
+		connect010();
+		searchMilestone2();
+	}
+
+//	public void testSearchMilestone2011() throws Exception {
+//		connect011();
+//		searchMilestone2();
+//	}
+
+	private void searchMilestone2() throws Exception {
 		TracSearch search = new TracSearch();
 		search.addFilter("milestone", "milestone1");
 		search.addFilter("milestone", "milestone2");
@@ -131,7 +199,17 @@ public abstract class AbstractTracClientSearchTest extends AbstractTracClientTes
 		assertTicketEquals(tickets.get(2), result.get(2));
 	}
 
-	public void testSearchExactMatch() throws Exception {
+	public void testSearchExactMatch010() throws Exception {
+		connect010();
+		searchExactMatch();
+	}
+	
+//	public void testSearchExactMatch011() throws Exception {
+//		connect011();
+//		searchExactMatch();
+//	}
+	
+	private void searchExactMatch() throws Exception {
 		TracSearch search = new TracSearch();
 		search.addFilter("milestone", "milestone1");
 		search.addFilter("summary", "summary1");
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientTest.java
index 7be664b15..75bcc46a5 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/AbstractTracClientTest.java
@@ -58,6 +58,10 @@ public abstract class AbstractTracClientTest extends TestCase {
 		return connect(Constants.TEST_TRAC_010_DIGEST_AUTH_URL);
 	}
 
+	public ITracClient connect011() throws Exception {
+		return connect(Constants.TEST_TRAC_011_URL);
+	}
+
 	public ITracClient connect(String url) throws Exception {
 		return connect(url, Proxy.NO_PROXY);
 	}
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
index 6d24db373..f6af740a3 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
@@ -116,11 +116,21 @@ public class TracRepositoryConnectorTest extends TestCase {
 		assertEquals(null, connector.getRepositoryUrlFromTaskUrl("http://host/repo/ticket-2342"));
 	}
 
+	public void testCreateTaskFromExistingKeyXmlRpc011() throws CoreException {
+		init(Constants.TEST_TRAC_010_URL, Version.XML_RPC);
+		createTaskFromExistingKey();
+	}
+
 	public void testCreateTaskFromExistingKeyXmlRpc010() throws CoreException {
 		init(Constants.TEST_TRAC_010_URL, Version.XML_RPC);
 		createTaskFromExistingKey();
 	}
 
+	public void testCreateTaskFromExistingKeyTracWeb011() throws CoreException {
+		init(Constants.TEST_TRAC_010_URL, Version.TRAC_0_9);
+		createTaskFromExistingKey();
+	}
+
 	public void testCreateTaskFromExistingKeyTracWeb010() throws CoreException {
 		init(Constants.TEST_TRAC_010_URL, Version.TRAC_0_9);
 		createTaskFromExistingKey();
@@ -169,10 +179,18 @@ public class TracRepositoryConnectorTest extends TestCase {
 		assertEquals(Version.XML_RPC, client.getVersion());
 	}
 
+//	public void testPerformQueryXmlRpc011() {
+//		performQuery(Constants.TEST_TRAC_011_URL, Version.XML_RPC);
+//	}
+
 	public void testPerformQueryXmlRpc010() {
 		performQuery(Constants.TEST_TRAC_010_URL, Version.XML_RPC);
 	}
 
+	public void testPerformQueryWeb011() {
+		performQuery(Constants.TEST_TRAC_010_URL, Version.TRAC_0_9);
+	}
+
 	public void testPerformQueryWeb010() {
 		performQuery(Constants.TEST_TRAC_010_URL, Version.TRAC_0_9);
 	}
@@ -246,8 +264,8 @@ public class TracRepositoryConnectorTest extends TestCase {
 		assertEquals(Task.DEFAULT_TASK_KIND, task.getTaskKind());
 	}
 
-	public void testUpdateAttributesWeb096() throws Exception {
-		init(Constants.TEST_TRAC_096_URL, Version.TRAC_0_9);
+	public void testUpdateAttributesWeb011() throws Exception {
+		init(Constants.TEST_TRAC_011_URL, Version.TRAC_0_9);
 		updateAttributes();
 	}
 
@@ -256,6 +274,16 @@ public class TracRepositoryConnectorTest extends TestCase {
 		updateAttributes();
 	}
 
+	public void testUpdateAttributesWeb096() throws Exception {
+		init(Constants.TEST_TRAC_096_URL, Version.TRAC_0_9);
+		updateAttributes();
+	}
+
+	public void testUpdateAttributesXmlRpc011() throws Exception {
+		init(Constants.TEST_TRAC_011_URL, Version.XML_RPC);
+		updateAttributes();
+	}
+
 	public void testUpdateAttributesXmlRpc010() throws Exception {
 		init(Constants.TEST_TRAC_010_URL, Version.XML_RPC);
 		updateAttributes();
@@ -276,7 +304,7 @@ public class TracRepositoryConnectorTest extends TestCase {
 		assertEquals("2.0", versions[1].getName());
 	}
 
-	public void testContext010() throws Exception {
+	public void testContextXmlRpc010() throws Exception {
 		init(Constants.TEST_TRAC_010_URL, Version.XML_RPC);
 		TracTask task = (TracTask) connector.createTaskFromExistingKey(repository, data.attachmentTicketId + "");
 		TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null);
@@ -297,7 +325,7 @@ public class TracRepositoryConnectorTest extends TestCase {
 		//assertTrue(connector.retrieveContext(repository, task, attachment, TasksUiPlugin.getDefault().getProxySettings(), TasksUiPlugin.getDefault().getDataDirectory()));
 	}
 
-	public void testContext096() throws Exception {
+	public void testContextWeb096() throws Exception {
 		init(Constants.TEST_TRAC_096_URL, Version.TRAC_0_9);
 		TracTask task = (TracTask) connector.createTaskFromExistingKey(repository, data.attachmentTicketId + "");
 
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java
index 783d8f989..54d55faa1 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java
@@ -94,6 +94,15 @@ public class TracTaskDataHandlerTest extends TestCase {
 
 	public void testGetChangedSinceLastSyncXmlRpc010() throws Exception {
 		init(Constants.TEST_TRAC_010_URL, Version.XML_RPC);
+		getChangedSinceLastSync();
+	}
+
+//	public void testGetChangedSinceLastSyncXmlRpc011() throws Exception {
+//		init(Constants.TEST_TRAC_011_URL, Version.XML_RPC);
+//		getChangedSinceLastSync();
+//	}
+
+	private void getChangedSinceLastSync() throws Exception {
 		TracTask task = (TracTask) connector.createTaskFromExistingKey(repository, data.offlineHandlerTicketId + "");
 		TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null);
 		int lastModified = Integer.parseInt(task.getTaskData().getLastModified());
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracWebClientSearchTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracWebClientSearchTest.java
index 12acdc205..155ac8201 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracWebClientSearchTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracWebClientSearchTest.java
@@ -28,7 +28,17 @@ public class TracWebClientSearchTest extends AbstractTracClientSearchTest {
 	}
 
 	// TODO move this test to AbstracTracClientTest when bug 162094 is resolved
-	public void testSearchMilestoneAmpersand() throws Exception {
+	public void testSearchMilestoneAmpersand010() throws Exception {
+		connect010();
+		searchMilestoneAmpersand();
+	}
+
+	public void testSearchMilestoneAmpersand011() throws Exception {
+		connect011();
+		searchMilestoneAmpersand();
+	}
+
+	private void searchMilestoneAmpersand() throws Exception {
 		TracSearch search = new TracSearch();
 		search.addFilter("milestone", "mile&stone");
 		search.setOrderBy("id");
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracWebClientTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracWebClientTest.java
index 88855db01..d4aa995d5 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracWebClientTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracWebClientTest.java
@@ -66,7 +66,7 @@ public class TracWebClientTest extends AbstractTracClientRepositoryTest {
 		updateAttributes();
 	}
 
-	public void updateAttributes() throws TracException {
+	private void updateAttributes() throws TracException {
 		assertNull(repository.getMilestones());
 		repository.updateAttributes(new NullProgressMonitor(), true);
 		TracVersion[] versions = repository.getVersions();
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcClientSearchTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcClientSearchTest.java
index a7d1ac9c7..2a9c861c4 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcClientSearchTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracXmlRpcClientSearchTest.java
@@ -28,7 +28,17 @@ public class TracXmlRpcClientSearchTest extends AbstractTracClientSearchTest {
 		super(Version.XML_RPC);
 	}
 
-	public void testSearchValidateTicket() throws Exception {
+	public void testSearchValidateTicket010() throws Exception {
+		connect010();
+		searchValidateTicket();
+	}
+	
+//	public void testSearchValidateTicket011() throws Exception {
+//		connect011();
+//		searchValidateTicket();		
+//	}
+	
+	public void searchValidateTicket() throws Exception {
 		TracSearch search = new TracSearch();
 		search.addFilter("summary", "summary1");
 		List<TracTicket> result = new ArrayList<TracTicket>();