Bug 290984 - [core] merge IServiceUI and IServiceUICheckUnsigned

Bug 291049 -  [ui] IServiceUI declaration using ds causes test failures in N20090930

8 files changed, 62 insertions, 62 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/CertificateCheckerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/CertificateCheckerTest.java
index 81ff48ca3..5e3d14e6f 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/CertificateCheckerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/CertificateCheckerTest.java
@@ -38,13 +38,9 @@ public class CertificateCheckerTest extends AbstractProvisioningTest {
 			return null;
 		}
 
-		public boolean promptForUnsignedContent(String[] details) {
+		public TrustInfo getTrustInfo(Certificate[][] untrustedChain, String[] unsignedDetail) {
 			wasPrompted = true;
-			return unsignedReturnValue;
-		}
-
-		public Certificate[] showCertificates(Certificate[][] certificates) {
-			return null;
+			return new TrustInfo(null, false, unsignedReturnValue);
 		}
 
 	}
@@ -150,4 +146,29 @@ public class CertificateCheckerTest extends AbstractProvisioningTest {
 			System.getProperties().remove(EngineActivator.PROP_UNSIGNED_POLICY);
 		}
 	}
+
+	/**
+	 * Tests that trust checks that occur in a headless environment are properly treated
+	 * as permissive, but not persistent, the same way as it would be if the service registration
+	 * were not there.
+	 */
+	public void testBug291049() {
+		try {
+
+			// Intentionally unregister our service so that we get whatever the default (or null) service is
+			// in an SDK configuration.  
+			if (serviceReg != null) {
+				serviceReg.unregister();
+				serviceReg = null;
+			}
+			checker.add(unsigned);
+			// TODO need to add some untrusted files here, too.  To prove that we treated them as trusted temporarily
+
+			System.getProperties().setProperty(EngineActivator.PROP_UNSIGNED_POLICY, EngineActivator.UNSIGNED_PROMPT);
+			IStatus result = checker.start();
+			assertTrue("1.0", result.isOK());
+		} finally {
+			System.getProperties().remove(EngineActivator.PROP_UNSIGNED_POLICY);
+		}
+	}
 }
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/AllServerTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/AllServerTests.java
index 02ceda810..3eaff84b3 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/AllServerTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/AllServerTests.java
@@ -182,18 +182,10 @@ public class AllServerTests extends TestCase {
 		}
 
 		/**
-		 * No need to implement
-		 */
-		public Certificate[] showCertificates(Certificate[][] certificates) {
-			return null;
-		}
-
-		/**
 		 * Not used
 		 */
-		public boolean promptForUnsignedContent(String[] details) {
-			return true;
+		public TrustInfo getTrustInfo(Certificate[][] untrustedChain, String[] unsignedDetail) {
+			return new TrustInfo(null, false, true);
 		}
-
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/AuthTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/AuthTest.java
index b4c1b9fcc..6da986266 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/AuthTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/AuthTest.java
@@ -99,13 +99,11 @@ public class AuthTest extends ServerBasedTestCase {
 			return previousInfo;
 		}
 
-		public Certificate[] showCertificates(Certificate[][] certificates) {
-			return null;
+		/**
+		 * Not used
+		 */
+		public TrustInfo getTrustInfo(Certificate[][] untrustedChain, String[] unsignedDetail) {
+			return new TrustInfo(null, false, true);
 		}
-
-		public boolean promptForUnsignedContent(String[] details) {
-			return true;
-		}
-
 	}
 }
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/HttpStatusTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/HttpStatusTest.java
index bccd83c60..e05f0fb08 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/HttpStatusTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/HttpStatusTest.java
@@ -189,13 +189,11 @@ public class HttpStatusTest extends ServerBasedTestCase {
 			return previousInfo;
 		}
 
-		public Certificate[] showCertificates(Certificate[][] certificates) {
-			return null;
+		/**
+		 * Not used
+		 */
+		public TrustInfo getTrustInfo(Certificate[][] untrustedChain, String[] unsignedDetail) {
+			return new TrustInfo(null, false, true);
 		}
-
-		public boolean promptForUnsignedContent(String[] details) {
-			return true;
-		}
-
 	}
 }
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/TimeoutTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/TimeoutTest.java
index 0cab9cf05..e5e267130 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/TimeoutTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/TimeoutTest.java
@@ -174,12 +174,11 @@ public class TimeoutTest extends ServerBasedTestCase {
 			return previousInfo;
 		}
 
-		public Certificate[] showCertificates(Certificate[][] certificates) {
-			return null;
-		}
-
-		public boolean promptForUnsignedContent(String[] details) {
-			return true;
+		/**
+		 * Not used
+		 */
+		public TrustInfo getTrustInfo(Certificate[][] untrustedChain, String[] unsignedDetail) {
+			return new TrustInfo(null, false, true);
 		}
 
 	}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/TimeoutTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/TimeoutTest.java
index 9d60d68c4..b7a98d8bf 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/TimeoutTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/TimeoutTest.java
@@ -226,12 +226,11 @@ public class TimeoutTest extends AbstractTestServerClientCase {
 			return previousInfo;
 		}
 
-		public Certificate[] showCertificates(Certificate[][] certificates) {
-			return null;
-		}
-
-		public boolean promptForUnsignedContent(String[] details) {
-			return true;
+		/**
+		 * Not used
+		 */
+		public TrustInfo getTrustInfo(Certificate[][] untrustedChain, String[] unsignedDetail) {
+			return new TrustInfo(null, false, true);
 		}
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/AbstractTestServerClientCase.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/AbstractTestServerClientCase.java
index ce14e91a7..e1f59af8c 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/AbstractTestServerClientCase.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/AbstractTestServerClientCase.java
@@ -115,12 +115,11 @@ public class AbstractTestServerClientCase extends TestCase {
 			return previousInfo;
 		}
 
-		public Certificate[] showCertificates(Certificate[][] certificates) {
-			return null;
-		}
-
-		public boolean promptForUnsignedContent(String[] details) {
-			return true;
+		/**
+		 * Not used
+		 */
+		public TrustInfo getTrustInfo(Certificate[][] untrustedChain, String[] unsignedDetail) {
+			return new TrustInfo(null, false, true);
 		}
 	}
 
@@ -142,12 +141,11 @@ public class AbstractTestServerClientCase extends TestCase {
 			return previousInfo;
 		}
 
-		public Certificate[] showCertificates(Certificate[][] certificates) {
-			return null;
-		}
-
-		public boolean promptForUnsignedContent(String[] details) {
-			return true;
+		/**
+		 * Not used
+		 */
+		public TrustInfo getTrustInfo(Certificate[][] untrustedChain, String[] unsignedDetail) {
+			return new TrustInfo(null, false, true);
 		}
 
 	}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/TestServerController.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/TestServerController.java
index a7ce95417..621716753 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/TestServerController.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/TestServerController.java
@@ -154,15 +154,10 @@ public class TestServerController {
 		}
 
 		/**
-		 * No need to implement
+		 * Not used
 		 */
-		public Certificate[] showCertificates(Certificate[][] certificates) {
-			return null;
-		}
-
-		public boolean promptForUnsignedContent(String[] details) {
-			return true;
+		public TrustInfo getTrustInfo(Certificate[][] untrustedChain, String[] unsignedDetail) {
+			return new TrustInfo(null, false, true);
 		}
-
 	}
 }
\ No newline at end of file