diff options
| author | Steffen Pingel | 2011-08-28 21:58:12 +0000 |
|---|---|---|
| committer | Steffen Pingel | 2011-08-28 21:58:12 +0000 |
| commit | 10f5d7510ce301f41ea71f1ff7db9a05375708d6 (patch) | |
| tree | f0890f3c88d588eb44e096e9b6d6eff9b69ea939 /org.eclipse.mylyn.trac.tests/src | |
| parent | b30ead21543b16e9e1822dd182fc39734a3d196d (diff) | |
| download | org.eclipse.mylyn.tasks-10f5d7510ce301f41ea71f1ff7db9a05375708d6.tar.gz org.eclipse.mylyn.tasks-10f5d7510ce301f41ea71f1ff7db9a05375708d6.tar.xz org.eclipse.mylyn.tasks-10f5d7510ce301f41ea71f1ff7db9a05375708d6.zip | |
REOPENED - bug 351100: fix failing tests for Mylyn 3.7
https://bugs.eclipse.org/bugs/show_bug.cgi?id=351100
Diffstat (limited to 'org.eclipse.mylyn.trac.tests/src')
2 files changed, 12 insertions, 14 deletions
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracTaskDataHandlerXmlRpcTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracTaskDataHandlerXmlRpcTest.java index 0303b66c7..e4c75bf1a 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracTaskDataHandlerXmlRpcTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/core/TracTaskDataHandlerXmlRpcTest.java @@ -128,10 +128,10 @@ public class TracTaskDataHandlerXmlRpcTest extends TestCase { long mostRecentlyModified = 0; // try changing ticket 3x to make sure it gets a new change time for (int i = 0; i < 3; i++) { + ticket = client.getTicket(ticket.getId(), null); ticket.putBuiltinValue(Key.DESCRIPTION, lastModified + ""); client.updateTicket(ticket, "comment", null); - TracTicket updateTicket = client.getTicket(ticket.getId(), null); - mostRecentlyModified = TracUtil.toTracTime(updateTicket.getLastChanged()); + mostRecentlyModified = TracUtil.toTracTime(ticket.getLastChanged()); // needs to be at least one second ahead of repository time stamp if (mostRecentlyModified > lastModified + 1) { break; diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestConstants.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestConstants.java index 358d08aca..be4e3f13e 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestConstants.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestConstants.java @@ -11,29 +11,27 @@ package org.eclipse.mylyn.trac.tests.support; +import org.eclipse.mylyn.commons.sdk.util.TestConfiguration; + /** * @author Steffen Pingel */ public class TracTestConstants { - public static final String SERVER = System.getProperty("mylyn.trac.server", "mylyn.eclipse.org"); - -// public static final String TEST_TRAC_096_URL = "http://" + SERVER + "/trac096"; - - public static final String TEST_TRAC_010_URL = "http://" + SERVER + "/trac010"; + public static final String TEST_TRAC_010_URL = TestConfiguration.getRepositoryUrl("trac010"); - public static final String TEST_TRAC_010_SSL_URL = "https://" + SERVER + "/trac010"; + public static final String TEST_TRAC_010_SSL_URL = TestConfiguration.getRepositoryUrl("trac010", true); - public static final String TEST_TRAC_010_DIGEST_AUTH_URL = "http://" + SERVER + "/trac010digest"; + public static final String TEST_TRAC_010_DIGEST_AUTH_URL = TestConfiguration.getRepositoryUrl("trac010digest"); - public static final String TEST_TRAC_010_FORM_AUTH_URL = "http://" + SERVER + "/trac010formauth"; + public static final String TEST_TRAC_010_FORM_AUTH_URL = TestConfiguration.getRepositoryUrl("trac010formauth"); - public static final String TEST_TRAC_011_URL = "http://" + SERVER + "/trac011"; + public static final String TEST_TRAC_011_URL = TestConfiguration.getRepositoryUrl("trac011"); - public static final String TEST_TRAC_012_URL = "http://" + SERVER + "/trac012"; + public static final String TEST_TRAC_012_URL = TestConfiguration.getRepositoryUrl("trac012"); - public static final String TEST_TRAC_TRUNK_URL = "http://" + SERVER + "/tractrunk"; + public static final String TEST_TRAC_TRUNK_URL = TestConfiguration.getRepositoryUrl("tractrunk"); - public static final String TEST_TRAC_INVALID_URL = "http://" + SERVER + "/doesnotexist"; + public static final String TEST_TRAC_INVALID_URL = TestConfiguration.getRepositoryUrl("doesnotexist"); } |