Changeset 9462

Timestamp:

Jan 21, 2015, 4:54:15 PM (10 years ago)

Author:

steve

Message:

cleanup geometry folder

Location:

trunk/anuga_core/source/anuga/geometry/test

Files:

• . (added)
• test_all.py (moved) (moved from trunk/anuga_core/source/anuga/geometry/test_all.py)
• test_geometry.py (moved) (moved from trunk/anuga_core/source/anuga/geometry/test_geometry.py) (1 diff)
• test_polygon.py (moved) (moved from trunk/anuga_core/source/anuga/geometry/test_polygon.py) (5 diffs)

trunk/anuga_core/source/anuga/geometry/test/test_geometry.py

@@ -6 +6 @@
 import unittest
 
-from aabb import AABB
-from quad import Cell
+from anuga.geometry.aabb import AABB
+from anuga.geometry.quad import Cell
 
 #-------------------------------------------------------------

trunk/anuga_core/source/anuga/geometry/test/test_polygon.py

@@ -4 +4 @@
 
 import unittest
+import os
 import numpy as num
 from anuga.utilities.numerical_tools import ensure_numeric
@@ -72 +73 @@
 
         # Form absolute filename and read
-        filename = path + sep + 'data' + sep + 'mainland_only.csv'
+        filename = os.path.join( path, 'test', 'data', 'mainland_only.csv')
         p1 = read_polygon(filename)
 
@@ -87 +88 @@
 
         # Form absolute filename and read
-        filename = path + sep + 'data' + sep +  'complex_polygon.csv'
+        filename = os.path.join( path, 'test', 'data', 'complex_polygon.csv')
         # Should cause an Exception
         try:
@@ -105 +106 @@
 
         # Form absolute filename and read
-        filename = path + sep + 'data' + sep +  'non_complex_polygon.csv'
+        filename = os.path.join( path, 'test', 'data',  'non_complex_polygon.csv')
         # Should cause an Exception
         try:
@@ -120 +121 @@
 
         # Form absolute filename and read
-        filename = path + sep + 'data' + sep +  'complex_polygon.csv'
+        filename = os.path.join( path, 'test', 'data',  'complex_polygon.csv')
         # Should not cause an Exception
         p1 = read_polygon(filename, closed=False)