diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/CompositeArtifactRepositoryTest.java')
-rw-r--r-- | bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/CompositeArtifactRepositoryTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/CompositeArtifactRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/CompositeArtifactRepositoryTest.java index 23769f6d9..0e329b73c 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/CompositeArtifactRepositoryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/CompositeArtifactRepositoryTest.java @@ -1386,11 +1386,11 @@ public class CompositeArtifactRepositoryTest extends AbstractProvisioningTest { IArtifactRepository repo = null; IArtifactRepositoryManager manager = getArtifactRepositoryManager(); - File repoFile = getTestData("Strict composite with missing child", "/testData/artifactRepo/compositeBadChildren"); + File repoFile = getTestData("Atomic composite with missing child", "/testData/artifactRepo/composite/missingChild/atomicLoading"); URI correctChildURI = URIUtil.append(repoFile.toURI(), "one"); URI repoURI = repoFile.getAbsoluteFile().toURI(); - File alreadyLoadedChildFile = getTestData("Strict composite with missing child", "/testData/artifactRepo/compositeBadChildren/three"); + File alreadyLoadedChildFile = getTestData("Atomic composite with missing child", "/testData/artifactRepo/composite/missingChild/atomicLoading/three"); IArtifactRepository alreadyLoadedChild = manager.loadRepository(alreadyLoadedChildFile.toURI(), null); assertNotNull(alreadyLoadedChild); URI previouslyAddedChildURI = URIUtil.append(repoFile.toURI(), "three"); @@ -1406,7 +1406,7 @@ public class CompositeArtifactRepositoryTest extends AbstractProvisioningTest { } assertNull(repo); assertTrue("an exception should have been reported", exception); - assertFalse("Successfully loaded child should be removed when composite loading mode is set to strict", manager.contains(correctChildURI)); + assertFalse("Successfully loaded child should be removed when composite loading mode is set to atomic", manager.contains(correctChildURI)); assertTrue("Periously loaded child should remain in repo manager", manager.contains(previouslyAddedChildURI)); } @@ -1416,7 +1416,7 @@ public class CompositeArtifactRepositoryTest extends AbstractProvisioningTest { IArtifactRepository repo = null; IArtifactRepositoryManager manager = getArtifactRepositoryManager(); - File repoFile = getTestData("Composite with missing child", "/testData/artifactRepo/compositeBadChildrenLenient"); + File repoFile = getTestData("Composite with missing child", "/testData/artifactRepo/composite/missingChild/nonAtomicLoading"); URI correctChildURI = URIUtil.append(repoFile.toURI(), "one"); assertFalse("Child should not be available in repo manager", manager.contains(correctChildURI)); |