From 107d786ec5b15112a7b7da2f0063f7c76536eeab Mon Sep 17 00:00:00 2001
From: smikes <smikes@cubane.com>
Date: Mon, 30 Mar 2015 14:46:49 -0600
Subject: [PATCH] candidate fix for #215
additional test, tests should have unique names
improve python style thx to arv
---
tools/packaging/monkeyYaml.py | 2 +-
tools/packaging/test/test_monkeyYaml.py | 47 ++++++++++++++++++++++---
2 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/tools/packaging/monkeyYaml.py b/tools/packaging/monkeyYaml.py
index d86c03ab93..8ce33f74b1 100644
--- a/tools/packaging/monkeyYaml.py
+++ b/tools/packaging/monkeyYaml.py
@@ -90,7 +90,7 @@ def myFlowList(value):
def myMultiline(lines, value):
# assume no explcit indentor (otherwise have to parse value)
value = []
- indent = 1
+ indent = myLeadingSpaces(lines[0])
while lines:
line = lines.pop(0)
if myIsAllSpaces(line):
diff --git a/tools/packaging/test/test_monkeyYaml.py b/tools/packaging/test/test_monkeyYaml.py
index ada802356f..a16cd26609 100644
--- a/tools/packaging/test/test_monkeyYaml.py
+++ b/tools/packaging/test/test_monkeyYaml.py
@@ -58,7 +58,7 @@ class TestMonkeyYAMLParsing(unittest.TestCase):
self.assertEqual(lines, [])
self.assertEqual(value, yaml.load(y))
- def test_Multiline_1(self):
+ def test_Multiline_2(self):
lines = [" foo", " bar"]
value = ">"
y = "\n".join([value] + lines)
@@ -66,6 +66,21 @@ class TestMonkeyYAMLParsing(unittest.TestCase):
self.assertEqual(lines, [])
self.assertEqual(value, yaml.load(y))
+ def test_Multiline_3(self):
+ lines = [" foo", " bar"]
+ value = ">"
+ y = "\n".join([value] + lines)
+ (lines, value) = monkeyYaml.myMultiline(lines, value)
+ self.assertEqual(lines, [])
+ self.assertEqual(value, yaml.load(y))
+
+ def test_Multiline_4(self):
+ lines = [" foo", " bar", " other: 42"]
+ value = ">"
+ (lines, value) = monkeyYaml.myMultiline(lines, value)
+ self.assertEqual(lines, [" other: 42"])
+ self.assertEqual(value, "foo bar")
+
def test_myLeading(self):
self.assertEqual(2, monkeyYaml.myLeadingSpaces(" foo"))
self.assertEqual(2, monkeyYaml.myLeadingSpaces(" "))
@@ -83,15 +98,39 @@ class TestMonkeyYAMLParsing(unittest.TestCase):
y = "foo:\n - bar\n - baz"
self.assertEqual(monkeyYaml.load(y), yaml.load(y))
- def test_mulineline_list2(self):
+ def test_multiline_list2(self):
self.assertEqual(monkeyYaml.myRemoveListHeader(2, " - foo"), "foo")
- def test_mulineline_list3(self):
+ def test_multiline_list3(self):
(lines, value) = monkeyYaml.myMultilineList([" - foo", " - bar", "baz: bletch"], "")
self.assertEqual(lines, ["baz: bletch"])
self.assertEqual(value, ["foo", "bar"])
-
+ def test_oneline_indented(self):
+ y = " foo: bar\n baz: baf\n"
+ self.assertEqual(monkeyYaml.load(y), yaml.load(y))
+
+
+ def test_indentation_215(self):
+ self.maxDiff = None
+ y = """
+ description: >
+ The method should exist on the Array prototype, and it should be writable
+ and configurable, but not enumerable.
+ includes: [propertyHelper.js]
+ es6id: 22.1.3.13
+ """
+ self.assertEqual(monkeyYaml.load(y), yaml.load(y))
+
+ def test_indentation_215_2(self):
+ self.maxDiff = None
+ y = """
+ description: >
+ The method should exist
+ includes: [propertyHelper.js]
+ es6id: 22.1.3.13
+ """
+ self.assertEqual(monkeyYaml.load(y), yaml.load(y))
if __name__ == '__main__':
unittest.main()
--
GitLab