Commit 91e4adcb authored by Matěj Cepl's avatar Matěj Cepl

Syntactically correct Python code, albeit not working probably.

parent f78eca9d
......@@ -88,15 +88,18 @@ class TestInput(unittest.TestCase):
]
for src in source:
name = src['name']
yaml = yamlish.Reader()
self.assert_(True, "%s: Created" % name)
self.assert_(isinstance(yaml, yamlish.Reader))
name = src['name']
yaml = yamlish.Reader()
self.assert_(True, "%s: Created" % name)
self.assert_(isinstance(yaml, yamlish.Reader))
#my $got = eval { $yaml -> read($src -> {source}) };
got = yaml.read(src['source'])
self.assertEqual(got, OUT, """%s: Result matches
expected = %s
observed = %s
""" % (name, OUT, got))
#my $got = eval { $yaml -> read($src -> {source}) };
try:
got = yaml.read(src['source'])
except IOError: # FIXME not sure which one
raise
self.assertEqual(got, OUT, """%s: Result matches
expected = %s
observed = %s
""" % (name, OUT, got))
This diff is collapsed.
......@@ -4,194 +4,186 @@ from __future__ import absolute_import, print_function, unicode_literals
import unittest
import yamlish
my @SCHEDULE;
BEGIN {
@SCHEDULE = (
{
name= > 'Simple scalar',
in= > 1,
out= > [ '--- 1', '...', ],
},
{
name= > 'Undef',
in= > undef,
out= > [ '--- ~', '...', ],
},
{
name= > 'Unprintable',
in= > "\x01\n\t",
out= > [ '--- "\x01\n\t"', '...', ],
},
{
name= > 'Simple array',
in= > [ 1, 2, 3 ],
out= > [ '---', '- 1', '- 2', '- 3', '...', ],
},
{
name= > 'Array, two elements, undef',
in= > [ undef, undef ],
out= > [ '---', '- ~', '- ~', '...', ],
},
{
name= > 'Nested array',
in= > [ 1, 2, [ 3, 4 ], 5 ],
out= >
[ '---', '- 1', '- 2', '-', ' - 3', ' - 4', '- 5', '...', ],
},
{
name= > 'Simple hash',
in= > { one= > '1', two= > '2', three= > '3' },
out= > [ '---', 'one: 1', 'three: 3', 'two: 2', '...', ],
},
{
name= > 'Nested hash',
in= > {
one= > '1',
two= > '2',
more= > { three= > '3', four= > '4' }
},
out= > [
'---',
'more:',
' four: 4',
' three: 3',
'one: 1',
'two: 2',
'...',
],
},
{
name= > 'Unprintable key',
in= > { one= > '1', "\x02"= > '2', three= > '3' },
out= > [ '---', '"\x02": 2', 'one: 1', 'three: 3', '...', ],
},
{
name= > 'Empty key',
in= > { ''= > 'empty' },
out= > [ '---', "'': empty", '...', ],
SCHEDULE = [
{
"name": 'Simple scalar',
"in": 1,
"out": [ '--- 1', '...', ],
},
{
"name": 'Undef',
"in": None,
"out": [ '--- ~', '...', ],
},
{
"name": 'Unprintable',
"in": "\x01\n\t",
"out": [ '--- "\x01\n\t"', '...', ],
},
{
"name": 'Simple array',
"in": [ 1, 2, 3 ],
"out": [ '---', '- 1', '- 2', '- 3', '...', ],
},
{
"name": 'Array, two elements, None',
"in": [ None, None ],
"out": [ '---', '- ~', '- ~', '...', ],
},
{
"name": 'Nested array',
"in": [ 1, 2, [ 3, 4 ], 5 ],
"out":
[ '---', '- 1', '- 2', '-', ' - 3', ' - 4', '- 5', '...', ],
},
{
"name": 'Simple hash',
"in": { "one": '1', "two": '2', "three": '3' },
"out": [ '---', 'one: 1', 'three: 3', 'two: 2', '...', ],
},
{
"name": 'Nested hash',
"in": {
"one": '1',
"two": '2',
"more": { "three": '3', "four": '4' }
},
{
name= > 'Empty value',
in= > { ''= > '' },
out= > [ '---', "'': ''", '...', ],
},
{
name= > 'Complex',
in= > {
'bill-to'= > {
'given'= > 'Chris',
'address'= > {
'city'= > 'Royal Oak',
'postal'= > '48046',
'lines'= > "458 Walkman Dr.\nSuite #292\n",
'state'= > 'MI'
},
'family'= > 'Dumars'
"out": [
'---',
'more:',
' four: 4',
' three: 3',
'one: 1',
'two: 2',
'...',
],
},
{
"name": 'Unprintable key',
"in": { "one": '1', "\x02": '2', "three": '3' },
"out": [ '---', '"\x02": 2', 'one: 1', 'three: 3', '...', ],
},
{
"name": 'Empty key',
"in": { '': 'empty' },
"out": [ '---', "'': empty", '...', ],
},
{
"name": 'Empty value',
"in": { '': '' },
"out": [ '---', "'': ''", '...', ],
},
{
"name": 'Complex',
"in": {
'bill-to': {
'given': 'Chris',
'address': {
'city': 'Royal Oak',
'postal': '48046',
'lines': "458 Walkman Dr.\nSuite #292\n",
'state': 'MI'
},
'invoice'= > '34843',
'date'= > '2001-01-23',
'tax'= > '251.42',
'product'= > [
{
'sku'= > 'BL394D',
'quantity'= > '4',
'price'= > '450.00',
'description'= > 'Basketball'
},
{
'sku'= > 'BL4438H',
'quantity'= > '1',
'price'= > '2392.00',
'description'= > 'Super Hoop'
}
],
'comments'= >
"Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338\n",
'total'= > '4443.52'
'family': 'Dumars'
},
out= > [
"---",
"bill-to:",
" address:",
" city: 'Royal Oak'",
" lines: \"458 Walkman Dr.\\nSuite #292\\n\"",
" postal: 48046",
" state: MI",
" family: Dumars",
" given: Chris",
"comments: \"Late afternoon is best. Backup contact is Nancy Billsmer \@ 338-4338\\n\"",
"date: 2001-01-23",
"invoice: 34843",
"product:",
" -",
" description: Basketball",
" price: 450.00",
" quantity: 4",
" sku: BL394D",
" -",
" description: 'Super Hoop'",
" price: 2392.00",
" quantity: 1",
" sku: BL4438H",
"tax: 251.42",
"total: 4443.52",
"...",
'invoice': '34843',
'date': '2001-01-23',
'tax': '251.42',
'product': [
{
'sku': 'BL394D',
'quantity': '4',
'price': '450.00',
'description': 'Basketball'
},
{
'sku': 'BL4438H',
'quantity': '1',
'price': '2392.00',
'description': 'Super Hoop'
}
],
'comments':
"Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338\n",
'total': '4443.52'
},
);
plan tests = > @SCHEDULE * 5;
}
sub iter {
my $ar = shift;
return sub {
return shift @$ar;
};
}
"out": [
"---",
"bill-to:",
" address:",
" city: 'Royal Oak'",
" lines: \"458 Walkman Dr.\\nSuite #292\\n\"",
" postal: 48046",
" state: MI",
" family: Dumars",
" given: Chris",
"comments: \"Late afternoon is best. Backup contact is Nancy Billsmer \@ 338-4338\\n\"",
"date: 2001-01-23",
"invoice: 34843",
"product:",
" -",
" description: Basketball",
" price: 450.00",
" quantity: 4",
" sku: BL394D",
" -",
" description: 'Super Hoop'",
" price: 2392.00",
" quantity: 1",
" sku: BL4438H",
"tax: 251.42",
"total: 4443.52",
"...",
],
},
]
for my $test (@SCHEDULE) {
my $name = $test -> {name};
ok my $yaml = Data::YAML::Writer -> new, "$name: Created";
isa_ok $yaml, 'Data::YAML::Writer';
# plan(tests = len(SCHEDULE) * 5)
my $got = [];
my $writer = sub { push @$got, shift };
class TestWriter(unittest.TestCase):
def test_writer(self):
for test in SCHEDULE:
name = test['name']
yaml = yamlish.Writer()
self.assert_(True, "%s: Created" % name)
self.assert_(isinstance(yaml, yamlish.Writer))
my $data = $test -> {in};
got = []
data = test['in']
eval { $yaml -> write($data, $writer) };
try:
yaml.write(data, got)
except Exception as exc:
dollar_at = exc
raise
if (my $err=$test -> {error}) {
unless (like $@, $err, "$name: Error message") {
diag "Error: $@\n";
}
is_deeply $got, [], "$name: No result";
pass;
}
else {
my $want = $test -> {out};
unless (ok ! $@, "$name: No error") {
diag "Error: $@\n";
}
unless (is_deeply $got, $want, "$name: Result matches") {
local $Data::Dumper::Useqq = $Data::Dumper::Useqq = 1;
diag(Data::Dumper -> Dump([$got], ['$got']));
diag(Data::Dumper -> Dump([$want], ['$expected']));
}
# FIXME just to say ... THERE IS NO 'error' key in SCHEDULE!!!
err = test['error']
if err:
if not err.search(dollar_at): # FIXME $@ (or dollar_at) is described
# in perlvar(1) the error status of the last eval(), which
# means that yaml.read(test['in'])
# if everything is alright, then it is None
self.assertFalse("%s: Error message" % name)
raise Exception(dollar_at)
self.assert_(not got, "%s: No result" % name)
else:
want = test['out']
self.assert_(not dollar_at, "%s: No error\n%s" % (name, dollar_at))
my $yr = Data::YAML::Reader -> new;
self.assertEqual(got, want, """%s: Result matches
expected = %s
observed = %s
""" % (name, want, got))
# Now try parsing it
my $reader = sub { shift @$got };
my $parsed = $yr -> read($reader);
yr = yamlish.Reader()
unless (is_deeply $parsed, $data, "$name: Reparse OK") {
local $Data::Dumper::Useqq = $Data::Dumper::Useqq = 1;
diag(Data::Dumper -> Dump([$parsed], ['$parsed']));
diag(Data::Dumper -> Dump([$data], ['$data']));
}
}
}
# Now try parsing it
parsed = yr.read(got) # FIXME got has an iterator
self.assertEqual(parsed, data, """%s: Reparse OK
expected = %s
observed = %s
""" % (name, data, parsed))
......@@ -71,6 +71,9 @@ class Reader(object):
def __init__(self):
pass
def get_raw(self):
pass
def read(self, source):
pass
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment