diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-08 09:58:59 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-14 13:24:50 +0000 |
| commit | 6bb51dc8c5ded8d23b5b880f8aa4f42c79ece3b7 (patch) | |
| tree | 930a6012c4becb89aefd3cb8a4564047f83e19cc /morphlib/source_tests.py | |
| parent | cb35dc18ac6ca8cc902f2629acf69dc8e0148f50 (diff) | |
| download | morph-6bb51dc8c5ded8d23b5b880f8aa4f42c79ece3b7.tar.gz | |
unittests: Make the unittests use morphloader
This commit removes all use of morph2 from the unittests, replacing it
with morphloader/morph3. It also converts the test morphologies to YAML.
Diffstat (limited to 'morphlib/source_tests.py')
| -rw-r--r-- | morphlib/source_tests.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/morphlib/source_tests.py b/morphlib/source_tests.py index 6643f0fc..f5ce5d4d 100644 --- a/morphlib/source_tests.py +++ b/morphlib/source_tests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2012 Codethink Limited +# Copyright (C) 2012-2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,10 +22,8 @@ import morphlib class SourceTests(unittest.TestCase): morphology_text = ''' - { - "name": "foo", - "kind": "chunk" - } + name: foo + kind: chunk ''' def setUp(self): @@ -33,7 +31,8 @@ class SourceTests(unittest.TestCase): self.original_ref = 'original/ref' self.sha1 = 'CAFEF00D' self.tree = 'F000000D' - self.morphology = morphlib.morph2.Morphology(self.morphology_text) + loader = morphlib.morphloader.MorphologyLoader() + self.morphology = loader.load_from_string(self.morphology_text) self.filename = 'foo.morph' self.source = morphlib.source.Source( self.repo_name, self.original_ref, self.sha1, self.tree, |