Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryEditorWizardTest.java17
-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/TaskList06DataMigrationTest.java4
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/UrlConnectionUtilTest.java2
-rw-r--r--org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF3
7 files changed, 18 insertions, 16 deletions
diff --git a/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF
index c0dcc3388..34c19c6d8 100644
--- a/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.bugzilla.tests/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.mylar.tasks.tests,
org.eclipse.mylar.context.core,
org.eclipse.mylar.tasks.core,
- org.eclipse.ui.forms
+ org.eclipse.ui.forms,
+ org.eclipse.mylar
Eclipse-AutoStart: true
Bundle-Vendor: Eclipse.org
Bundle-ClassPath: bugzilla-test.jar
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
index 467dcbb76..cf0fda9f5 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
@@ -27,6 +27,7 @@ import org.apache.commons.httpclient.params.HttpConnectionParams;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.mylar.context.core.ContextCorePlugin;
+import org.eclipse.mylar.core.net.SslProtocolSocketFactory;
import org.eclipse.mylar.internal.bugzilla.core.BugzillaClient;
import org.eclipse.mylar.internal.bugzilla.core.BugzillaCorePlugin;
import org.eclipse.mylar.internal.bugzilla.core.BugzillaQueryHit;
@@ -35,7 +36,6 @@ import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryQuery;
import org.eclipse.mylar.internal.bugzilla.core.BugzillaTask;
import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylar.internal.bugzilla.core.RepositoryConfiguration;
-import org.eclipse.mylar.internal.tasks.core.SslProtocolSocketFactory;
import org.eclipse.mylar.tasks.core.AbstractQueryHit;
import org.eclipse.mylar.tasks.core.AbstractRepositoryTask;
import org.eclipse.mylar.tasks.core.ITask;
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryEditorWizardTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryEditorWizardTest.java
index a6b04baab..aea3a3fec 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryEditorWizardTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryEditorWizardTest.java
@@ -27,7 +27,6 @@ import org.eclipse.mylar.internal.bugzilla.ui.tasklist.BugzillaRepositorySetting
import org.eclipse.mylar.internal.tasks.ui.wizards.EditRepositoryWizard;
import org.eclipse.mylar.tasks.core.TaskRepository;
import org.eclipse.mylar.tasks.core.TaskRepositoryManager;
-import org.eclipse.mylar.tasks.core.web.WebClientUtil;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.ui.PlatformUI;
@@ -36,9 +35,9 @@ import org.eclipse.ui.PlatformUI;
*/
public class RepositoryEditorWizardTest extends TestCase {
- TaskRepositoryManager manager;
+ private TaskRepositoryManager manager;
- TaskRepository repository;
+ private TaskRepository repository;
@Override
protected void setUp() throws Exception {
@@ -66,7 +65,7 @@ public class RepositoryEditorWizardTest extends TestCase {
page.setPassword("bogus");
try {
BugzillaClient client = BugzillaClientFactory.createClient(page.getServerUrl(), page.getUserName(), page
- .getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil
+ .getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), TaskRepository
.getSystemProxy(), page.getCharacterEncoding());
client.validate();
} catch (CoreException e) {
@@ -83,7 +82,7 @@ public class RepositoryEditorWizardTest extends TestCase {
page.setUserId("bogus");
try {
BugzillaClient client = BugzillaClientFactory.createClient(page.getServerUrl(), page.getUserName(), page
- .getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil
+ .getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), TaskRepository
.getSystemProxy(), page.getCharacterEncoding());
client.validate();
} catch (CoreException e) {
@@ -100,7 +99,7 @@ public class RepositoryEditorWizardTest extends TestCase {
page.setUrl("http://invalid");
try {
BugzillaClient client = BugzillaClientFactory.createClient(page.getServerUrl(), page.getUserName(), page
- .getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil
+ .getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), TaskRepository
.getSystemProxy(), page.getCharacterEncoding());
client.validate();
} catch (UnknownHostException e) {
@@ -135,7 +134,7 @@ public class RepositoryEditorWizardTest extends TestCase {
dialog.create();
BugzillaRepositorySettingsPage page = (BugzillaRepositorySettingsPage) wizard.getSettingsPage();
BugzillaClient client = BugzillaClientFactory.createClient(page.getServerUrl(), page.getUserName(), page
- .getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil.getSystemProxy(),
+ .getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), TaskRepository.getSystemProxy(),
page.getCharacterEncoding());
client.validate();
page.setUrl(IBugzillaConstants.TEST_BUGZILLA_218_URL);
@@ -155,7 +154,7 @@ public class RepositoryEditorWizardTest extends TestCase {
dialog.create();
BugzillaRepositorySettingsPage page = (BugzillaRepositorySettingsPage) wizard.getSettingsPage();
BugzillaClient client = BugzillaClientFactory.createClient(page.getServerUrl(), page.getUserName(), page
- .getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil.getSystemProxy(),
+ .getPassword(), page.getHttpAuthUserId(), page.getHttpAuthPassword(), TaskRepository.getSystemProxy(),
page.getCharacterEncoding());
client.validate();
page.setUserId("bogus");
@@ -170,7 +169,7 @@ public class RepositoryEditorWizardTest extends TestCase {
page = (BugzillaRepositorySettingsPage) wizard.getSettingsPage();
try {
client = BugzillaClientFactory.createClient(page.getServerUrl(), page.getUserName(), page.getPassword(),
- page.getHttpAuthUserId(), page.getHttpAuthPassword(), WebClientUtil.getSystemProxy(), page
+ page.getHttpAuthUserId(), page.getHttpAuthPassword(), TaskRepository.getSystemProxy(), page
.getCharacterEncoding());
client.validate();
} catch (CoreException e) {
diff --git a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
index 1f310c345..776a0fa35 100644
--- a/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.tests/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.forms,
org.eclipse.mylar.resources.tests,
org.eclipse.mylar.tasks.web,
- org.eclipse.mylar.monitor.core
+ org.eclipse.mylar.monitor.core,
+ org.eclipse.mylar
Eclipse-AutoStart: true
Bundle-ClassPath: mylar-tasklist-tests.jar
Export-Package: org.eclipse.mylar.tasks.tests,
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskList06DataMigrationTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskList06DataMigrationTest.java
index fae8f834c..9438f2176 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskList06DataMigrationTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskList06DataMigrationTest.java
@@ -19,9 +19,9 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.mylar.context.core.MylarStatusHandler;
+import org.eclipse.mylar.core.MylarStatusHandler;
import org.eclipse.mylar.internal.context.core.MylarContextManager;
-import org.eclipse.mylar.internal.context.core.util.ZipFileUtil;
+import org.eclipse.mylar.internal.core.util.ZipFileUtil;
import org.eclipse.mylar.internal.tasks.ui.ITasksUiConstants;
import org.eclipse.mylar.internal.tasks.ui.WorkspaceAwareContextStore;
import org.eclipse.mylar.tasks.core.TaskRepositoryManager;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/UrlConnectionUtilTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/UrlConnectionUtilTest.java
index bece5c26f..0e76cd0d4 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/UrlConnectionUtilTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/UrlConnectionUtilTest.java
@@ -10,7 +10,7 @@ package org.eclipse.mylar.tasks.tests;
import junit.framework.TestCase;
-import org.eclipse.mylar.tasks.core.web.WebClientUtil;
+import org.eclipse.mylar.core.net.WebClientUtil;
public class UrlConnectionUtilTest extends TestCase {
diff --git a/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
index e939d4473..48ba04ca3 100644
--- a/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,8 @@ Require-Bundle: org.junit,
org.eclipse.mylar.core.tests,
org.eclipse.mylar.trac.ui,
org.eclipse.mylar.trac.core,
- org.eclipse.search
+ org.eclipse.search,
+ org.eclipse.mylar
Export-Package: org.eclipse.mylar.trac.tests
Bundle-Activator: org.eclipse.mylar.trac.tests.TracTestPlugin
Eclipse-LazyStart: true

Back to the top