You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/07/19 19:03:28 UTC
[3/4] brooklyn-server git commit: Fix tests,
don't depend on specific white list being available
Fix tests, don't depend on specific white list being available
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0d841003
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0d841003
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0d841003
Branch: refs/heads/master
Commit: 0d84100380e7e032eedafc4485ee598bb6e8d049
Parents: 2ee93da
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Jul 18 18:43:10 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Jul 18 18:44:12 2016 +0300
----------------------------------------------------------------------
.../core/mgmt/persist/XmlMementoSerializerTest.java | 16 ++++++++++++++--
.../brooklyn/util/core/ClassLoaderUtilsTest.java | 2 ++
2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d841003/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java
index 069416e..7adb1fc 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java
@@ -64,6 +64,7 @@ import org.apache.brooklyn.test.support.TestResourceUnavailableException;
import org.apache.brooklyn.util.collections.MutableList;
import org.apache.brooklyn.util.collections.MutableMap;
import org.apache.brooklyn.util.collections.MutableSet;
+import org.apache.brooklyn.util.core.ClassLoaderUtils;
import org.apache.brooklyn.util.core.osgi.Osgis;
import org.apache.brooklyn.util.javalang.Reflections;
import org.apache.brooklyn.util.net.Networking;
@@ -420,8 +421,19 @@ public class XmlMementoSerializerTest {
"<"+bundle.getSymbolicName()+":"+classname+">",
" <val>myval</val>",
"</"+bundle.getSymbolicName()+":"+classname+">");
- String serializedForm = serializer.toString(obj);
- assertEquals(serializedForm.trim(), expectedForm.trim());
+ String WHITE_LIST_KEY = "org.apache.brooklyn.classloader.fallback.bundles";
+ String origWhiteList = System.getProperty(WHITE_LIST_KEY);
+ System.setProperty(WHITE_LIST_KEY, "some.none.existend.whitelist:1.0.0");
+ try {
+ String serializedForm = serializer.toString(obj);
+ assertEquals(serializedForm.trim(), expectedForm.trim());
+ } finally {
+ if (origWhiteList != null) {
+ System.setProperty(WHITE_LIST_KEY, origWhiteList);
+ } else {
+ System.clearProperty(WHITE_LIST_KEY);
+ }
+ }
}
// TODO This doesn't get the bundleName - should we expect it to? Is this because of
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d841003/core/src/test/java/org/apache/brooklyn/util/core/ClassLoaderUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/ClassLoaderUtilsTest.java b/core/src/test/java/org/apache/brooklyn/util/core/ClassLoaderUtilsTest.java
index 7ede563..165a61e 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/ClassLoaderUtilsTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/ClassLoaderUtilsTest.java
@@ -109,6 +109,8 @@ public class ClassLoaderUtilsTest {
Class<? extends Entity> clazz = (Class<? extends Entity>) bundle.loadClass(classname);
Entity entity = createSimpleEntity(bundleUrl, clazz);
+ System.setProperty(ClassLoaderUtils.WHITE_LIST_KEY, "do.not.match.whitelist:1.0.0");
+
ClassLoaderUtils cluMgmt = new ClassLoaderUtils(getClass(), mgmt);
ClassLoaderUtils cluClass = new ClassLoaderUtils(clazz);
ClassLoaderUtils cluEntity = new ClassLoaderUtils(getClass(), entity);