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:26 UTC
[1/4] brooklyn-server git commit: Add missing tests
Repository: brooklyn-server
Updated Branches:
refs/heads/master af1aec58a -> 8d8d5766d
Add missing tests
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d2c36916
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d2c36916
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d2c36916
Branch: refs/heads/master
Commit: d2c369166fb2ab0a04793fdf1ccc6e7ddc481102
Parents: c4d5055
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Jul 14 23:40:25 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Jul 14 23:40:25 2016 +0300
----------------------------------------------------------------------
.../brooklyn/util/osgi/OsgiUtilsTest.java | 49 ++++++++++++++++++++
.../util/text/VersionComparatorTest.java | 2 +
2 files changed, 51 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d2c36916/utils/common/src/test/java/org/apache/brooklyn/util/osgi/OsgiUtilsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/osgi/OsgiUtilsTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/osgi/OsgiUtilsTest.java
new file mode 100644
index 0000000..e41b00a
--- /dev/null
+++ b/utils/common/src/test/java/org/apache/brooklyn/util/osgi/OsgiUtilsTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2016 The Apache Software Foundation.
+ *
+ * Licensed 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 org.apache.brooklyn.util.osgi;
+
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
+public class OsgiUtilsTest {
+
+ @Test
+ public void testToOsgiVersion() {
+ assertVersion("0.10.0-20160713.1653", "0.10.0.20160713_1653");
+
+ assertVersion("2.1.0-SNAPSHOT", "2.1.0.SNAPSHOT");
+ assertVersion("2.1-SNAPSHOT", "2.1.0.SNAPSHOT");
+ assertVersion("0.1-SNAPSHOT", "0.1.0.SNAPSHOT");
+ assertVersion("2-SNAPSHOT", "2.0.0.SNAPSHOT");
+ assertVersion("2", "2.0.0");
+ assertVersion("2.1", "2.1.0");
+ assertVersion("2.1.3", "2.1.3");
+ assertVersion("2.1.3.4", "2.1.3.4");
+ assertVersion("4aug2000r7-dev", "0.0.0.4aug2000r7-dev");
+ assertVersion("1.1-alpha-2", "1.1.0.alpha-2");
+ assertVersion("1.0-alpha-16-20070122.203121-13", "1.0.0.alpha-16-20070122_203121-13");
+ assertVersion("1.0-20070119.021432-1", "1.0.0.20070119_021432-1");
+ assertVersion("1-20070119.021432-1", "1.0.0.20070119_021432-1");
+ assertVersion("1.4.1-20070217.082013-7", "1.4.1.20070217_082013-7");
+ assertVersion("0.0.0.4aug2000r7-dev", "0.0.0.4aug2000r7-dev");
+ assertVersion("4aug2000r7-dev", "0.0.0.4aug2000r7-dev");
+ }
+
+ private void assertVersion(String ver, String expected) {
+ assertEquals(OsgiUtils.toOsgiVersion(ver), expected);
+ }
+}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d2c36916/utils/common/src/test/java/org/apache/brooklyn/util/text/VersionComparatorTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/text/VersionComparatorTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/text/VersionComparatorTest.java
index 5322817..3a4a71c 100644
--- a/utils/common/src/test/java/org/apache/brooklyn/util/text/VersionComparatorTest.java
+++ b/utils/common/src/test/java/org/apache/brooklyn/util/text/VersionComparatorTest.java
@@ -88,6 +88,8 @@ public class VersionComparatorTest {
"1.2-SNAPSHOT", "1.10-SNAPSHOT",
"qualifer",
"0", "0.1", "1");
+
+ assertVersionOrder("0.10.0-SNAPSHOT", "0.10.0.SNAPSHOT", "0.10.0-GA", "0.10.0.GA", "0.10.0");
}
private static void assertVersionOrder(String v1, String v2, String ...otherVersions) {
[4/4] brooklyn-server git commit: This closes #262
Posted by al...@apache.org.
This closes #262
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8d8d5766
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8d8d5766
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8d8d5766
Branch: refs/heads/master
Commit: 8d8d5766d0a42155512d1abc8d16c7e08597dba0
Parents: af1aec5 0d84100
Author: Aled Sage <al...@gmail.com>
Authored: Tue Jul 19 20:03:11 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Jul 19 20:03:11 2016 +0100
----------------------------------------------------------------------
.../mgmt/persist/XmlMementoSerializerTest.java | 16 ++++++-
.../util/core/ClassLoaderUtilsTest.java | 2 +
...essPersisterInMemorySizeIntegrationTest.java | 2 +-
.../brooklyn/util/osgi/OsgiUtilsTest.java | 49 ++++++++++++++++++++
.../util/text/VersionComparatorTest.java | 2 +
5 files changed, 68 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8d8d5766/core/src/test/java/org/apache/brooklyn/util/core/ClassLoaderUtilsTest.java
----------------------------------------------------------------------
[3/4] brooklyn-server git commit: Fix tests,
don't depend on specific white list being available
Posted by al...@apache.org.
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);
[2/4] brooklyn-server git commit: Bump maximum expected persisted
state size
Posted by al...@apache.org.
Bump maximum expected persisted state size
The test is not deterministic, fails on slower machines.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/2ee93da4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2ee93da4
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/2ee93da4
Branch: refs/heads/master
Commit: 2ee93da414a363b6564dc60cd3443d16733133ef
Parents: d2c3691
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Jul 15 10:46:45 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Jul 15 10:46:45 2016 +0300
----------------------------------------------------------------------
.../base/SoftwareProcessPersisterInMemorySizeIntegrationTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/2ee93da4/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessPersisterInMemorySizeIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessPersisterInMemorySizeIntegrationTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessPersisterInMemorySizeIntegrationTest.java
index 10e909d..0d53a08 100644
--- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessPersisterInMemorySizeIntegrationTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessPersisterInMemorySizeIntegrationTest.java
@@ -35,7 +35,7 @@ public class SoftwareProcessPersisterInMemorySizeIntegrationTest extends Brookly
pass1MaxFiles = 80;
pass1MaxKb = 200;
pass2MaxFiles = 100;
- pass2MaxKb = 150;
+ pass2MaxKb = 160;
pass3MaxKb = 50;
}