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 2014/10/15 12:45:10 UTC
[1/2] git commit: Fix the locale so tests are deterministic.
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master a422b9aa3 -> 1923d510d
Fix the locale so tests are deterministic.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/58002efc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/58002efc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/58002efc
Branch: refs/heads/master
Commit: 58002efc2b214c90b74460f867fe66da1d216f6a
Parents: ab04511
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Oct 10 13:31:27 2014 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Oct 13 10:26:15 2014 +0300
----------------------------------------------------------------------
core/pom.xml | 7 +++++++
.../transformer/impl/XsltTransformerTest.java | 5 ++---
.../brooklyn/util/text/TemplateProcessorTest.java | 16 ++++++++++++++++
3 files changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/58002efc/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index f3136f1..49469ce 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -219,6 +219,13 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- add maxmind geo-ip library; exact copy of source included as required by LGPL2 -->
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/58002efc/core/src/test/java/brooklyn/entity/rebind/transformer/impl/XsltTransformerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/rebind/transformer/impl/XsltTransformerTest.java b/core/src/test/java/brooklyn/entity/rebind/transformer/impl/XsltTransformerTest.java
index 32baff6..cc801b2 100644
--- a/core/src/test/java/brooklyn/entity/rebind/transformer/impl/XsltTransformerTest.java
+++ b/core/src/test/java/brooklyn/entity/rebind/transformer/impl/XsltTransformerTest.java
@@ -22,16 +22,15 @@ import static org.testng.Assert.assertEquals;
import org.testng.annotations.Test;
-import brooklyn.entity.rebind.transformer.impl.XsltTransformer;
-import brooklyn.entity.rebind.transformer.impl.XsltTransformerTest;
import brooklyn.util.ResourceUtils;
+import brooklyn.util.os.Os;
import brooklyn.util.text.TemplateProcessor;
import com.google.common.collect.ImmutableMap;
public class XsltTransformerTest {
- private static String NEWLINE = System.getProperty("line.separator");
+ private static String NEWLINE = Os.LINE_SEPARATOR;
@Test
public void testRenameType() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/58002efc/core/src/test/java/brooklyn/util/text/TemplateProcessorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/util/text/TemplateProcessorTest.java b/core/src/test/java/brooklyn/util/text/TemplateProcessorTest.java
index b9c23e7..ef9c41a 100644
--- a/core/src/test/java/brooklyn/util/text/TemplateProcessorTest.java
+++ b/core/src/test/java/brooklyn/util/text/TemplateProcessorTest.java
@@ -21,17 +21,33 @@ package brooklyn.util.text;
import static org.testng.Assert.assertEquals;
import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import brooklyn.entity.BrooklynAppUnitTestSupport;
import brooklyn.entity.proxying.EntitySpec;
import brooklyn.event.basic.DependentConfiguration;
+import brooklyn.test.FixedLocaleTest;
import brooklyn.test.entity.TestApplication;
import brooklyn.test.entity.TestEntity;
import com.google.common.collect.ImmutableMap;
public class TemplateProcessorTest extends BrooklynAppUnitTestSupport {
+ private FixedLocaleTest localeFix = new FixedLocaleTest();
+
+ @BeforeMethod(alwaysRun=true)
+ public void setUp() throws Exception {
+ super.setUp();
+ localeFix.setUp();
+ }
+
+ @AfterMethod(alwaysRun=true)
+ public void tearDown() throws Exception {
+ super.tearDown();
+ localeFix.tearDown();
+ }
@Test
public void testAdditionalArgs() {
[2/2] git commit: This closes #235
Posted by al...@apache.org.
This closes #235
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1923d510
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1923d510
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1923d510
Branch: refs/heads/master
Commit: 1923d510d1d8959a812bb0c5b2fe0855179f08ee
Parents: a422b9a 58002ef
Author: Aled Sage <al...@gmail.com>
Authored: Wed Oct 15 11:44:53 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Oct 15 11:44:53 2014 +0100
----------------------------------------------------------------------
core/pom.xml | 7 +++++++
.../transformer/impl/XsltTransformerTest.java | 5 ++---
.../brooklyn/util/text/TemplateProcessorTest.java | 16 ++++++++++++++++
3 files changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1923d510/core/pom.xml
----------------------------------------------------------------------
diff --cc core/pom.xml
index ed57e2a,49469ce..a56ddc2
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -219,6 -219,31 +219,13 @@@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- <!-- add maxmind geo-ip library; exact copy of source included as required by LGPL2 -->
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <exclude>**/src/main/resources/**/*.txt</exclude>
- <exclude>**/src/test/resources/**/*.txt</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
</project>