NEW - bug 290465: fix Bugzilla test suite

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

2 files changed, 69 insertions, 114 deletions

diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaDateTimeTests.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaDateTimeTests.java
index 105d05edc..6870d6d97 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaDateTimeTests.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaDateTimeTests.java
@@ -15,32 +15,46 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 
+import org.eclipse.mylyn.bugzilla.tests.support.BugzillaFixture;
 import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttribute;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttributeMapper;
+import org.eclipse.mylyn.internal.bugzilla.core.BugzillaClient;
+import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryConnector;
+import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
 import org.eclipse.mylyn.tasks.core.data.TaskData;
-import org.eclipse.mylyn.tasks.core.data.TaskDataModel;
+import org.eclipse.mylyn.tests.util.TestUtil.PrivilegeLevel;
 
 /**
  * @author Frank Becker
+ * @author Robert Elves
  */
 public class BugzillaDateTimeTests extends AbstractBugzillaTest {
 
-	public void testTimezones218() throws Exception {
-		// could not test BugzillaAttribute.DEADLINE because not supported in 2.18.6
+	private TaskRepository repository;
+
+	private BugzillaRepositoryConnector connector;
+
+	@SuppressWarnings("unused")
+	private BugzillaClient client;
+
+	@Override
+	public void setUp() throws Exception {
+		super.setUp();
+		client = BugzillaFixture.current().client(PrivilegeLevel.USER);
+		repository = BugzillaFixture.current().repository();
+		connector = BugzillaFixture.current().connector();
+	}
+
+	public void testDateFormatParsing() {
 		TimeZone defaultTimeZone = TimeZone.getDefault();
 		try {
 			TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
-			init218();
-			ITask task = generateLocalTaskAndDownload("10");
-			assertNotNull(task);
-			TaskDataModel model = createModel(task);
-			TaskData taskData = model.getTaskData();
-			assertNotNull(taskData);
-
-			TaskAttribute attribute = taskData.getRoot().getAttribute(BugzillaAttribute.CREATION_TS.getKey());
-			attribute.setValue(attribute.getValue() + " PST");
-			assertEquals("2006-05-08 15:04 PST", attribute.getValue());
+
+			TaskData taskData = new TaskData(new BugzillaAttributeMapper(repository, connector), "bugzilla", "repourl",
+					"1");
+			TaskAttribute attribute = taskData.getRoot().createAttribute(BugzillaAttribute.CREATION_TS.getKey());
+			attribute.setValue("2006-05-08 15:04 PST");
 			Date date = taskData.getAttributeMapper().getDateValue(attribute);
 			Calendar calendar = Calendar.getInstance();
 			calendar.setTime(date);
@@ -51,127 +65,68 @@ public class BugzillaDateTimeTests extends AbstractBugzillaTest {
 			assertEquals(4, calendar.get(Calendar.MINUTE));
 			assertEquals(0, calendar.get(Calendar.SECOND));
 
-			attribute = taskData.getRoot().getAttribute(BugzillaAttribute.DELTA_TS.getKey());
-			attribute.setValue(attribute.getValue() + " PST");
-			assertEquals("2006-06-02 14:45:37 PST", attribute.getValue());
+			attribute.setValue("2006-05-08 15:04:11 PST");
 			date = taskData.getAttributeMapper().getDateValue(attribute);
+			calendar = Calendar.getInstance();
 			calendar.setTime(date);
 			assertEquals(2006, calendar.get(Calendar.YEAR));
-			assertEquals(5, calendar.get(Calendar.MONTH));
-			assertEquals(2, calendar.get(Calendar.DAY_OF_MONTH));
-			assertEquals(22, calendar.get(Calendar.HOUR_OF_DAY));
-			assertEquals(45, calendar.get(Calendar.MINUTE));
-			assertEquals(37, calendar.get(Calendar.SECOND));
-			TaskAttribute attachment = taskData.getAttributeMapper().getAttributesByType(taskData,
-					TaskAttribute.TYPE_ATTACHMENT).get(0);
-			assertNotNull(attachment);
-
-			attribute = attachment.getAttribute(BugzillaAttribute.DATE.getKey());
-			attribute.setValue(attribute.getValue() + " PST");
-			assertEquals("2006-05-26 19:38 PST", attribute.getValue());
+			assertEquals(4, calendar.get(Calendar.MONTH));
+			assertEquals(8, calendar.get(Calendar.DAY_OF_MONTH));
+			assertEquals(23, calendar.get(Calendar.HOUR_OF_DAY));
+			assertEquals(4, calendar.get(Calendar.MINUTE));
+			assertEquals(11, calendar.get(Calendar.SECOND));
+
+			attribute.setValue("2006-05-08 15:04:11 -0800");
 			date = taskData.getAttributeMapper().getDateValue(attribute);
+			calendar = Calendar.getInstance();
 			calendar.setTime(date);
 			assertEquals(2006, calendar.get(Calendar.YEAR));
 			assertEquals(4, calendar.get(Calendar.MONTH));
-			assertEquals(27, calendar.get(Calendar.DAY_OF_MONTH));
-			assertEquals(3, calendar.get(Calendar.HOUR_OF_DAY));
-			assertEquals(38, calendar.get(Calendar.MINUTE));
-			assertEquals(0, calendar.get(Calendar.SECOND));
+			assertEquals(8, calendar.get(Calendar.DAY_OF_MONTH));
+			assertEquals(23, calendar.get(Calendar.HOUR_OF_DAY));
+			assertEquals(4, calendar.get(Calendar.MINUTE));
+			assertEquals(11, calendar.get(Calendar.SECOND));
 
-			TaskAttribute comment = taskData.getAttributeMapper().getAttributesByType(taskData,
-					TaskAttribute.TYPE_COMMENT).get(0);
-			assertNotNull(comment);
-			attribute = comment.getAttribute(BugzillaAttribute.BUG_WHEN.getKey());
-			attribute.setValue(attribute.getValue() + " PST");
-			assertEquals("2006-05-08 15:05 PST", attribute.getValue());
+			attribute.setValue("2006-05-08 15:04 -0800");
 			date = taskData.getAttributeMapper().getDateValue(attribute);
+			calendar = Calendar.getInstance();
 			calendar.setTime(date);
 			assertEquals(2006, calendar.get(Calendar.YEAR));
 			assertEquals(4, calendar.get(Calendar.MONTH));
 			assertEquals(8, calendar.get(Calendar.DAY_OF_MONTH));
 			assertEquals(23, calendar.get(Calendar.HOUR_OF_DAY));
-			assertEquals(5, calendar.get(Calendar.MINUTE));
-			assertEquals(0, calendar.get(Calendar.SECOND));
-		} finally {
-			TimeZone.setDefault(defaultTimeZone);
-		}
-	}
-
-	public void testTimezones323() throws Exception {
-		// could not test BugzillaAttribute.DEADLINE and CUSTOM_FIELDS because not supported in 3.2.3
-		TimeZone defaultTimeZone = TimeZone.getDefault();
-		try {
-			TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
-
-			init323();
-			ITask task = generateLocalTaskAndDownload("2");
-			assertNotNull(task);
-			TaskDataModel model = createModel(task);
-			TaskData taskData = model.getTaskData();
-			assertNotNull(taskData);
-			TaskAttribute attribute = taskData.getRoot().getAttribute(BugzillaAttribute.CREATION_TS.getKey());
-			attribute.setValue(attribute.getValue() + " PST");
-			assertEquals("2009-02-12 13:40 PST", attribute.getValue());
-			Date date = taskData.getAttributeMapper().getDateValue(attribute);
-			Calendar calendar = Calendar.getInstance();
-			calendar.setTime(date);
-			assertEquals(2009, calendar.get(Calendar.YEAR));
-			assertEquals(1, calendar.get(Calendar.MONTH));
-			assertEquals(12, calendar.get(Calendar.DAY_OF_MONTH));
-			assertEquals(21, calendar.get(Calendar.HOUR_OF_DAY));
-			assertEquals(40, calendar.get(Calendar.MINUTE));
+			assertEquals(4, calendar.get(Calendar.MINUTE));
 			assertEquals(0, calendar.get(Calendar.SECOND));
 
-			attribute = taskData.getRoot().getAttribute(BugzillaAttribute.DELTA_TS.getKey());
-			attribute.setValue(attribute.getValue() + " PST");
-//			String val = attribute.getValue();
-			assertEquals("2009-06-03 23:31:42 PST", attribute.getValue());
-			date = taskData.getAttributeMapper().getDateValue(attribute);
-			calendar.setTime(date);
-			assertEquals(2009, calendar.get(Calendar.YEAR));
-			assertEquals(5, calendar.get(Calendar.MONTH));
-			assertEquals(4, calendar.get(Calendar.DAY_OF_MONTH));
-			assertEquals(7, calendar.get(Calendar.HOUR_OF_DAY));
-			assertEquals(31, calendar.get(Calendar.MINUTE));
-			assertEquals(42, calendar.get(Calendar.SECOND));
-			TaskAttribute attachment = taskData.getAttributeMapper().getAttributesByType(taskData,
-					TaskAttribute.TYPE_ATTACHMENT).get(0);
-			assertNotNull(attachment);
-
-			attribute = attachment.getAttribute(BugzillaAttribute.DATE.getKey());
-			attribute.setValue(attribute.getValue() + " PST");
-			assertEquals("2009-05-07 17:07:56 PST", attribute.getValue());
+			attribute.setValue("2006-05-08 15:04:11");
 			date = taskData.getAttributeMapper().getDateValue(attribute);
+			calendar = Calendar.getInstance();
 			calendar.setTime(date);
-			assertEquals(2009, calendar.get(Calendar.YEAR));
+			assertEquals(2006, calendar.get(Calendar.YEAR));
 			assertEquals(4, calendar.get(Calendar.MONTH));
 			assertEquals(8, calendar.get(Calendar.DAY_OF_MONTH));
-			assertEquals(1, calendar.get(Calendar.HOUR_OF_DAY));
-			assertEquals(7, calendar.get(Calendar.MINUTE));
-			assertEquals(56, calendar.get(Calendar.SECOND));
-
-			TaskAttribute comment = taskData.getAttributeMapper().getAttributesByType(taskData,
-					TaskAttribute.TYPE_COMMENT).get(0);
-			assertNotNull(comment);
-			attribute = comment.getAttribute(BugzillaAttribute.BUG_WHEN.getKey());
-			attribute.setValue(attribute.getValue() + " PST");
-			assertEquals("2009-02-17 17:29:35 PST", attribute.getValue());
+			assertEquals(15, calendar.get(Calendar.HOUR_OF_DAY));
+			assertEquals(4, calendar.get(Calendar.MINUTE));
+			assertEquals(11, calendar.get(Calendar.SECOND));
+
+			attribute.setValue("2006-05-08 15:04");
 			date = taskData.getAttributeMapper().getDateValue(attribute);
+			calendar = Calendar.getInstance();
 			calendar.setTime(date);
-			assertEquals(2009, calendar.get(Calendar.YEAR));
-			assertEquals(1, calendar.get(Calendar.MONTH));
-			assertEquals(18, calendar.get(Calendar.DAY_OF_MONTH));
-			assertEquals(1, calendar.get(Calendar.HOUR_OF_DAY));
-			assertEquals(29, calendar.get(Calendar.MINUTE));
-			assertEquals(35, calendar.get(Calendar.SECOND));
-
-			attribute = taskData.getRoot().getAttribute(BugzillaAttribute.DEADLINE.getKey());
-			assertEquals("2009-06-24", attribute.getValue());
+			assertEquals(2006, calendar.get(Calendar.YEAR));
+			assertEquals(4, calendar.get(Calendar.MONTH));
+			assertEquals(8, calendar.get(Calendar.DAY_OF_MONTH));
+			assertEquals(15, calendar.get(Calendar.HOUR_OF_DAY));
+			assertEquals(4, calendar.get(Calendar.MINUTE));
+			assertEquals(0, calendar.get(Calendar.SECOND));
+
+			attribute.setValue("2006-05-08");
 			date = taskData.getAttributeMapper().getDateValue(attribute);
+			calendar = Calendar.getInstance();
 			calendar.setTime(date);
-			assertEquals(2009, calendar.get(Calendar.YEAR));
-			assertEquals(5, calendar.get(Calendar.MONTH));
-			assertEquals(24, calendar.get(Calendar.DAY_OF_MONTH));
+			assertEquals(2006, calendar.get(Calendar.YEAR));
+			assertEquals(4, calendar.get(Calendar.MONTH));
+			assertEquals(8, calendar.get(Calendar.DAY_OF_MONTH));
 			assertEquals(0, calendar.get(Calendar.HOUR_OF_DAY));
 			assertEquals(0, calendar.get(Calendar.MINUTE));
 			assertEquals(0, calendar.get(Calendar.SECOND));
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaRepositoryConnectorStandaloneTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaRepositoryConnectorStandaloneTest.java
index b7f6146f3..de98a67e5 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaRepositoryConnectorStandaloneTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaRepositoryConnectorStandaloneTest.java
@@ -125,9 +125,9 @@ public class BugzillaRepositoryConnectorStandaloneTest extends TestCase {
 		attribute.setValue("2009-09-04 12:00:::01 PDT");
 		assertFalse(connector.hasTaskChanged(repository, task, data));
 
-		// Same times, bogus format (string compare)
-		task.setAttribute(BugzillaAttribute.DELTA_TS.getKey(), "2009-09-04X12:00:::01 PDT");
-		attribute.setValue("2009-09-04 12:00:::01 PDT");
+		// Different times, bogus format (string compare)
+		task.setAttribute(BugzillaAttribute.DELTA_TS.getKey(), "2009-09X-04X12:00:::01 PDT");
+		attribute.setValue("2009-X-03 12:00:::01 PDT");
 		assertTrue(connector.hasTaskChanged(repository, task, data));
 
 	}