Mailing-List: contact dev-help@brooklyn.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@brooklyn.incubator.apache.org
From: aledsage <git@git.apache.org>
To: dev@brooklyn.incubator.apache.org
Reply-To: dev@brooklyn.incubator.apache.org
References: <git-pr-716-incubator-brooklyn@git.apache.org>
In-Reply-To: <git-pr-716-incubator-brooklyn@git.apache.org>
Subject: [GitHub] incubator-brooklyn pull request: Check rebind does not
 effect cata...
Content-Type: text/plain
Message-Id: <20150702165251.5D908E365A@git1-us-west.apache.org>
Date: Thu,  2 Jul 2015 16:52:51 +0000 (UTC)

Github user aledsage commented on a diff in the pull request:

    https://github.com/apache/incubator-brooklyn/pull/716#discussion_r33798436
  
    --- Diff: usage/launcher/src/test/java/brooklyn/launcher/BrooklynLauncherRebindCatalogTest.java ---
    @@ -0,0 +1,102 @@
    +/*
    + * Licensed to the Apache Software Foundation (ASF) under one
    + * or more contributor license agreements.  See the NOTICE file
    + * distributed with this work for additional information
    + * regarding copyright ownership.  The ASF licenses this file
    + * to you under the Apache License, Version 2.0 (the
    + * "License"); you may not use this file except in compliance
    + * with the License.  You may obtain a copy of the License at
    + *
    + *     http://www.apache.org/licenses/LICENSE-2.0
    + *
    + * Unless required by applicable law or agreed to in writing,
    + * software distributed under the License is distributed on an
    + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
    + * KIND, either express or implied.  See the License for the
    + * specific language governing permissions and limitations
    + * under the License.
    + */
    +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.entity.rebind.persister.PersistMode;
    +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)
    +                .persistMode(PersistMode.AUTO)
    +                .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();
    --- End diff --
    
    what tears down this management context at the end of the test? It looks like it is left running.


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---