Bug 247177 - Profile registry loading fails when bogus file in the registry folder

2 files changed, 26 insertions, 0 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/AllTests.java
index ef7e02a82..ec646d46f 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/AllTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/AllTests.java
@@ -26,6 +26,7 @@ public class AllTests extends TestCase {
 		suite.addTestSuite(ProfileTest.class);
 		suite.addTestSuite(ProfileRegistryTest.class);
 		suite.addTestSuite(TouchpointTest.class);
+		suite.addTestSuite(BogusRegistryContent.class);
 		return suite;
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/BogusRegistryContent.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/BogusRegistryContent.java
new file mode 100644
index 000000000..7585289a4
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/BogusRegistryContent.java
@@ -0,0 +1,25 @@
+package org.eclipse.equinox.p2.tests.engine;
+
+import java.io.File;
+import java.io.IOException;
+import junit.framework.TestCase;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.equinox.internal.p2.engine.SimpleProfileRegistry;
+import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
+import org.eclipse.equinox.p2.tests.TestActivator;
+
+public class BogusRegistryContent extends TestCase {
+	public void testBogusRegistry() {
+		//		new SimpleProfileRegistry()
+		File registryFolder = null;
+		try {
+			registryFolder = new File(FileLocator.resolve(TestActivator.getContext().getBundle().getEntry("testData/engineTest/bogusRegistryContent/")).getPath());
+		} catch (IOException e) {
+			fail("Test not properly setup");
+		}
+		SimpleProfileRegistry registry = new SimpleProfileRegistry(registryFolder, null, false);
+		IProfile[] profiles = registry.getProfiles();
+		assertNotNull(profiles);
+		assertEquals(1, profiles.length);
+	}
+}