You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2017/02/06 14:57:29 UTC
[1/2] brooklyn-library git commit: Fix test to work on any
combination of OS & eol type.
Repository: brooklyn-library
Updated Branches:
refs/heads/master a72962bee -> f3cbc42e7
Fix test to work on any combination of OS & eol type.
Change line endings for generated script as it's most likely to run in a unix environment.
Normalize line endings when comparing scripts to work with any combination of OS & line endings (for tests running on Windows mostly). On Windows you can have both CRLF or LF line endings in the files (or even mixed), depending on how git is configured. That's out of our control so try to support any environment.
The recommended confgiuration is "git --global core.autocrlf true", but Apache Jenkins machines have "core.autocrlf" set to "input". The former will lead to CRLF line endings, the latter to LF line endings on checkout.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/a59863f0
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/a59863f0
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/a59863f0
Branch: refs/heads/master
Commit: a59863f0a653840067ad6ab63d7475d4af1fa402
Parents: f1ff646
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Nov 1 18:38:47 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Nov 1 18:38:47 2016 +0200
----------------------------------------------------------------------
.../dns/geoscaling/GeoscalingScriptGenerator.java | 14 +++++++-------
.../geoscaling/GeoscalingScriptGeneratorTest.java | 18 +++++++++++++++---
2 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a59863f0/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGenerator.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGenerator.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGenerator.java
index 1d1f4f5..367afbb 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGenerator.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGenerator.java
@@ -54,18 +54,18 @@ public class GeoscalingScriptGenerator {
private static String getHostsDeclaration(Collection<HostGeoInfo> hosts) {
StringBuffer sb = new StringBuffer();
- sb.append("$hosts = array(").append(Os.LINE_SEPARATOR);
+ sb.append("$hosts = array(\n");
Iterator<HostGeoInfo> iServer = hosts.iterator();
while (iServer.hasNext()) {
HostGeoInfo server = iServer.next();
- sb.append(" array('name' => '").append(escape(server.displayName)).append("',").append(Os.LINE_SEPARATOR);
- sb.append(" 'latitude' => ").append(server.latitude).append(",").append(Os.LINE_SEPARATOR);
- sb.append(" 'longitude' => ").append(server.longitude).append(",").append(Os.LINE_SEPARATOR);
+ sb.append(" array('name' => '").append(escape(server.displayName)).append("',\n");
+ sb.append(" 'latitude' => ").append(server.latitude).append(",\n");
+ sb.append(" 'longitude' => ").append(server.longitude).append(",\n");
sb.append(" 'ip' => '").append(escape(server.address)).append("')");
- if (iServer.hasNext()) sb.append(",").append(Os.LINE_SEPARATOR);
- sb.append(Os.LINE_SEPARATOR);
+ if (iServer.hasNext()) sb.append(",\n");
+ sb.append("\n");
}
- sb.append(");").append(Os.LINE_SEPARATOR);
+ sb.append(");").append("\n");
return sb.toString();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a59863f0/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java
index 4e8ef2c..627feee 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java
@@ -48,10 +48,22 @@ public class GeoscalingScriptGeneratorTest {
String generatedScript = GeoscalingScriptGenerator.generateScriptString(generationTime, HOSTS);
assertTrue(generatedScript.contains("1.2.3"));
String expectedScript = ResourceUtils.create(this).getResourceAsString("org/apache/brooklyn/entity/dns/geoscaling/expectedScript.php");
- assertEquals(generatedScript, expectedScript);
+ assertEqualsNormalizedEol(generatedScript, expectedScript);
//also make sure leading slash is allowed
String expectedScript2 = ResourceUtils.create(this).getResourceAsString("org/apache/brooklyn/entity/dns/geoscaling/expectedScript.php");
- assertEquals(generatedScript, expectedScript);
+ assertEqualsNormalizedEol(generatedScript, expectedScript2);
}
-
+
+
+ private void assertEqualsNormalizedEol(String generatedScript, String expectedScript) {
+ assertEquals(normalizeEol(generatedScript), normalizeEol(expectedScript));
+ }
+
+
+ private Object normalizeEol(String str) {
+ // Remove CR in case the files are checked out on Windows.
+ // That's just to satisfy the test condition, PHP doesn't care about line endings.
+ return str.replace("\r\n", "\n");
+ }
+
}
[2/2] brooklyn-library git commit: This closes #72
Posted by sj...@apache.org.
This closes #72
Fix test to work on any combination of OS & eol type.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/f3cbc42e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/f3cbc42e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/f3cbc42e
Branch: refs/heads/master
Commit: f3cbc42e7b87c12a56d158dcd52a531f0fd3943e
Parents: a72962b a59863f
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Mon Feb 6 14:57:12 2017 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Mon Feb 6 14:57:12 2017 +0000
----------------------------------------------------------------------
.../dns/geoscaling/GeoscalingScriptGenerator.java | 14 +++++++-------
.../geoscaling/GeoscalingScriptGeneratorTest.java | 18 +++++++++++++++---
2 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------