diff options
author | spingel | 2009-05-29 18:27:08 +0000 |
---|---|---|
committer | spingel | 2009-05-29 18:27:08 +0000 |
commit | 8f48d58cf901869ad86933a75737d5dca965c820 (patch) | |
tree | 7289ee2d2981d804720e186bbcac3367988e96a4 /org.eclipse.mylyn.tasks.tests | |
parent | 8a7062e4e5ab855b0b5d820e4e552ba79e00efc5 (diff) | |
download | org.eclipse.mylyn.tasks-8f48d58cf901869ad86933a75737d5dca965c820.tar.gz org.eclipse.mylyn.tasks-8f48d58cf901869ad86933a75737d5dca965c820.tar.xz org.eclipse.mylyn.tasks-8f48d58cf901869ad86933a75737d5dca965c820.zip |
NEW - bug 248778: [releng] backport changes to Eclipse 3.3
https://bugs.eclipse.org/bugs/show_bug.cgi?id=248778
Diffstat (limited to 'org.eclipse.mylyn.tasks.tests')
-rw-r--r-- | org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF | 3 | ||||
-rw-r--r-- | org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java | 80 |
2 files changed, 38 insertions, 45 deletions
diff --git a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF index b2af0ee17..299a8e89e 100644 --- a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF @@ -29,8 +29,7 @@ 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.equinox.security + org.eclipse.core.expressions 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 bde83aca5..1e94a23c8 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,22 +12,15 @@ 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; @@ -88,42 +81,43 @@ public class TaskRepositoryManagerTest extends TestCase { } } - @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)); - } + // 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)); +// } // public void testMigrationToSecureStorage() throws Exception { // TaskRepository repository1 = new TaskRepository("bugzilla", "http://repository1/"); |