Ignore:
Timestamp:
Jan 31, 2015, 7:12:40 PM (10 years ago)
Author:
steve
Message:

Moving test folders to tests foldersy

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/anuga_core/source/anuga/geometry/test/test_polygon.py

    r9551 r9562  
    876876        self.failIf(status!=3, 'Expected status 3, got status=%s, value=%s' %
    877877                               (str(status), str(value)))
    878         self.failUnless(value is None, 'Expected value of None, got %s' %
     878        self.assertTrue(value is None, 'Expected value of None, got %s' %
    879879                                       str(value))
    880880
     
    887887        self.failIf(status!=3, 'Expected status 3, got status=%s, value=%s' %
    888888                               (str(status), str(value)))
    889         self.failUnless(value is None, 'Expected value of None, got %s' %
     889        self.assertTrue(value is None, 'Expected value of None, got %s' %
    890890                                       str(value))
    891891
     
    898898        self.failIf(status!=3, 'Expected status 3, got status=%s, value=%s' %
    899899                               (str(status), str(value)))
    900         self.failUnless(value is None, 'Expected value of None, got %s' %
     900        self.assertTrue(value is None, 'Expected value of None, got %s' %
    901901                                       str(value))
    902902
     
    909909        self.failIf(status!=3, 'Expected status 3, got status=%s, value=%s' %
    910910                               (str(status), str(value)))
    911         self.failUnless(value is None, 'Expected value of None, got %s' %
     911        self.assertTrue(value is None, 'Expected value of None, got %s' %
    912912                                       str(value))
    913913
     
    924924        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    925925                               (str(status), str(value)))
    926         self.failUnless(num.allclose(value, line0))
     926        self.assertTrue(num.allclose(value, line0))
    927927
    928928        # line0 fully within line1, same direction
     
    936936        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    937937                               (str(status), str(value)))
    938         self.failUnless(num.allclose(value, line0))
     938        self.assertTrue(num.allclose(value, line0))
    939939
    940940        # line0 fully within line1, opposite direction
     
    948948        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    949949                               (str(status), str(value)))
    950         self.failUnless(num.allclose(value, line0))
     950        self.assertTrue(num.allclose(value, line0))
    951951
    952952        # line0 fully within line1, opposite direction
     
    960960        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    961961                               (str(status), str(value)))
    962         self.failUnless(num.allclose(value, line0))
     962        self.assertTrue(num.allclose(value, line0))
    963963
    964964        # ----------------------------------------------------------------------
     
    974974        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    975975                               (str(status), str(value)))
    976         self.failUnless(num.allclose(value, line1))
     976        self.assertTrue(num.allclose(value, line1))
    977977
    978978        # line1 fully within line0, same direction
     
    986986        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    987987                               (str(status), str(value)))
    988         self.failUnless(num.allclose(value, line1))
     988        self.assertTrue(num.allclose(value, line1))
    989989
    990990        # line1 fully within line0, opposite direction
     
    998998        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    999999                               (str(status), str(value)))
    1000         self.failUnless(num.allclose(value, line1))
     1000        self.assertTrue(num.allclose(value, line1))
    10011001
    10021002        # line1 fully within line0, opposite direction
     
    10101010        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    10111011                               (str(status), str(value)))
    1012         self.failUnless(num.allclose(value, line1))
     1012        self.assertTrue(num.allclose(value, line1))
    10131013
    10141014        # ----------------------------------------------------------------------
     
    10241024        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    10251025                               (str(status), str(value)))
    1026         self.failUnless(num.allclose(value, [line1[0],line0[1]]))
     1026        self.assertTrue(num.allclose(value, [line1[0],line0[1]]))
    10271027
    10281028        # line in same direction, partial overlap
     
    10361036        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    10371037                               (str(status), str(value)))
    1038         self.failUnless(num.allclose(value, [line0[0],line1[1]]))
     1038        self.assertTrue(num.allclose(value, [line0[0],line1[1]]))
    10391039
    10401040        # line in opposite direction, partial overlap
     
    10481048        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    10491049                               (str(status), str(value)))
    1050         self.failUnless(num.allclose(value, [line0[0],line1[0]]))
     1050        self.assertTrue(num.allclose(value, [line0[0],line1[0]]))
    10511051
    10521052        # line in opposite direction, partial overlap
     
    10601060        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    10611061                               (str(status), str(value)))
    1062         self.failUnless(num.allclose(value, [line1[1],line0[1]]))
     1062        self.assertTrue(num.allclose(value, [line1[1],line0[1]]))
    10631063
    10641064        # ----------------------------------------------------------------------
     
    10741074        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    10751075                               (str(status), str(value)))
    1076         self.failUnless(num.allclose(value, [line0[0],line1[1]]))
     1076        self.assertTrue(num.allclose(value, [line0[0],line1[1]]))
    10771077
    10781078        # line in same direction, partial overlap
     
    10861086        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    10871087                               (str(status), str(value)))
    1088         self.failUnless(num.allclose(value, [line1[0],line0[1]]))
     1088        self.assertTrue(num.allclose(value, [line1[0],line0[1]]))
    10891089
    10901090        # line in opposite direction, partial overlap
     
    10981098        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    10991099                               (str(status), str(value)))
    1100         self.failUnless(num.allclose(value, [line1[1],line0[1]]))
     1100        self.assertTrue(num.allclose(value, [line1[1],line0[1]]))
    11011101
    11021102        # line in opposite direction, partial overlap
     
    11101110        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    11111111                               (str(status), str(value)))
    1112         self.failUnless(num.allclose(value, [line0[0],line1[0]]))
     1112        self.assertTrue(num.allclose(value, [line0[0],line1[0]]))
    11131113
    11141114        # ----------------------------------------------------------------------
     
    11241124        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    11251125                               (str(status), str(value)))
    1126         self.failUnless(num.allclose(value, line0))
     1126        self.assertTrue(num.allclose(value, line0))
    11271127
    11281128        # line in same direction, same left point, line1 longer
     
    11361136        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    11371137                               (str(status), str(value)))
    1138         self.failUnless(num.allclose(value, line0))
     1138        self.assertTrue(num.allclose(value, line0))
    11391139
    11401140        # line in opposite direction, same left point, line1 longer
     
    11481148        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    11491149                               (str(status), str(value)))
    1150         self.failUnless(num.allclose(value, line0))
     1150        self.assertTrue(num.allclose(value, line0))
    11511151
    11521152        # line in opposite direction, same start point, line1 longer
     
    11601160        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    11611161                               (str(status), str(value)))
    1162         self.failUnless(num.allclose(value, line0))
     1162        self.assertTrue(num.allclose(value, line0))
    11631163
    11641164        # ----------------------------------------------------------------------
     
    11741174        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    11751175                               (str(status), str(value)))
    1176         self.failUnless(num.allclose(value, line0))
     1176        self.assertTrue(num.allclose(value, line0))
    11771177
    11781178        # line in same direction, same left point, same right point
     
    11861186        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    11871187                               (str(status), str(value)))
    1188         self.failUnless(num.allclose(value, line0))
     1188        self.assertTrue(num.allclose(value, line0))
    11891189
    11901190        # line in opposite direction, same left point, same right point
     
    11981198        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    11991199                               (str(status), str(value)))
    1200         self.failUnless(num.allclose(value, line0))
     1200        self.assertTrue(num.allclose(value, line0))
    12011201
    12021202        # line in opposite direction, same left point, same right point
     
    12101210        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    12111211                               (str(status), str(value)))
    1212         self.failUnless(num.allclose(value, line0))
     1212        self.assertTrue(num.allclose(value, line0))
    12131213
    12141214        # ----------------------------------------------------------------------
     
    12241224        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    12251225                               (str(status), str(value)))
    1226         self.failUnless(num.allclose(value, line0))
     1226        self.assertTrue(num.allclose(value, line0))
    12271227
    12281228        # line in same direction, same right point, line1 longer
     
    12361236        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    12371237                               (str(status), str(value)))
    1238         self.failUnless(num.allclose(value, line0))
     1238        self.assertTrue(num.allclose(value, line0))
    12391239
    12401240        # line in opposite direction, same right point, line1 longer
     
    12481248        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    12491249                               (str(status), str(value)))
    1250         self.failUnless(num.allclose(value, line0))
     1250        self.assertTrue(num.allclose(value, line0))
    12511251
    12521252        # line in opposite direction, same right point, line1 longer
     
    12601260        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    12611261                               (str(status), str(value)))
    1262         self.failUnless(num.allclose(value, line0))
     1262        self.assertTrue(num.allclose(value, line0))
    12631263
    12641264        # ----------------------------------------------------------------------
     
    12741274        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    12751275                               (str(status), str(value)))
    1276         self.failUnless(num.allclose(value, line1))
     1276        self.assertTrue(num.allclose(value, line1))
    12771277
    12781278        # line in same direction, same left point, line0 longer
     
    12861286        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    12871287                               (str(status), str(value)))
    1288         self.failUnless(num.allclose(value, line1))
     1288        self.assertTrue(num.allclose(value, line1))
    12891289
    12901290        # line in opposite direction, same left point, line0 longer
     
    12981298        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    12991299                               (str(status), str(value)))
    1300         self.failUnless(num.allclose(value, line1))
     1300        self.assertTrue(num.allclose(value, line1))
    13011301
    13021302        # line in opposite direction, same left point, line0 longer
     
    13101310        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    13111311                               (str(status), str(value)))
    1312         self.failUnless(num.allclose(value, line1))
     1312        self.assertTrue(num.allclose(value, line1))
    13131313
    13141314        # ----------------------------------------------------------------------
     
    13241324        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    13251325                               (str(status), str(value)))
    1326         self.failUnless(num.allclose(value, line1))
     1326        self.assertTrue(num.allclose(value, line1))
    13271327
    13281328        # line in same direction, same right point, line0 longer
     
    13361336        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    13371337                               (str(status), str(value)))
    1338         self.failUnless(num.allclose(value, line1))
     1338        self.assertTrue(num.allclose(value, line1))
    13391339
    13401340        # line in opposite direction, same right point, line0 longer
     
    13481348        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    13491349                               (str(status), str(value)))
    1350         self.failUnless(num.allclose(value, line1))
     1350        self.assertTrue(num.allclose(value, line1))
    13511351
    13521352        # line in opposite direction, same right point, line0 longer
     
    13601360        self.failIf(status!=2, 'Expected status 2, got status=%s, value=%s' %
    13611361                               (str(status), str(value)))
    1362         self.failUnless(num.allclose(value, line1))
     1362        self.assertTrue(num.allclose(value, line1))
    13631363
    13641364
Note: See TracChangeset for help on using the changeset viewer.