[SERVER] replaced ProxySslConfig with a dummy POJO
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/06165730 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/06165730 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/06165730 Branch: refs/heads/master Commit: 06165730bcea3627dc7b2f36d72bb98a81cd2a62 Parents: d49445d Author: John McCabe <[email protected]> Authored: Wed Dec 16 19:51:08 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Mon Dec 21 16:43:35 2015 +0000 ---------------------------------------------------------------------- .../camp/brooklyn/MapReferenceYamlTest.java | 9 ++++--- .../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 21 ++++++++-------- .../brooklyn/camp/brooklyn/SimpleTestPojo.java | 25 ++++++++++++++++++++ 3 files changed, 39 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/06165730/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/MapReferenceYamlTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/MapReferenceYamlTest.java b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/MapReferenceYamlTest.java index 8bcd737..176245d 100644 --- a/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/MapReferenceYamlTest.java +++ b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/MapReferenceYamlTest.java @@ -24,7 +24,6 @@ import java.util.concurrent.Callable; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.entity.proxy.ProxySslConfig; import org.apache.brooklyn.entity.stock.BasicEntity; import org.apache.brooklyn.util.core.task.Tasks; import org.slf4j.Logger; @@ -69,7 +68,7 @@ public class MapReferenceYamlTest extends AbstractYamlTest { " frog: $brooklyn:formatString(\"%s\", \"frog\")", " object:", " $brooklyn:object:", - " type: org.apache.brooklyn.entity.proxy.ProxySslConfig", + " type: org.apache.brooklyn.camp.brooklyn.SimpleTestPojo", " one: $brooklyn:entity(\"one\")", " two: $brooklyn:entity(\"two\")"); @@ -86,7 +85,7 @@ public class MapReferenceYamlTest extends AbstractYamlTest { Assert.assertTrue(frog instanceof String, "Should have found a String: " + frog); Assert.assertEquals(frog, "frog", "Should have found a formatted String: " + frog); - Assert.assertTrue(object instanceof ProxySslConfig, "Should have found a ProxySslConfig: " + object); + Assert.assertTrue(object instanceof SimpleTestPojo, "Should have found a SimpleTestPojo: " + object); Assert.assertTrue(one instanceof BasicEntity, "Should have found a BasicEntity: " + one); Assert.assertTrue(two instanceof BasicEntity, "Should have found a BasicEntity: " + two); } @@ -99,7 +98,7 @@ public class MapReferenceYamlTest extends AbstractYamlTest { " frog: $brooklyn:formatString(\"%s\", \"frog\")", " object:", " $brooklyn:object:", - " type: org.apache.brooklyn.entity.proxy.ProxySslConfig", + " type: org.apache.brooklyn.camp.brooklyn.SimpleTestPojo", " one: $brooklyn:entity(\"one\")", " two: $brooklyn:entity(\"two\")"); @@ -116,7 +115,7 @@ public class MapReferenceYamlTest extends AbstractYamlTest { Assert.assertTrue(frog instanceof String, "Should have found a String: " + frog); Assert.assertEquals(frog, "frog", "Should have found a formatted String: " + frog); - Assert.assertTrue(object instanceof ProxySslConfig, "Should have found a ProxySslConfig: " + object); + Assert.assertTrue(object instanceof SimpleTestPojo, "Should have found a SimpleTestPojo: " + object); Assert.assertTrue(one instanceof BasicEntity, "Should have found a BasicEntity: " + one); Assert.assertTrue(two instanceof BasicEntity, "Should have found a BasicEntity: " + two); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/06165730/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java index 1a74882..147ae1e 100644 --- a/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java +++ b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ObjectsYamlTest.java @@ -31,7 +31,6 @@ import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.mgmt.ManagementContextInjectable; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.entity.proxy.ProxySslConfig; import org.apache.brooklyn.util.core.config.ConfigBag; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.core.flags.TypeCoercions; @@ -186,7 +185,7 @@ public class ObjectsYamlTest extends AbstractYamlTest { " number: 7", " object:", " $brooklyn:object:", - " type: org.apache.brooklyn.entity.proxy.ProxySslConfig", + " type: org.apache.brooklyn.camp.brooklyn.SimpleTestPojo", " string: \"frog\""); Object testObject = testEntity.getConfig(TestEntity.CONF_OBJECT); @@ -197,7 +196,7 @@ public class ObjectsYamlTest extends AbstractYamlTest { Assert.assertEquals(((TestObject) testObject).getString(), "frog"); Object testObjectObject = ((TestObject) testObject).getObject(); - Assert.assertTrue(testObjectObject instanceof ProxySslConfig, "Expected a ProxySslConfig: "+testObjectObject); + Assert.assertTrue(testObjectObject instanceof SimpleTestPojo, "Expected a SimpleTestPojo: "+testObjectObject); } @Test @@ -214,7 +213,7 @@ public class ObjectsYamlTest extends AbstractYamlTest { " config.number: 7", " object:", " $brooklyn:object:", - " type: org.apache.brooklyn.entity.proxy.ProxySslConfig"); + " type: org.apache.brooklyn.camp.brooklyn.SimpleTestPojo"); Object testObject = testEntity.getConfig(TestEntity.CONF_OBJECT); @@ -224,7 +223,7 @@ public class ObjectsYamlTest extends AbstractYamlTest { Assert.assertEquals(((ConfigurableObject) testObject).getNumber(), Integer.valueOf(7)); Object testObjectObject = ((ConfigurableObject) testObject).getObject(); - Assert.assertTrue(testObjectObject instanceof ProxySslConfig, "Expected a ProxySslConfig: "+testObjectObject); + Assert.assertTrue(testObjectObject instanceof SimpleTestPojo, "Expected a SimpleTestPojo: "+testObjectObject); Assert.assertTrue(configKeys.contains(ConfigurableObject.INTEGER.getName()), "Expected INTEGER key: "+configKeys); Assert.assertTrue(configKeys.contains(ConfigurableObject.OBJECT.getName()), "Expected OBJECT key: "+configKeys); @@ -236,17 +235,17 @@ public class ObjectsYamlTest extends AbstractYamlTest { " brooklyn.config:", " test.confListPlain:", " - $brooklyn:object:", - " objectType: org.apache.brooklyn.entity.proxy.ProxySslConfig", + " objectType: org.apache.brooklyn.camp.brooklyn.SimpleTestPojo", " - $brooklyn:object:", - " object_type: org.apache.brooklyn.entity.proxy.ProxySslConfig", + " object_type: org.apache.brooklyn.camp.brooklyn.SimpleTestPojo", " - $brooklyn:object:", - " type: org.apache.brooklyn.entity.proxy.ProxySslConfig"); + " type: org.apache.brooklyn.camp.brooklyn.SimpleTestPojo"); List<?> testList = testEntity.getConfig(TestEntity.CONF_LIST_PLAIN); Assert.assertEquals(testList.size(), 3); for (Object entry : testList) { - Assert.assertTrue(entry instanceof ProxySslConfig, "Expected a ProxySslConfig: "+entry); + Assert.assertTrue(entry instanceof SimpleTestPojo, "Expected a SimpleTestPojo: "+entry); } } @@ -261,7 +260,7 @@ public class ObjectsYamlTest extends AbstractYamlTest { " number: 7", " object:", " $brooklyn:object:", - " type: org.apache.brooklyn.entity.proxy.ProxySslConfig", + " type: org.apache.brooklyn.camp.brooklyn.SimpleTestPojo", " string:", " $brooklyn:formatString(\"%s\", \"frog\")"); @@ -273,7 +272,7 @@ public class ObjectsYamlTest extends AbstractYamlTest { Assert.assertEquals(((TestObject) testObject).getString(), "frog"); Object testObjectObject = ((TestObject) testObject).getObject(); - Assert.assertTrue(testObjectObject instanceof ProxySslConfig, "Expected a ProxySslConfig: "+testObjectObject); + Assert.assertTrue(testObjectObject instanceof SimpleTestPojo, "Expected a SimpleTestPojo: "+testObjectObject); } @Override http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/06165730/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/SimpleTestPojo.java ---------------------------------------------------------------------- diff --git a/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/SimpleTestPojo.java b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/SimpleTestPojo.java new file mode 100644 index 0000000..97e10c4 --- /dev/null +++ b/brooklyn-server/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/SimpleTestPojo.java @@ -0,0 +1,25 @@ +package org.apache.brooklyn.camp.brooklyn; + +/** + * Dummy POJO for use with $brooklyn:object tests + */ +public class SimpleTestPojo { + private String fieldA; + private String fieldB; + + public String getFieldA() { + return fieldA; + } + + public void setFieldA(final String fieldA) { + this.fieldA = fieldA; + } + + public String getFieldB() { + return fieldB; + } + + public void setFieldB(final String fieldB) { + this.fieldB = fieldB; + } +}
