You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/09/23 19:50:16 UTC
[06/13] git commit: Format CampYamlLiteTest properly
Format CampYamlLiteTest properly
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4a4e74aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4a4e74aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4a4e74aa
Branch: refs/heads/master
Commit: 4a4e74aa16959c9d71add4acebb74977f2a423f9
Parents: e01adf3
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Tue Sep 16 18:45:33 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Fri Sep 19 12:33:36 2014 +0100
----------------------------------------------------------------------
.../brooklyn/camp/lite/CampYamlLiteTest.java | 112 +++++++++----------
1 file changed, 56 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4a4e74aa/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java b/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java
index d8b2698..d580427 100644
--- a/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java
+++ b/core/src/test/java/brooklyn/camp/lite/CampYamlLiteTest.java
@@ -174,77 +174,77 @@ public class CampYamlLiteTest {
// TODO other assertions, about children
}
-
+
@Test
public void testRegisterCustomEntityWithBundleWhereEntityIsFromCoreAndIconFromBundle() throws IOException {
- String registeredTypeName = "my.catalog.app.id";
- String bundleUrl = OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL;
- String yaml = getSampleMyCatalogAppYaml(registeredTypeName, bundleUrl);
+ String registeredTypeName = "my.catalog.app.id";
+ String bundleUrl = OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL;
+ String yaml = getSampleMyCatalogAppYaml(registeredTypeName, bundleUrl);
+
+ mgmt.getCatalog().addItem(yaml);
- mgmt.getCatalog().addItem(yaml);
-
- assertMgmtHasSampleMyCatalogApp(registeredTypeName, bundleUrl);
+ assertMgmtHasSampleMyCatalogApp(registeredTypeName, bundleUrl);
}
private String getSampleMyCatalogAppYaml(String registeredTypeName, String bundleUrl) {
- return "brooklyn.catalog:\n"+
- " id: " + registeredTypeName + "\n"+
- " name: My Catalog App\n"+
- " description: My description\n"+
- " icon_url: classpath:/brooklyn/osgi/tests/icon.gif\n"+
- " version: 0.1.2\n"+
- " libraries:\n"+
- " - url: " + bundleUrl + "\n"+
- "\n"+
- "services:\n"+
- "- type: brooklyn.test.entity.TestEntity\n";
+ return "brooklyn.catalog:\n" +
+ " id: " + registeredTypeName + "\n" +
+ " name: My Catalog App\n" +
+ " description: My description\n" +
+ " icon_url: classpath:/brooklyn/osgi/tests/icon.gif\n" +
+ " version: 0.1.2\n" +
+ " libraries:\n" +
+ " - url: " + bundleUrl + "\n" +
+ "\n" +
+ "services:\n" +
+ "- type: brooklyn.test.entity.TestEntity\n";
}
private void assertMgmtHasSampleMyCatalogApp(String registeredTypeName, String bundleUrl) {
CatalogItem<?, ?> item = mgmt.getCatalog().getCatalogItem(registeredTypeName);
- assertEquals(item.getRegisteredTypeName(), registeredTypeName);
-
- // stored as yaml, not java
+ assertEquals(item.getRegisteredTypeName(), registeredTypeName);
+
+ // stored as yaml, not java
// assertEquals(entityItem.getJavaType(), "brooklyn.test.entity.TestEntity");
- Assert.assertNotNull(item.getPlanYaml());
- Assert.assertTrue(item.getPlanYaml().contains("brooklyn.test.entity.TestEntity"));
-
- assertEquals(item.getId(), registeredTypeName);
-
- // and let's check we have libraries
- List<String> libs = item.getLibraries().getBundles();
- assertEquals(libs, MutableList.of(bundleUrl));
-
- // now let's check other things on the item
- assertEquals(item.getName(), "My Catalog App");
- assertEquals(item.getDescription(), "My description");
- assertEquals(item.getIconUrl(), "classpath:/brooklyn/osgi/tests/icon.gif");
-
- // and confirm we can resolve ICON
- byte[] iconData = Streams.readFully( ResourceUtils.create(item.newClassLoadingContext(mgmt)).getResourceFromUrl(item.getIconUrl()) );
- assertEquals(iconData.length, 43);
+ Assert.assertNotNull(item.getPlanYaml());
+ Assert.assertTrue(item.getPlanYaml().contains("brooklyn.test.entity.TestEntity"));
+
+ assertEquals(item.getId(), registeredTypeName);
+
+ // and let's check we have libraries
+ List<String> libs = item.getLibraries().getBundles();
+ assertEquals(libs, MutableList.of(bundleUrl));
+
+ // now let's check other things on the item
+ assertEquals(item.getName(), "My Catalog App");
+ assertEquals(item.getDescription(), "My description");
+ assertEquals(item.getIconUrl(), "classpath:/brooklyn/osgi/tests/icon.gif");
+
+ // and confirm we can resolve ICON
+ byte[] iconData = Streams.readFully(ResourceUtils.create(item.newClassLoadingContext(mgmt)).getResourceFromUrl(item.getIconUrl()));
+ assertEquals(iconData.length, 43);
}
-
+
@Test
public void testResetXmlWithCustomEntity() throws IOException {
- String registeredTypeName = "my.catalog.app.id";
- String bundleUrl = OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL;
- String yaml = getSampleMyCatalogAppYaml(registeredTypeName, bundleUrl);
-
- LocalManagementContext mgmt2 = LocalManagementContextForTests.newInstanceWithOsgi();
- try {
- CampPlatformWithJustBrooklynMgmt platform2 = new CampPlatformWithJustBrooklynMgmt(mgmt2);
- MockWebPlatform.populate(platform2, TestAppAssemblyInstantiator.class);
-
- mgmt2.getCatalog().addItem(yaml);
- String xml = ((BasicBrooklynCatalog)mgmt2.getCatalog()).toXmlString();
- ((BasicBrooklynCatalog)mgmt.getCatalog()).reset(CatalogDto.newDtoFromXmlContents(xml, "copy of temporary catalog"));
- } finally {
- mgmt2.terminate();
- }
-
- assertMgmtHasSampleMyCatalogApp(registeredTypeName, bundleUrl);
+ String registeredTypeName = "my.catalog.app.id";
+ String bundleUrl = OsgiStandaloneTest.BROOKLYN_TEST_OSGI_ENTITIES_URL;
+ String yaml = getSampleMyCatalogAppYaml(registeredTypeName, bundleUrl);
+
+ LocalManagementContext mgmt2 = LocalManagementContextForTests.newInstanceWithOsgi();
+ try {
+ CampPlatformWithJustBrooklynMgmt platform2 = new CampPlatformWithJustBrooklynMgmt(mgmt2);
+ MockWebPlatform.populate(platform2, TestAppAssemblyInstantiator.class);
+
+ mgmt2.getCatalog().addItem(yaml);
+ String xml = ((BasicBrooklynCatalog) mgmt2.getCatalog()).toXmlString();
+ ((BasicBrooklynCatalog) mgmt.getCatalog()).reset(CatalogDto.newDtoFromXmlContents(xml, "copy of temporary catalog"));
+ } finally {
+ mgmt2.terminate();
+ }
+
+ assertMgmtHasSampleMyCatalogApp(registeredTypeName, bundleUrl);
}
}