rewrote DescriptionTree, as a list of Description objects

2 files changed, 41 insertions, 30 deletions

diff --git a/tests/test_description.py b/tests/test_description.py
index 980b807..75169c2 100644
--- a/tests/test_description.py
+++ b/tests/test_description.py
@@ -157,17 +157,27 @@ class TestDescription(testcase.TestCase):
                 (match.group(1), match.group(3), match.group(4)),
                 pkgtpl
             )
-
+    
     def test_re_pkg_atom(self):
         depends = [
+            ('pkg-1', ('pkg', '1')),
+            ('pkg-1.0', ('pkg', '1.0')),
+            ('pkg-1.0.0', ('pkg', '1.0.0')),
+        ]
+        for pkgstr, pkgtpl in depends:
+            match = description.re_pkg_atom.match(pkgstr)
+            self.assertEqual((match.group(1), match.group(2)), pkgtpl)
+    
+    def test_re_desc_file(self):
+        depends = [
             ('pkg-1.DESCRIPTION', ('pkg-1', 'pkg', '1')),
             ('pkg-1.0.DESCRIPTION', ('pkg-1.0', 'pkg', '1.0')),
             ('pkg-1.0.0.DESCRIPTION', ('pkg-1.0.0', 'pkg', '1.0.0')),
         ]
         for pkgstr, pkgtpl in depends:
-            match = description.re_pkg_atom.match(pkgstr)
+            match = description.re_desc_file.match(pkgstr)
             self.assertEqual((match.group(1), match.group(2), match.group(3)), pkgtpl)
-
+    
     def test_attributes(self):
         # TODO: split this method to improve the error reporting
         # TODO: figure out how to test the comments
@@ -203,6 +213,7 @@ def suite():
     suite = unittest.TestSuite()
     suite.addTest(TestDescription('test_re_depends'))
     suite.addTest(TestDescription('test_re_pkg_atom'))
+    suite.addTest(TestDescription('test_re_desc_file'))
     suite.addTest(TestDescription('test_attributes'))
     return suite
 
diff --git a/tests/test_description_tree.py b/tests/test_description_tree.py
index 8e28553..ad00643 100644
--- a/tests/test_description_tree.py
+++ b/tests/test_description_tree.py
@@ -54,42 +54,42 @@ class TestDescriptionTree(testcase.TestCase):
                 self._tree.latest_version(pkg)
             )
     
-    def test_version_compare(self):
+    def test_latest_version_from_list(self):
         # TODO: cover a better range of versions
         versions = [
-            # ((version1, version2), latest_version)
-            (('1', '2'), '2'),
-            (('0.1', '1'), '1'),
-            (('0.1', '0.2'), '0.2'),
-            (('0.0.1', '1'), '1'),
-            (('0.0.1', '0.1'), '0.1'),
-            (('0.0.1', '0.0.2'), '0.0.2'),
-            (('2', '1'), '2'),
-            (('1', '0.1'), '1'),
-            (('0.2', '0.1'), '0.2'),
-            (('1', '0.0.1'), '1'),
-            (('0.1', '0.0.1'), '0.1'),
-            (('0.0.2', '0.0.1'), '0.0.2'),
+            # ([version1, version2], latest_version)
+            (['1', '2'], '2'),
+            (['0.1', '1'], '1'),
+            (['0.1', '0.2'], '0.2'),
+            (['0.0.1', '1'], '1'),
+            (['0.0.1', '0.1'], '0.1'),
+            (['0.0.1', '0.0.2'], '0.0.2'),
+            (['2', '1'], '2'),
+            (['1', '0.1'], '1'),
+            (['0.2', '0.1'], '0.2'),
+            (['1', '0.0.1'], '1'),
+            (['0.1', '0.0.1'], '0.1'),
+            (['0.0.2', '0.0.1'], '0.0.2'),
         ]
         for ver, latest in versions:
-            self.assertEqual(self._tree.version_compare(ver), latest)
+            self.assertEqual(self._tree.latest_version_from_list(ver), latest)
     
     def test_description_files(self):
         packages = [
-            ('main', 'main1', '0.0.1'),
-            ('main', 'main2', '0.0.1'),
-            ('main', 'main2', '0.0.2'),
-            ('extra', 'extra1', '0.0.1'),
-            ('extra', 'extra2', '0.0.1'),
-            ('extra', 'extra2', '0.0.2'),
-            ('language', 'language1', '0.0.1'),
-            ('language', 'language2', '0.0.1'),
-            ('language', 'language2', '0.0.2'),
+            'main1-0.0.1',
+            'main2-0.0.1',
+            'main2-0.0.2',
+            'extra1-0.0.1',
+            'extra2-0.0.1',
+            'extra2-0.0.2',
+            'language1-0.0.1',
+            'language2-0.0.1',
+            'language2-0.0.2',
         ]
-        for cat, pkg, ver in packages:
+        for pkg in packages:
             self.assertTrue(
                 isinstance(
-                    self._tree[pkg+'-'+ver],
+                    self._tree.get(pkg),
                     description.Description
                 )
             )
@@ -99,6 +99,6 @@ def suite():
     suite = unittest.TestSuite()
     suite.addTest(TestDescriptionTree('test_package_versions'))
     suite.addTest(TestDescriptionTree('test_latest_version'))
-    suite.addTest(TestDescriptionTree('test_version_compare'))
+    suite.addTest(TestDescriptionTree('test_latest_version_from_list'))
     suite.addTest(TestDescriptionTree('test_description_files'))
     return suite