Update all the unittests to use the new framework, test skipping with isValidAtom...

svn path=/main/trunk/; revision=6182

diff --git a/pym/portage/tests/dep/test_dep_getcpv.py b/pym/portage/tests/dep/test_dep_getcpv.py
index 11fd1a72316715068cc7bbe2c872132aaaf72dfb..a49f4fa6be6be5df6c84b216852e2285dcad2958 100644 (file)
--- a/pym/portage/tests/dep/test_dep_getcpv.py
+++ b/pym/portage/tests/dep/test_dep_getcpv.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from unittest import TestCase
+from portage.tests import TestCase
 from portage.dep import dep_getcpv
 
 class DepGetCPV(TestCase):

diff --git a/pym/portage/tests/dep/test_dep_getslot.py b/pym/portage/tests/dep/test_dep_getslot.py
index d3b38917a66ce11ea9ee4488b30d67467f684efd..61ea815864256ba06f69bc8fcd81b1fb3bc53065 100644 (file)
--- a/pym/portage/tests/dep/test_dep_getslot.py
+++ b/pym/portage/tests/dep/test_dep_getslot.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from unittest import TestCase
+from portage.tests import TestCase
 from portage.dep import dep_getslot
 
 class DepGetSlot(TestCase):

diff --git a/pym/portage/tests/dep/test_dep_getusedeps.py b/pym/portage/tests/dep/test_dep_getusedeps.py
index 309c659f5edc36bb586384a67d06302d09df54cd..30fa7772fae843fbf19986ce3b1960ea6493d639 100644 (file)
--- a/pym/portage/tests/dep/test_dep_getusedeps.py
+++ b/pym/portage/tests/dep/test_dep_getusedeps.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: test_dep_getslot.py 5794 2007-01-27 18:16:08Z antarus $
 
-from unittest import TestCase
+from portage.tests import TestCase
 from portage.dep import dep_getusedeps
 
 import sys

diff --git a/pym/portage/tests/dep/test_get_operator.py b/pym/portage/tests/dep/test_get_operator.py
index e5b5b7e6cbfdb8ae069a080ff90e7d7cec8ba85c..f93c2776f8d2106a4e8cbca44eab7f7c57127d82 100644 (file)
--- a/pym/portage/tests/dep/test_get_operator.py
+++ b/pym/portage/tests/dep/test_get_operator.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from unittest import TestCase
+from portage.tests import TestCase
 from portage.dep import get_operator
 
 class GetOperator(TestCase):

diff --git a/pym/portage/tests/dep/test_isjustname.py b/pym/portage/tests/dep/test_isjustname.py
index e419e3f2643bb27206f2f63b75449c41e853fb56..e6b0e85318295977b5ecb31cb169da39ea691d44 100644 (file)
--- a/pym/portage/tests/dep/test_isjustname.py
+++ b/pym/portage/tests/dep/test_isjustname.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from unittest import TestCase
+from portage.tests import TestCase
 from portage.dep import isjustname
 
 class IsJustName(TestCase):

diff --git a/pym/portage/tests/dep/test_isvalidatom.py b/pym/portage/tests/dep/test_isvalidatom.py
index 995ec9924e4504642033444ef890fe9e12bebf29..5f0149120f736b76878d1cc3a91238a4cf8f4530 100644 (file)
--- a/pym/portage/tests/dep/test_isvalidatom.py
+++ b/pym/portage/tests/dep/test_isvalidatom.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from unittest import TestCase
+from portage.tests import TestCase
 from portage.dep import isvalidatom
 import portage.dep
 portage.dep._dep_check_strict = True
@@ -25,7 +25,7 @@ class IsValidAtom(TestCase):
                          ( "sys-apps/portage:foo", True ),
                          ( "sys-apps/portage-2.1:foo", False ),
                          ( "sys-apps/portage-2.1:", False ),
-                         ( ">~cate-gory/foo-1.0", True ),
+                         ( ">~cate-gory/foo-1.0", False ),
                          ( ">~category/foo-1.0", True ),
                          ( "<~category/foo-1.0", True ),
                          ( "###cat/foo-1.0", False ),
@@ -33,6 +33,7 @@ class IsValidAtom(TestCase):
                          ( "portage", False ) ]
 
                for test in tests:
+                       raise self.SkipException()
                        if test[1]:
                                atom_type = "valid"
                        else:

diff --git a/pym/portage/tests/dep/test_match_from_list.py b/pym/portage/tests/dep/test_match_from_list.py
index 4868184a6f9638f86db012efd62b1315f1621642..8d5b1a812f12ffd6cb71bfe94cea5203cf5533b8 100644 (file)
--- a/pym/portage/tests/dep/test_match_from_list.py
+++ b/pym/portage/tests/dep/test_match_from_list.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from unittest import TestCase
+from portage.tests import TestCase
 from portage.dep import match_from_list
 
 class AtomCmpEqualGlob(TestCase):

diff --git a/pym/portage/tests/news/test_NewsItem.py b/pym/portage/tests/news/test_NewsItem.py
index 22ef298d44a0fa4f73d45613f68d8de138edf961..6df8717280a0f05c70cc75b667123afc2fd338b5 100644 (file)
--- a/pym/portage/tests/news/test_NewsItem.py
+++ b/pym/portage/tests/news/test_NewsItem.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id: test_varExpand.py 5596 2007-01-12 08:08:53Z antarus $
 
-from unittest import TestCase, TestLoader
+from portage.tests import TestCase, TestLoader
 from portage.news import NewsItem
 from portage.const import PROFILE_PATH
 

diff --git a/pym/portage/tests/util/test_grabdict.py b/pym/portage/tests/util/test_grabdict.py
index 9f7b589215a5f08b6c4612c00f76c668760876bc..2a06422430e073b5a350a2e1a2d5d5bdfa0512b5 100644 (file)
--- a/pym/portage/tests/util/test_grabdict.py
+++ b/pym/portage/tests/util/test_grabdict.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from unittest import TestCase, TestLoader
+from portage.tests import TestCase
 from portage.util import grabdict
 
 class GrabDictTestCase(TestCase):

diff --git a/pym/portage/tests/util/test_normalizedPath.py b/pym/portage/tests/util/test_normalizedPath.py
index bd575d26680a5943ed17f0e8430eddea939d8bd6..b6851651ade7bcdfee10468fc79d8bbbc63576e0 100644 (file)
--- a/pym/portage/tests/util/test_normalizedPath.py
+++ b/pym/portage/tests/util/test_normalizedPath.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from unittest import TestCase
+from portage.tests import TestCase
 
 class NormalizePathTestCase(TestCase):
        

diff --git a/pym/portage/tests/util/test_stackDictList.py b/pym/portage/tests/util/test_stackDictList.py
index 9e7a38ba16b943d3d173f5d92d0f5b339078d6fc..ada56fa0feed77bd629eceb51c8d830262af32c9 100644 (file)
--- a/pym/portage/tests/util/test_stackDictList.py
+++ b/pym/portage/tests/util/test_stackDictList.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from unittest import TestCase
+from portage.tests import TestCase
 
 class StackDictListTestCase(TestCase):
 

diff --git a/pym/portage/tests/util/test_stackDicts.py b/pym/portage/tests/util/test_stackDicts.py
index 9d963744004fb612d8142e458d5a28f73b0b7c07..aa8a712efa2e3bc2ac1fae8d8d247fe433a2b697 100644 (file)
--- a/pym/portage/tests/util/test_stackDicts.py
+++ b/pym/portage/tests/util/test_stackDicts.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from unittest import TestCase
+from portage.tests import TestCase
 from portage.util import stack_dicts
 
 

diff --git a/pym/portage/tests/util/test_stackLists.py b/pym/portage/tests/util/test_stackLists.py
index 3fc028323a07cf1538b67e64ca62abc2070578ab..c26bbb06af49e041ed41254372c3961887d0e1c7 100644 (file)
--- a/pym/portage/tests/util/test_stackLists.py
+++ b/pym/portage/tests/util/test_stackLists.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from unittest import TestCase
+from portage.tests import TestCase
 from portage.util import stack_lists
 
 class StackListsTestCase(TestCase):

diff --git a/pym/portage/tests/util/test_uniqueArray.py b/pym/portage/tests/util/test_uniqueArray.py
index 62a3153217c93e5671d7f62227dd84821fc53c66..e1b9caec87c533304efdf0de85c86ee41f8a07db 100644 (file)
--- a/pym/portage/tests/util/test_uniqueArray.py
+++ b/pym/portage/tests/util/test_uniqueArray.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from unittest import TestCase
+from portage.tests import TestCase
 from portage.util import unique_array
 
 class UniqueArrayTestCase(TestCase):

diff --git a/pym/portage/tests/util/test_varExpand.py b/pym/portage/tests/util/test_varExpand.py
index 47dc7de2cad9024721f3a21849dae978914cdec5..0a8bf5b118e7db8c5d755162c71d71e67e289880 100644 (file)
--- a/pym/portage/tests/util/test_varExpand.py
+++ b/pym/portage/tests/util/test_varExpand.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from unittest import TestCase, TestLoader
+from portage.tests import TestCase
 from portage.util import varexpand
 
 class VarExpandTestCase(TestCase):

diff --git a/pym/portage/tests/versions/test_vercmp.py b/pym/portage/tests/versions/test_vercmp.py
index ee3d3774151a5f81d09ed16ef488e8914c6385a0..d43c38e76334ed9241e73d5217d95d707e2767fe 100644 (file)
--- a/pym/portage/tests/versions/test_vercmp.py
+++ b/pym/portage/tests/versions/test_vercmp.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from unittest import TestCase
+from portage.tests import TestCase
 from portage.versions import vercmp
 
 class VerCmpTestCase(TestCase):

diff --git a/pym/portage/tests/xpak/__init__.py b/pym/portage/tests/xpak/__init__.py
new file mode 100644 (file)
index 0000000..a3226c1
--- /dev/null
+++ b/pym/portage/tests/xpak/__init__.py
@@ -0,0 +1,4 @@
+# tests/portage.dep/__init__.py -- Portage Unit Test functionality
+# Copyright 2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$

diff --git a/pym/portage/tests/xpak/test_decodeint.py b/pym/portage/tests/xpak/test_decodeint.py
new file mode 100644 (file)
index 0000000..c0f3264
--- /dev/null
+++ b/pym/portage/tests/xpak/test_decodeint.py
@@ -0,0 +1,14 @@
+# xpak/test_decodeint.py
+# Copright Gentoo Foundation 2006
+# Portage Unit Testing Functionality
+# $Id$
+
+from portage.tests import TestCase
+from portage.xpak import decodeint, encodeint
+
+class testDecodeIntTestCase(TestCase):
+
+       def testDecodeInt(self):
+               
+               for n in xrange(1000):
+                       self.assertEqual(decodeint(encodeint(n)), n)