Changeset 9562 for trunk/anuga_core/source/anuga/lib/test/test_maxasc.py

Timestamp:

Jan 31, 2015, 7:12:40 PM (10 years ago)

Author:

steve

Message:

Moving test folders to tests foldersy

File:

• trunk/anuga_core/source/anuga/lib/test/test_maxasc.py (modified) (7 diffs)

trunk/anuga_core/source/anuga/lib/test/test_maxasc.py

@@ -95 +95 @@
         in_file = os.path.join(test_path, 'test1.asc')
         expected_file = os.path.join(test_path, 'test1_bad_num_lines.asc')
-        self.failUnlessRaises(RuntimeError, MaxAsc,
+        self.assertRaises(RuntimeError, MaxAsc,
                               'test.out.asc',
                               [in_file, expected_file])
@@ -103 +103 @@
         in_file = os.path.join(test_path, 'test1.asc')
         expected_file = os.path.join(test_path, 'test1_bad_num_lines.asc')
-        self.failUnlessRaises(RuntimeError, MaxAsc,
+        self.assertRaises(RuntimeError, MaxAsc,
                               'test.out.asc',
                               [in_file, expected_file])
@@ -111 +111 @@
         in_file = os.path.join(test_path, 'test1.asc')
         expected_file = os.path.join(test_path, 'test1_wrong_num_columns.asc')
-        self.failUnlessRaises(RuntimeError, MaxAsc,
+        self.assertRaises(RuntimeError, MaxAsc,
                               'test.out.asc',
                               [in_file, expected_file])
@@ -119 +119 @@
         in_file = os.path.join(test_path, 'test1.asc')
         MaxAsc('test1.out.asc', [in_file])
-        self.failUnless(FilesEqual('test1.out.asc', in_file))
+        self.assertTrue(FilesEqual('test1.out.asc', in_file))
 
 
@@ -126 +126 @@
         in_file = os.path.join(test_path, 'test1.asc')
         MaxAsc('test1.out.asc', [in_file] * 30)
-        self.failUnless(FilesEqual('test1.out.asc', in_file))
+        self.assertTrue(FilesEqual('test1.out.asc', in_file))
 
     def test_different_input2(self):
@@ -134 +134 @@
         expected_file = os.path.join(test_path, 'test2.expected.asc')
         MaxAsc('test2.out.asc', [in_file, in_file2])
-        self.failUnless(FilesEqual('test2.out.asc', expected_file))
+        self.assertTrue(FilesEqual('test2.out.asc', expected_file))
 
     def test_different_input3(self):
@@ -143 +143 @@
         expected_file = os.path.join(test_path, 'test3.expected.asc')
         MaxAsc('test3.out.asc', [in_file, in_file2, in_file3])
-        self.failUnless(FilesEqual('test3.out.asc', expected_file))
+        self.assertTrue(FilesEqual('test3.out.asc', expected_file))
 
 if __name__ == '__main__':