Github user neykov commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/716#discussion_r33158282
--- Diff:
usage/launcher/src/test/java/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java
---
@@ -0,0 +1,82 @@
+package brooklyn.launcher;
+
+import java.io.File;
+import java.util.Collection;
+
+import javax.annotation.Nullable;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import brooklyn.catalog.BrooklynCatalog;
+import brooklyn.catalog.CatalogItem;
+import brooklyn.catalog.internal.CatalogInitialization;
+import brooklyn.test.entity.LocalManagementContextForTests;
+import brooklyn.util.ResourceUtils;
+import brooklyn.util.os.Os;
+
+import com.google.common.base.Function;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import com.google.common.io.Files;
+
+public class BrooklynLauncherRebindCatalogTest {
+
+ private static final String TEST_VERSION = "test-version";
+ private static final String CATALOG_INITIAL =
"classpath://rebind-test-catalog.bom";
+ private static final String CATALOG_ADDITIONS =
"rebind-test-catalog-additions.bom";
+ private static final Iterable<String> EXPECTED_DEFAULT_IDS =
ImmutableSet.of("one:" + TEST_VERSION, "two:" + TEST_VERSION);
+ private static final Iterable<String> EXPECTED_ADDED_IDS =
ImmutableSet.of("three:" + TEST_VERSION, "four:" + TEST_VERSION);
+
+ private BrooklynLauncher newLauncherForTests(String persistenceDir) {
+ CatalogInitialization catalogInitialization = new
CatalogInitialization(CATALOG_INITIAL, false, null, false);
+ BrooklynLauncher launcher = BrooklynLauncher.newInstance()
+
.brooklynProperties(LocalManagementContextForTests.builder(true).buildProperties())
+ .catalogInitialization(catalogInitialization)
+ .persistenceDir(persistenceDir);
+ return launcher;
+ }
+
+ @Test
+ public void testRebindDoesNotEffectCatalog() {
+ String persistenceDir = newTempPersistenceContainerName();
+
+ BrooklynLauncher launcher = newLauncherForTests(persistenceDir);
+ launcher.start();
+ BrooklynCatalog catalog =
launcher.getServerDetails().getManagementContext().getCatalog();
+
+ assertCatalogConsistsOfIds(catalog.getCatalogItems(),
EXPECTED_DEFAULT_IDS);
+
+ catalog.deleteCatalogItem("one", TEST_VERSION);
+ catalog.deleteCatalogItem("two", TEST_VERSION);
+
+ Assert.assertEquals(((Collection)
catalog.getCatalogItems()).size(), 0);
+
+ catalog.addItems(new
ResourceUtils(this).getResourceAsString(CATALOG_ADDITIONS));
+
+ assertCatalogConsistsOfIds(catalog.getCatalogItems(),
EXPECTED_ADDED_IDS);
+
+ launcher.terminate();
+
+ BrooklynLauncher newLauncher = newLauncherForTests(persistenceDir);
+ newLauncher.start();
+
assertCatalogConsistsOfIds(newLauncher.getServerDetails().getManagementContext().getCatalog().getCatalogItems(),
EXPECTED_DEFAULT_IDS);
--- End diff --
If rebinding against previous state, shouldn't we get `EXPECTED_ADDED_IDS`
here?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
