summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Bull2013-03-14 17:30:37 (EDT)
committerIan Bull2013-03-14 17:30:37 (EDT)
commitbb5713948807de4101b7043632b6f46397786629 (patch)
treef762768ed2de70b64ddfc06d2a7d9f8b0961a4b8
parent420fa8592490d6f873111b7ad7931b5ce941532f (diff)
downloadrt.equinox.p2-bb5713948807de4101b7043632b6f46397786629.zip
rt.equinox.p2-bb5713948807de4101b7043632b6f46397786629.tar.gz
rt.equinox.p2-bb5713948807de4101b7043632b6f46397786629.tar.bz2
This clears the Repository NickName after the test so other test can run and assume it's null.
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java3
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java3
2 files changed, 6 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java
index 0d0b55a..21b5f1c 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java
@@ -186,6 +186,9 @@ public class ArtifactRepositoryManagerTest extends AbstractProvisioningTest {
assertTrue("2.0", manager.contains(location));
assertFalse("2.1", manager.isEnabled(location));
assertEquals("2.2", "MyNick", manager.getRepositoryProperty(location, IRepository.PROP_NICKNAME));
+
+ // Set it back to null for other tests
+ manager.setRepositoryProperty(location, IRepository.PROP_NICKNAME, null);
}
/**
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java
index 93a0bd5..9da7f80 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/MetadataRepositoryManagerTest.java
@@ -458,6 +458,9 @@ public class MetadataRepositoryManagerTest extends AbstractProvisioningTest {
assertTrue("2.0", manager.contains(location));
assertFalse("2.1", manager.isEnabled(location));
assertEquals("2.2", "MyNick", manager.getRepositoryProperty(location, IRepository.PROP_NICKNAME));
+
+ // Set the nickname back to null for other tests
+ manager.setRepositoryProperty(location, IRepository.PROP_NICKNAME, null);
}
/**