Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspingel2009-08-19 07:41:47 +0000
committerspingel2009-08-19 07:41:47 +0000
commitd2e96054aee919543add05003fc1b62febc3c9b5 (patch)
tree215c88e811d8167b18682e7ae7aa186bbe16489b /org.eclipse.mylyn.tasks.tests
parentc9f42201e232e7030c8addb4f1eef81bca591d6d (diff)
downloadorg.eclipse.mylyn.tasks-d2e96054aee919543add05003fc1b62febc3c9b5.tar.gz
org.eclipse.mylyn.tasks-d2e96054aee919543add05003fc1b62febc3c9b5.tar.xz
org.eclipse.mylyn.tasks-d2e96054aee919543add05003fc1b62febc3c9b5.zip
NEW - bug 219385: [e3.4] remove reflective legacy calls
https://bugs.eclipse.org/bugs/show_bug.cgi?id=219385
Diffstat (limited to 'org.eclipse.mylyn.tasks.tests')
-rw-r--r--org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java120
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryTest.java1
3 files changed, 65 insertions, 59 deletions
diff --git a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
index 299a8e89e..b2af0ee17 100644
--- a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
@@ -29,7 +29,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.mylyn.tasks.bugs,
org.eclipse.mylyn.commons.core,
org.eclipse.ui.browser,
- org.eclipse.core.expressions
+ org.eclipse.core.expressions,
+ org.eclipse.equinox.security
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: mylyn-tasklist-tests.jar
Export-Package: org.eclipse.mylyn.tasks.tests;x-internal:=true,
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java
index 3e412948b..adeaf780e 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java
@@ -12,15 +12,22 @@
package org.eclipse.mylyn.tasks.tests;
import java.net.MalformedURLException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import junit.framework.TestCase;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.equinox.security.storage.EncodingUtils;
+import org.eclipse.equinox.security.storage.ISecurePreferences;
+import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
import org.eclipse.mylyn.commons.net.AuthenticationType;
import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
+import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil;
import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
@@ -43,25 +50,25 @@ public class TaskRepositoryManagerTest extends TestCase {
private static final String ANOTHER_URL = "http://codehaus.org";
-// private final String USERNAME = ".username"; //$NON-NLS-1$
-//
-// private final String PASSWORD = ".password"; //$NON-NLS-1$
-//
-// private final String AUTH_REPOSITORY = "org.eclipse.mylyn.tasklist.repositories"; //$NON-NLS-1$
-//
-// private final String AUTH_PASSWORD = AUTH_REPOSITORY + PASSWORD;
-//
-// private final String AUTH_USERNAME = AUTH_REPOSITORY + USERNAME;
-//
-// private final String AUTH_HTTP = "org.eclipse.mylyn.tasklist.repositories.httpauth"; //$NON-NLS-1$
-//
-// private final String AUTH_HTTP_PASSWORD = AUTH_HTTP + PASSWORD;
-//
-// private final String AUTH_HTTP_USERNAME = AUTH_HTTP + USERNAME;
-//
-// private final String AUTH_SCHEME = "Basic"; //$NON-NLS-1$
-//
-// private final String AUTH_REALM = ""; //$NON-NLS-1$
+ private final String USERNAME = ".username"; //$NON-NLS-1$
+
+ private final String PASSWORD = ".password"; //$NON-NLS-1$
+
+ private final String AUTH_REPOSITORY = "org.eclipse.mylyn.tasklist.repositories"; //$NON-NLS-1$
+
+ private final String AUTH_PASSWORD = AUTH_REPOSITORY + PASSWORD;
+
+ private final String AUTH_USERNAME = AUTH_REPOSITORY + USERNAME;
+
+ private final String AUTH_HTTP = "org.eclipse.mylyn.tasklist.repositories.httpauth"; //$NON-NLS-1$
+
+ private final String AUTH_HTTP_PASSWORD = AUTH_HTTP + PASSWORD;
+
+ private final String AUTH_HTTP_USERNAME = AUTH_HTTP + USERNAME;
+
+ private final String AUTH_SCHEME = "Basic"; //$NON-NLS-1$
+
+ private final String AUTH_REALM = ""; //$NON-NLS-1$
private TaskRepositoryManager manager;
@@ -81,44 +88,44 @@ public class TaskRepositoryManagerTest extends TestCase {
}
}
- // TODO e3.4 re-enable keystore tests
-// @SuppressWarnings("deprecation")
-// public void testsUseSecureStorage() throws Exception {
-// TaskRepository repository = new TaskRepository("bugzilla", "http://repository2/");
-// repository.setProperty(ITasksCoreConstants.PROPERTY_USE_SECURE_STORAGE, "true");
-// repository.setCredentials(AuthenticationType.REPOSITORY, new AuthenticationCredentials("testUserName",
-// "testPassword"), true);
-//
-// ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault()
-// .node(ITasksCoreConstants.ID_PLUGIN);
-// securePreferences = securePreferences.node(EncodingUtils.encodeSlashes(repository.getUrl()));
-// assertEquals("testPassword", securePreferences.get(AUTH_PASSWORD, null));
-// assertEquals("testUserName", repository.getProperty(AUTH_USERNAME));
-// assertEquals("shouldbenull", securePreferences.get(AUTH_USERNAME, "shouldbenull"));
-// assertNull(Platform.getAuthorizationInfo(new URL(repository.getUrl()), AUTH_REALM, AUTH_SCHEME));
-// }
-//
-// @SuppressWarnings("deprecation")
-// public void testsUseKeyring() throws Exception {
-// TaskRepository repository = new TaskRepository("bugzilla", "http://repository3/");
-// repository.setCredentials(AuthenticationType.REPOSITORY, new AuthenticationCredentials("testUserName",
-// "testPassword"), true);
-//
-// repository.setCredentials(AuthenticationType.HTTP,
-// new AuthenticationCredentials("httpUserName", "httpPassword"), true);
-//
-// ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault()
-// .node(ITasksCoreConstants.ID_PLUGIN);
-// securePreferences = securePreferences.node(EncodingUtils.encodeSlashes(repository.getUrl()));
-// assertNull(securePreferences.get(AUTH_PASSWORD, null));
-// assertNull("testUserName", repository.getProperty(AUTH_USERNAME));
-// Map map = Platform.getAuthorizationInfo(new URL(repository.getUrl()), AUTH_REALM, AUTH_SCHEME);
-// assertEquals("testUserName", map.get(AUTH_USERNAME));
-// assertEquals("testPassword", map.get(AUTH_PASSWORD));
-// assertEquals("httpUserName", map.get(AUTH_HTTP_USERNAME));
-// assertEquals("httpPassword", map.get(AUTH_HTTP_PASSWORD));
-// }
+ @SuppressWarnings("deprecation")
+ public void testsUseSecureStorage() throws Exception {
+ TaskRepository repository = new TaskRepository("bugzilla", "http://repository2/");
+ repository.setProperty(ITasksCoreConstants.PROPERTY_USE_SECURE_STORAGE, "true");
+ repository.setCredentials(AuthenticationType.REPOSITORY, new AuthenticationCredentials("testUserName",
+ "testPassword"), true);
+ ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault()
+ .node(ITasksCoreConstants.ID_PLUGIN);
+ securePreferences = securePreferences.node(EncodingUtils.encodeSlashes(repository.getUrl()));
+ assertEquals("testPassword", securePreferences.get(AUTH_PASSWORD, null));
+ assertEquals("testUserName", repository.getProperty(AUTH_USERNAME));
+ assertEquals("shouldbenull", securePreferences.get(AUTH_USERNAME, "shouldbenull"));
+ assertNull(Platform.getAuthorizationInfo(new URL(repository.getUrl()), AUTH_REALM, AUTH_SCHEME));
+ }
+
+ @SuppressWarnings("deprecation")
+ public void testsUseKeyring() throws Exception {
+ TaskRepository repository = new TaskRepository("bugzilla", "http://repository3/");
+ repository.setCredentials(AuthenticationType.REPOSITORY, new AuthenticationCredentials("testUserName",
+ "testPassword"), true);
+
+ repository.setCredentials(AuthenticationType.HTTP,
+ new AuthenticationCredentials("httpUserName", "httpPassword"), true);
+
+ ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault()
+ .node(ITasksCoreConstants.ID_PLUGIN);
+ securePreferences = securePreferences.node(EncodingUtils.encodeSlashes(repository.getUrl()));
+ assertNull(securePreferences.get(AUTH_PASSWORD, null));
+ assertNull("testUserName", repository.getProperty(AUTH_USERNAME));
+ Map<?, ?> map = Platform.getAuthorizationInfo(new URL(repository.getUrl()), AUTH_REALM, AUTH_SCHEME);
+ assertEquals("testUserName", map.get(AUTH_USERNAME));
+ assertEquals("testPassword", map.get(AUTH_PASSWORD));
+ assertEquals("httpUserName", map.get(AUTH_HTTP_USERNAME));
+ assertEquals("httpPassword", map.get(AUTH_HTTP_PASSWORD));
+ }
+
+ // FIXME 3.3 re-enable test
// public void testMigrationToSecureStorage() throws Exception {
// TaskRepository repository1 = new TaskRepository("bugzilla", "http://repository1/");
//
@@ -148,7 +155,6 @@ public class TaskRepositoryManagerTest extends TestCase {
// assertEquals("testpassword", securePreferences.get(AUTH_PASSWORD, null));
// assertEquals("testhttpuser", securePreferences.get(AUTH_HTTP_USERNAME, null));
// assertEquals("testhttppassword", securePreferences.get(AUTH_HTTP_PASSWORD, null));
-//
// }
public void testRepositoryWithSlash() throws MalformedURLException {
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryTest.java
index c9a204f09..8e0e67f34 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryTest.java
@@ -99,7 +99,6 @@ public class TaskRepositoryTest extends TestCase {
assertTrue(Platform.isRunning());
}
- // TODO e3.4 move to new api
@SuppressWarnings("deprecation")
public void password(AuthenticationType authType) throws Exception {
URL url = new URL("http://url");

Back to the top