Bug 280917 - [target] Target platform created with 3.4 doesn't work with 3.5
diff --git a/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF
index ec97d81..0f93db5 100644
--- a/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: PDE JUnit Tests
Bundle-SymbolicName: org.eclipse.pde.ui.tests; singleton:=true
-Bundle-Version: 3.1.100.qualifier
+Bundle-Version: 3.1.101.qualifier
Bundle-ClassPath: tests.jar
Bundle-Activator: org.eclipse.pde.internal.ui.tests.macro.MacroPlugin
Bundle-Vendor: Eclipse.org
diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java
index b9f5865..9f06f03 100644
--- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java
+++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/TargetDefinitionPersistenceTests.java
@@ -491,10 +491,14 @@
for (int i = 0; i < containers.length; i++) {
IBundleContainer container = containers[i];
BundleInfo[] actual = container.getIncludedBundles();
- assertNotNull(actual);
- assertEquals("Wrong number of restrictions", restrictions.length, actual.length);
- for (int j = 0; j < actual.length; j++) {
- assertEquals("Wrong restriction", restrictions[j], actual[j]);
+ if (container instanceof FeatureBundleContainer) {
+ assertNull(actual);
+ } else {
+ assertNotNull(actual);
+ assertEquals("Wrong number of restrictions", restrictions.length, actual.length);
+ for (int j = 0; j < actual.length; j++) {
+ assertEquals("Wrong restriction", restrictions[j], actual[j]);
+ }
}
}
}
@@ -540,10 +544,14 @@
for (int i = 0; i < containers.length; i++) {
IBundleContainer container = containers[i];
BundleInfo[] actual = container.getIncludedBundles();
- assertNotNull(actual);
- assertEquals("Wrong number of restrictions", restrictions.length, actual.length);
- for (int j = 0; j < actual.length; j++) {
- assertEquals("Wrong restriction", restrictions[j], actual[j]);
+ if (container instanceof FeatureBundleContainer) {
+ assertNull(actual);
+ } else {
+ assertNotNull(actual);
+ assertEquals("Wrong number of restrictions", restrictions.length, actual.length);
+ for (int j = 0; j < actual.length; j++) {
+ assertEquals("Wrong restriction", restrictions[j], actual[j]);
+ }
}
}
}
@@ -590,17 +598,21 @@
for (int i = 0; i < containers.length; i++) {
IBundleContainer container = containers[i];
BundleInfo[] actual = container.getIncludedBundles();
- assertNotNull(actual);
- assertEquals("Wrong number of inclusions", included.length, actual.length);
- for (int j = 0; j < actual.length; j++) {
- assertEquals("Wrong restriction", included[j], actual[j]);
+ if (container instanceof FeatureBundleContainer) {
+ assertNull(actual);
+ } else {
+ assertNotNull(actual);
+ assertEquals("Wrong number of inclusions", included.length, actual.length);
+ for (int j = 0; j < actual.length; j++) {
+ assertEquals("Wrong restriction", included[j], actual[j]);
+ }
+ actual = container.getOptionalBundles();
+ assertNotNull(actual);
+ assertEquals("Wrong number of optionals", optional.length, actual.length);
+ for (int j = 0; j < actual.length; j++) {
+ assertEquals("Wrong restriction", optional[j], actual[j]);
+ }
}
- actual = container.getOptionalBundles();
- assertNotNull(actual);
- assertEquals("Wrong number of optionals", optional.length, actual.length);
- for (int j = 0; j < actual.length; j++) {
- assertEquals("Wrong restriction", optional[j], actual[j]);
- }
}
}
