Bug 220818 Add graduated security bundles to the build

2 files changed, 21 insertions, 4 deletions

diff --git a/bundles/org.eclipse.equinox.security.tests/build.properties b/bundles/org.eclipse.equinox.security.tests/build.properties
index dc993f980..2b9d52b26 100644
--- a/bundles/org.eclipse.equinox.security.tests/build.properties
+++ b/bundles/org.eclipse.equinox.security.tests/build.properties
@@ -4,6 +4,8 @@ bin.includes = META-INF/,\
                .,\
                about.html,\
                plugin.xml,\
-               Plugin_Testing/
+               Plugin_Testing/,\
+               test.xml,\
+               SecurePrefsSample/
 src.includes = about.html,\
                src/
diff --git a/bundles/org.eclipse.equinox.security.tests/src/org/eclipse/equinox/internal/security/tests/storage/SecurePreferencesTest.java b/bundles/org.eclipse.equinox.security.tests/src/org/eclipse/equinox/internal/security/tests/storage/SecurePreferencesTest.java
index 0581ad67c..053ed67f0 100644
--- a/bundles/org.eclipse.equinox.security.tests/src/org/eclipse/equinox/internal/security/tests/storage/SecurePreferencesTest.java
+++ b/bundles/org.eclipse.equinox.security.tests/src/org/eclipse/equinox/internal/security/tests/storage/SecurePreferencesTest.java
@@ -115,9 +115,7 @@ abstract public class SecurePreferencesTest extends StorageAbstractTest {
 		String[] leafKeys = node3.keys();
 		assertNotNull(leafKeys);
 		assertEquals(leafKeys.length, 3);
-		boolean order1 = secondKey.equals(leafKeys[0]) && key.equals(leafKeys[1]);
-		boolean order2 = secondKey.equals(leafKeys[1]) && key.equals(leafKeys[0]);
-		assertTrue(order1 || order2);
+		findAll(new String[] {clearTextKey, key, secondKey}, leafKeys);
 	}
 
 	/**
@@ -486,6 +484,23 @@ abstract public class SecurePreferencesTest extends StorageAbstractTest {
 		}
 	}
 
+	// assumes all entries are unique and array1 has no null elements
+	private void findAll(String[] array1, String[] array2) {
+		assertNotNull(array1);
+		assertNotNull(array2);
+		assertEquals(array1.length, array2.length);
+		for (int i = 0; i < array1.length; i++) {
+			boolean found = false;
+			for (int j = 0; j < array2.length; j++) {
+				if (array1[i].equals(array2[j])) {
+					found = true;
+					break;
+				}
+			}
+			assertTrue(found);
+		}
+	}
+
 	private void compareArrays(byte[] array1, byte[] array2) {
 		assertNotNull(array1);
 		assertNotNull(array2);