X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/7fe827a3c5ca6f6197bb9cade6a1d08efd9a5b41..8340d0e1199ab3ce2750d2d705b34c7a70f589a2:/gw-tests/genhtml/genhtml-test.py

diff --git a/gw-tests/genhtml/genhtml-test.py b/gw-tests/genhtml/genhtml-test.py
index 2e7aaa3..68d3131 100644
--- a/gw-tests/genhtml/genhtml-test.py
+++ b/gw-tests/genhtml/genhtml-test.py
@@ -17,16 +17,16 @@ def Dimension_and_DimValue():
     
 @wvtest                
 def Two_Dimensions_in_Tests():
-    t = Tests(None, DimensionTest(), DimensionKern())
-    WVPASSEQ([(a.__class__.__name__, b.__class__.__name__) for a, b in t.iterDimensionPairs()],
+    t = Tests(None, Space(DimensionTest(), DimensionKern()))
+    WVPASSEQ([(a.__class__.__name__, b.__class__.__name__) for a, b in t.space.iterDimensionPairs()],
              [('DimensionTest', 'DimensionKern'), ('DimensionKern', 'DimensionTest')])
 @wvtest                
 def Three_Dimensions_in_Tests():
     dt = DimensionTest()
     dk = DimensionKern()
     dd = Dimension('tmp', "Tmp")
-    t = Tests(None, dt, dk, dd)
-    pairs = [(a.__class__.__name__, b.__class__.__name__) for a, b in t.iterDimensionPairs()]
+    t = Tests(None, Space(dt, dk, dd))
+    pairs = [(a.__class__.__name__, b.__class__.__name__) for a, b in t.space.iterDimensionPairs()]
     WVPASSEQ(pairs[0], ('DimensionTest', 'DimensionKern'))
     WVPASSEQ(pairs[1], ('DimensionKern', 'DimensionTest'))
     WVPASSEQ(pairs[2], ('DimensionTest', 'Dimension'))
@@ -55,12 +55,12 @@ def Three_Dimensions_in_Tests():
     WVPASSEQ(t.getTest((v3, v2, v1)), MyTest)
     WVEXCEPT(KeyError, t.getTest, (v1, v1, v1))
     WVEXCEPT(KeyError, t.getTest, (v1, v2))
-    WVEXCEPT(TypeError, t.getTest, v1)
+    WVEXCEPT(Exception, t.getTest, v1)
 
-    WVPASSEQ([d.__class__.__name__ for d in t.iterRemainingDimensions([dt])], ['DimensionKern', 'Dimension']) 
-    WVPASSEQ([d.__class__.__name__ for d in t.iterRemainingDimensions([dt, dd])], ['DimensionKern'])
+    WVPASSEQ([d.__class__.__name__ for d in t.space.iterRemainingDimensions([dt])], ['DimensionKern', 'Dimension']) 
+    WVPASSEQ([d.__class__.__name__ for d in t.space.iterRemainingDimensions([dt, dd])], ['DimensionKern'])
 
-    WVPASSEQ(str([v for v in iterDimValues([dt, dk])]), "[[DimValue(DimensionTest, 1), DimValue(DimensionKern, 'a')]]")
+    WVPASSEQ(str([v for v in Space(dt, dk).iterValues()]), "[[DimValue(DimensionTest, 1), DimValue(DimensionKern, 'a')]]")
     dt.addValue(2)
     dk.addValue('b')
-    WVPASSEQ(str([v for v in iterDimValues([dt, dk])]), "[[DimValue(DimensionTest, 1), DimValue(DimensionKern, 'a')], [DimValue(DimensionTest, 2), DimValue(DimensionKern, 'a')], [DimValue(DimensionTest, 1), DimValue(DimensionKern, 'b')], [DimValue(DimensionTest, 2), DimValue(DimensionKern, 'b')]]")
+    WVPASSEQ(str([v for v in Space(dt, dk).iterValues()]), "[[DimValue(DimensionTest, 1), DimValue(DimensionKern, 'a')], [DimValue(DimensionTest, 2), DimValue(DimensionKern, 'a')], [DimValue(DimensionTest, 1), DimValue(DimensionKern, 'b')], [DimValue(DimensionTest, 2), DimValue(DimensionKern, 'b')]]")