436398: change connector tests to reduce dependency on the UI

Change-Id: Ieb5a60ab2fc1ee0bb83d91d604570be3704c22a7
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=436398

7 files changed, 32 insertions, 19 deletions

diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/META-INF/MANIFEST.MF b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/META-INF/MANIFEST.MF
index 6d3b6353d..0a13f401a 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/META-INF/MANIFEST.MF
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.core/META-INF/MANIFEST.MF
@@ -15,6 +15,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.equinox.security
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.mylyn.internal.bugzilla.rest.core;x-friends:="org.eclipse.mylyn.bugzilla.rest.ui,org.eclipse.mylyn.bugzilla.rest.core.tests,org.eclipse.mylyn.bugzilla.rest.ui.tests",
+Export-Package: org.eclipse.mylyn.internal.bugzilla.rest.core,
  org.eclipse.mylyn.internal.bugzilla.rest.core.response.data
 Bundle-Vendor: Eclipse Mylyn
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.tests/META-INF/MANIFEST.MF b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.tests/META-INF/MANIFEST.MF
index 524afa81f..145f54574 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.tests/META-INF/MANIFEST.MF
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@ Require-Bundle: org.junit;bundle-version="4.8.2",
  org.eclipse.mylyn.commons.repositories.http.core;bundle-version="1.3.0",
  org.eclipse.mylyn.tasks.ui,
  org.eclipse.mylyn.tasks.core;bundle-version="3.11.0",
- org.eclipse.mylyn.bugzilla.rest.core,
- org.eclipse.mylyn.bugzilla.rest.ui
-Export-Package: org.eclipse.mylyn.bugzilla.rest.tests;x-internal:=true,
- org.eclipse.mylyn.bugzilla.rest.tests.tck;x-internal:=true
+ org.eclipse.mylyn.bugzilla.rest.ui,
+ org.eclipse.mylyn.bugzilla.rest.core;bundle-version="1.0.0"
+Export-Package: org.eclipse.mylyn.bugzilla.rest.tests,
+ org.eclipse.mylyn.bugzilla.rest.tests.tck,
+ org.eclipse.mylyn.bugzilla.rest.tests.tck.ui
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.tests/src/org/eclipse/mylyn/bugzilla/rest/tests/tck/ui/AbstractRepositorySettingsPageTest.java b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.tests/src/org/eclipse/mylyn/bugzilla/rest/tests/tck/ui/AbstractRepositorySettingsPageTest.java
index 34e05260f..cc683cf28 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.tests/src/org/eclipse/mylyn/bugzilla/rest/tests/tck/ui/AbstractRepositorySettingsPageTest.java
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.tests/src/org/eclipse/mylyn/bugzilla/rest/tests/tck/ui/AbstractRepositorySettingsPageTest.java
@@ -11,20 +11,19 @@
 
 package org.eclipse.mylyn.bugzilla.rest.tests.tck.ui;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.mylyn.bugzilla.rest.tests.AbstractTckTest;
 import org.eclipse.mylyn.bugzilla.rest.tests.TckFixture;
 import org.eclipse.mylyn.commons.sdk.util.Junit4TestFixtureRunner.FixtureDefinition;
 import org.eclipse.mylyn.commons.sdk.util.Junit4TestFixtureRunner.RunOnlyWhenProperty;
+import org.eclipse.mylyn.internal.bugzilla.rest.core.BugzillaRestConnector;
+import org.eclipse.mylyn.internal.bugzilla.rest.ui.BugzillaRestRepositoryConnectorUi;
 import org.eclipse.mylyn.internal.tasks.ui.wizards.EditRepositoryWizard;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.wizards.ITaskRepositoryPage;
 import org.eclipse.swt.widgets.Shell;
 import org.junit.After;
-import org.junit.Ignore;
+import org.junit.Before;
 import org.junit.Test;
 
 @FixtureDefinition(fixtureClass = TckFixture.class, fixtureType = "bugzillaREST")
@@ -36,6 +35,10 @@ public class AbstractRepositorySettingsPageTest extends AbstractTckTest {
 		super(fixture);
 	}
 
+	@Before
+	public void setup() {
+	}
+
 	@After
 	public void tearDown() throws Exception {
 		if (dialog != null) {
@@ -44,17 +47,18 @@ public class AbstractRepositorySettingsPageTest extends AbstractTckTest {
 	}
 
 	@Test
-	@Ignore
-	//we temporary disable this test (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=436398)
 	public void testApplyTo() {
 		TaskRepository repository = fixture().createRepository();
-		EditRepositoryWizard wizard = new EditRepositoryWizard(repository);
+		BugzillaRestConnector connector = new BugzillaRestConnector();
+		BugzillaRestRepositoryConnectorUi connectorUi = new BugzillaRestRepositoryConnectorUi(connector);
+		EditRepositoryWizard wizard = new EditRepositoryWizard(repository, connectorUi);
 		dialog = new WizardDialog(new Shell(), wizard);
 		dialog.create();
 		ITaskRepositoryPage page = wizard.getSettingsPage();
-		assertNull("repository.getCategory() should be null", repository.getCategory());
+		// we need this because save removes the static import of org.junit.Assert
+		org.junit.Assert.assertNull("repository.getCategory() should be null", repository.getCategory());
 		page.applyTo(repository);
-		assertEquals(TaskRepository.CATEGORY_BUGS, repository.getCategory());
+		org.junit.Assert.assertEquals(TaskRepository.CATEGORY_BUGS, repository.getCategory());
 	}
 
 }
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui.tests/META-INF/MANIFEST.MF b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui.tests/META-INF/MANIFEST.MF
index d0c24c699..ef1329321 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui.tests/META-INF/MANIFEST.MF
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui.tests/META-INF/MANIFEST.MF
@@ -7,4 +7,4 @@ Bundle-Vendor: Eclipse Mylyn
 Fragment-Host: org.eclipse.mylyn.bugzilla.rest.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.8.2"
-Export-Package: org.eclipse.mylyn.internal.bugzilla.rest.ui
+Export-Package: org.eclipse.mylyn.internal.bugzilla.rest.ui.tests
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/META-INF/MANIFEST.MF b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/META-INF/MANIFEST.MF
index 1b1906edd..6923416f0 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/META-INF/MANIFEST.MF
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Mylyn
 Bundle-Activator: org.eclipse.mylyn.internal.bugzilla.rest.ui.BugzillaRestUiPlugin
+Export-Package: org.eclipse.mylyn.internal.bugzilla.rest.ui
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/BugzillaRestRepositoryConnectorUi.java b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/BugzillaRestRepositoryConnectorUi.java
index 6339cb55c..9c83fff9c 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/BugzillaRestRepositoryConnectorUi.java
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/BugzillaRestRepositoryConnectorUi.java
@@ -13,6 +13,7 @@ package org.eclipse.mylyn.internal.bugzilla.rest.ui;
 
 import org.eclipse.jface.wizard.IWizard;
 import org.eclipse.mylyn.internal.bugzilla.rest.core.BugzillaRestCore;
+import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
 import org.eclipse.mylyn.tasks.core.ITaskMapping;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
@@ -23,7 +24,10 @@ import org.eclipse.mylyn.tasks.ui.wizards.NewTaskWizard;
 public class BugzillaRestRepositoryConnectorUi extends AbstractRepositoryConnectorUi {
 
 	public BugzillaRestRepositoryConnectorUi() {
-		// ignore
+	}
+
+	public BugzillaRestRepositoryConnectorUi(AbstractRepositoryConnector connector) {
+		super(connector);
 	}
 
 	@Override
@@ -33,7 +37,7 @@ public class BugzillaRestRepositoryConnectorUi extends AbstractRepositoryConnect
 
 	@Override
 	public ITaskRepositoryPage getSettingsPage(TaskRepository repository) {
-		return new BugzillaRestRepositorySettingsPage(repository);
+		return new BugzillaRestRepositorySettingsPage(repository, getConnector(), this);
 	}
 
 	@Override
diff --git a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/BugzillaRestRepositorySettingsPage.java b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/BugzillaRestRepositorySettingsPage.java
index 78c336c82..b57308c52 100644
--- a/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/BugzillaRestRepositorySettingsPage.java
+++ b/connector-bugzilla-rest/org.eclipse.mylyn.bugzilla.rest.ui/src/org/eclipse/mylyn/internal/bugzilla/rest/ui/BugzillaRestRepositorySettingsPage.java
@@ -14,7 +14,9 @@ package org.eclipse.mylyn.internal.bugzilla.rest.ui;
 import java.text.MessageFormat;
 
 import org.eclipse.mylyn.internal.bugzilla.rest.core.BugzillaRestCore;
+import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
+import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
 import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
 import org.eclipse.swt.widgets.Composite;
 
@@ -25,8 +27,9 @@ public class BugzillaRestRepositorySettingsPage extends AbstractRepositorySettin
 			"Supports Bugzilla {0} Example: https://bugs.eclipse.org/bugs/ (do not include rest.cgi)",
 			LABEL_VERSION_NUMBER);
 
-	public BugzillaRestRepositorySettingsPage(TaskRepository taskRepository) {
-		super("Bugzilla REST Repository Settings", DESCRIPTION, taskRepository);
+	public BugzillaRestRepositorySettingsPage(TaskRepository taskRepository, AbstractRepositoryConnector connector,
+			AbstractRepositoryConnectorUi connectorUi) {
+		super("Bugzilla REST Repository Settings", DESCRIPTION, taskRepository, connector, connectorUi);
 		setNeedsAnonymousLogin(true);
 		setNeedsValidateOnFinish(true);
 	}