Changeset 6360 for branches/numpy/anuga/geospatial_data/test_geospatial_data.py

Timestamp:

Feb 18, 2009, 2:44:41 PM (14 years ago)

Author:

rwilson

Message:

Ongoing conversion changes.

File:

• branches/numpy/anuga/geospatial_data/test_geospatial_data.py (modified) (1 diff)

branches/numpy/anuga/geospatial_data/test_geospatial_data.py

@@ -1836 +1836 @@
 
 ################################################################################
-# Test the clean_line() utility function.
-################################################################################
-
-    # helper routine to test clean_line()
-    def clean_line_test(self, instr, delim, expected):
-        result = clean_line(instr, delim)
-        self.failUnless(result == expected,
-                        "clean_line('%s', '%s'), expected %s, got %s"
-                        % (str(instr), str(delim), str(expected), str(result)))
-
-    def test_clean_line_01(self):
-        self.clean_line_test('abc, ,,xyz,123', ',', ['abc', '', 'xyz', '123'])
-
-    def test_clean_line_02(self):
-        self.clean_line_test(' abc , ,, xyz  , 123  ', ',',
-                             ['abc', '', 'xyz', '123'])
-
-    def test_clean_line_03(self):
-        self.clean_line_test('1||||2', '|', ['1', '2'])
-
-    def test_clean_line_04(self):
-        self.clean_line_test('abc, ,,xyz,123, ', ',',
-                             ['abc', '', 'xyz', '123', ''])
-
-    def test_clean_line_05(self):
-        self.clean_line_test('abc, ,,xyz,123, ,    ', ',',
-                            ['abc', '', 'xyz', '123', '', ''])
-
-    def test_clean_line_06(self):
-        self.clean_line_test(',,abc, ,,xyz,123, ,    ', ',',
-                            ['abc', '', 'xyz', '123', '', ''])
-
-    def test_clean_line_07(self):
-        self.clean_line_test('|1||||2', '|', ['1', '2'])
-
-    def test_clean_line_08(self):
-        self.clean_line_test(' ,a,, , ,b,c , ,, , ', ',',
-                             ['', 'a', '', '', 'b', 'c', '', '', ''])
-
-    def test_clean_line_09(self):
-        self.clean_line_test('a:b:c', ':', ['a', 'b', 'c'])
-
-    def test_clean_line_10(self):
-        self.clean_line_test('a:b:c:', ':', ['a', 'b', 'c'])
-
-    # new version of function should leave last field if contains '\n'.
-    # cf. test_clean_line_10() above.
-    def test_clean_line_11(self):
-        self.clean_line_test('a:b:c:\n', ':', ['a', 'b', 'c', ''])
 
 if __name__ == "__main__":