diff options
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.tests')
5 files changed, 9 insertions, 13 deletions
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java index e42c18291..827a57ea1 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java @@ -122,7 +122,7 @@ public abstract class AbstractBugzillaTest extends TestCase { protected BugzillaReportSubmitForm makeExistingBugPost(RepositoryTaskData taskData) throws UnsupportedEncodingException { return BugzillaReportSubmitForm.makeExistingBugPost(taskData, repository.getUrl(), repository.getUserName(), - repository.getPassword(), null, repository.getCharacterEncoding()); + repository.getPassword(), repository.getCharacterEncoding()); } protected void synchAndAssertState(Set<AbstractRepositoryTask> tasks, RepositoryTaskSyncState state) { 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 8744134b1..dc2dd8719 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 @@ -102,7 +102,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { "-1", taskList); SearchHitCollector collector = new SearchHitCollector(TasksUiPlugin.getTaskListManager().getTaskList(), - repository, bugzillaQuery, null); + repository, bugzillaQuery); // operation.run(new NullProgressMonitor()); // BugzillaSearchQuery searchQuery = new BugzillaSearchQuery(collector); @@ -131,7 +131,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { sourceContextFile.deleteOnExit(); repository.setAuthenticationCredentials("wrong", "wrong"); try { - connector.attachContext(repository, task, "", TasksUiPlugin.getDefault().getProxySettings()); + connector.attachContext(repository, task, ""); } catch (CoreException e) { assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task.getSyncState()); assertNotNull(task.getTaskData()); @@ -378,7 +378,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { TasksUiPlugin.getDefault().getRepositoriesFilePath()); Set<AbstractRepositoryTask> changedTasks = connector.getOfflineTaskHandler().getChangedSinceLastSync( - repository, tasks, null); + repository, tasks); assertEquals(0, changedTasks.size()); String priority4 = null; @@ -409,7 +409,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { bugzillaReportSubmitForm = makeExistingBugPost(task5.getTaskData()); bugzillaReportSubmitForm.submitReportToRepository(connector.getClientManager().getClient(repository)); - changedTasks = connector.getOfflineTaskHandler().getChangedSinceLastSync(repository, tasks, null); + changedTasks = connector.getOfflineTaskHandler().getChangedSinceLastSync(repository, tasks); assertEquals("Changed reports expected ", 2, changedTasks.size()); assertTrue(tasks.containsAll(changedTasks)); for (AbstractRepositoryTask task : changedTasks) { diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java index 651419792..e653fee6a 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java @@ -99,7 +99,7 @@ public class BugzillaSearchEngineTest extends TestCase { QueryHitCollector collector = new QueryHitCollector(TasksUiPlugin.getTaskListManager().getTaskList()); - connector.performQuery(repositoryQuery, repository, TasksUiPlugin.getDefault().getProxySettings(), new NullProgressMonitor(), collector); + connector.performQuery(repositoryQuery, repository, new NullProgressMonitor(), collector); //results.addAll(connector.performQuery(repositoryQuery, new NullProgressMonitor(), new MultiStatus(TasksUiPlugin.PLUGIN_ID, IStatus.OK, "Query result", null))); return collector.getHits(); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java index e6fb0b380..b605d5394 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/RepositoryReportFactoryTest.java @@ -11,7 +11,6 @@ package org.eclipse.mylar.bugzilla.tests; -import java.net.Proxy; import junit.framework.TestCase; @@ -44,7 +43,7 @@ public class RepositoryReportFactoryTest extends TestCase { private RepositoryTaskData init(String taskId) throws CoreException { IOfflineTaskHandler handler = connector.getOfflineTaskHandler(); - RepositoryTaskData taskData = handler.downloadTaskData(repository, taskId, Proxy.NO_PROXY); + RepositoryTaskData taskData = handler.downloadTaskData(repository, taskId); return taskData; } diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java index a80746090..8725bf8a4 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java @@ -11,8 +11,6 @@ package org.eclipse.mylar.bugzilla.tests.headless; -import java.net.Proxy; - import junit.framework.TestCase; import org.eclipse.core.runtime.NullProgressMonitor; @@ -44,7 +42,6 @@ public class BugzillaQueryTest extends TestCase { private TaskRepository repository; private BugzillaRepositoryConnector connector; private IOfflineTaskHandler handler; - private Proxy proxy = Proxy.NO_PROXY; @Override protected void setUp() throws Exception { @@ -97,7 +94,7 @@ public class BugzillaQueryTest extends TestCase { // } public void testGetBug() throws Exception { - RepositoryTaskData taskData = handler.downloadTaskData(repository, "1", proxy); + RepositoryTaskData taskData = handler.downloadTaskData(repository, "1"); assertNotNull(taskData); assertEquals("user@mylar.eclipse.org", taskData.getAssignedTo()); @@ -119,7 +116,7 @@ public class BugzillaQueryTest extends TestCase { connector.init(taskList); BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(repository.getUrl(), queryUrlString, "description", "-1", taskList); - connector.performQuery(query, repository, null, new NullProgressMonitor(), collector); + connector.performQuery(query, repository, new NullProgressMonitor(), collector); assertEquals(2, collector.getHits().size()); for (AbstractQueryHit hit : collector.getHits()) { assertTrue(hit.getDescription().contains("search-match-test")); |