Use self.assert* everywhere instead of the assert statement.

1 files changed, 41 insertions, 41 deletions

diff --git a/morphlib/blobs_tests.py b/morphlib/blobs_tests.py
index ffa707e6..75d58d46 100644
--- a/morphlib/blobs_tests.py
+++ b/morphlib/blobs_tests.py
@@ -26,71 +26,71 @@ class BlobsTests(unittest.TestCase):
         blob2 = morphlib.blobs.Blob(None)
         blob3 = morphlib.blobs.Blob(None)
 
-        assert(len(blob1.parents) == 0)
+        self.assertEqual(len(blob1.parents), 0)
 
         blob1.add_parent(blob2)
-        assert(blob2 in blob1.parents)
-        assert(blob3 not in blob1.parents)
-        assert(len(blob1.parents) == 1)
+        self.assertIn(blob2, blob1.parents)
+        self.assertNotIn(blob3, blob1.parents)
+        self.assertEqual(len(blob1.parents), 1)
 
         blob1.add_parent(blob3)
-        assert(blob2 in blob1.parents)
-        assert(blob3 in blob1.parents)
-        assert(len(blob1.parents) == 2)
+        self.assertIn(blob2, blob1.parents)
+        self.assertIn(blob3, blob1.parents)
+        self.assertEqual(len(blob1.parents), 2)
 
         blob1.remove_parent(blob2)
-        assert(blob2 not in blob1.parents)
-        assert(blob3 in blob1.parents)
-        assert(len(blob1.parents) == 1)
+        self.assertNotIn(blob2, blob1.parents)
+        self.assertIn(blob3, blob1.parents)
+        self.assertEqual(len(blob1.parents), 1)
 
         blob1.remove_parent(blob3)
-        assert(blob2 not in blob1.parents)
-        assert(blob3 not in blob1.parents)
-        assert(len(blob1.parents) == 0)
+        self.assertNotIn(blob2, blob1.parents)
+        self.assertNotIn(blob3, blob1.parents)
+        self.assertEqual(len(blob1.parents), 0)
 
     def test_blob_add_remove_dependency(self):
         blob1 = morphlib.blobs.Blob(None)
         blob2 = morphlib.blobs.Blob(None)
 
-        assert(len(blob1.dependencies) == 0)
-        assert(len(blob2.dependencies) == 0)
+        self.assertEqual(len(blob1.dependencies), 0)
+        self.assertEqual(len(blob2.dependencies), 0)
 
         blob1.add_dependency(blob2)
 
-        assert(blob2 in blob1.dependencies)
-        assert(blob1 in blob2.dependents)
+        self.assertIn(blob2, blob1.dependencies)
+        self.assertIn(blob1, blob2.dependents)
         
-        assert(blob1.depends_on(blob2))
+        self.assertTrue(blob1.depends_on(blob2))
 
         blob2.add_dependency(blob1)
 
-        assert(blob2 in blob1.dependencies)
-        assert(blob1 in blob2.dependents)
-        assert(blob1 in blob2.dependencies)
-        assert(blob2 in blob1.dependents)
+        self.assertIn(blob2, blob1.dependencies)
+        self.assertIn(blob1, blob2.dependents)
+        self.assertIn(blob1, blob2.dependencies)
+        self.assertIn(blob2, blob1.dependents)
 
-        assert(blob1.depends_on(blob2))
-        assert(blob2.depends_on(blob1))
+        self.assertTrue(blob1.depends_on(blob2))
+        self.assertTrue(blob2.depends_on(blob1))
 
         blob1.remove_dependency(blob2)
 
-        assert(blob2 not in blob1.dependencies)
-        assert(blob1 not in blob2.dependents)
-        assert(blob1 in blob2.dependencies)
-        assert(blob2 in blob1.dependents)
+        self.assertNotIn(blob2, blob1.dependencies)
+        self.assertNotIn(blob1, blob2.dependents)
+        self.assertIn(blob1, blob2.dependencies)
+        self.assertIn(blob2, blob1.dependents)
 
-        assert(not blob1.depends_on(blob2))
-        assert(blob2.depends_on(blob1))
+        self.assertFalse(blob1.depends_on(blob2))
+        self.assertTrue(blob2.depends_on(blob1))
 
         blob2.remove_dependency(blob1)
 
-        assert(blob2 not in blob1.dependencies)
-        assert(blob1 not in blob2.dependents)
-        assert(blob1 not in blob2.dependencies)
-        assert(blob2 not in blob1.dependents)
+        self.assertNotIn(blob2, blob1.dependencies)
+        self.assertNotIn(blob1, blob2.dependents)
+        self.assertNotIn(blob1, blob2.dependencies)
+        self.assertNotIn(blob2, blob1.dependents)
 
-        assert(not blob1.depends_on(blob2))
-        assert(not blob2.depends_on(blob1))
+        self.assertFalse(blob1.depends_on(blob2))
+        self.assertFalse(blob2.depends_on(blob1))
 
     def test_chunks(self):
         settings = { 'git-base-url': '' }
@@ -99,16 +99,16 @@ class BlobsTests(unittest.TestCase):
         
         stratum_morph = loader.load('repo', 'ref', 'foo.morph')
         stratum = morphlib.blobs.Stratum(stratum_morph)
-        assert(len(stratum.chunks) == 1)
-        assert('foo' in stratum.chunks)
+        self.assertEquals(len(stratum.chunks), 1)
+        self.assertIn('foo', stratum.chunks)
         self.assertEqual(['.'], stratum.chunks['foo'])
 
         chunk_morph = loader.load('repo', 'ref', 'bar.morph')
         chunk = morphlib.blobs.Chunk(chunk_morph)
-        assert(len(chunk.chunks) == 2)
-        assert('include' in chunk.chunks)
+        self.assertEqual(len(chunk.chunks), 2)
+        self.assertIn('include', chunk.chunks)
         self.assertEqual(chunk.chunks['include'], ['include/'])
-        assert('src' in chunk.chunks)
+        self.assertIn('src', chunk.chunks)
         self.assertEqual(chunk.chunks['src'], ['src/'])
 
     def get_morph_text(self, repo, ref, filename):