genhtml: Almost finished axis changing

[can-benchmark.git] / gw-tests / genhtml / genhtml-test.py

diff --git a/gw-tests/genhtml/genhtml-test.py b/gw-tests/genhtml/genhtml-test.py
index 7d77fba7589a16e301a9c33dcdce288b5dde7972..2e7aaa3f309394cace6f4ba4e4e4f059312ec7c0 100644 (file)
--- a/gw-tests/genhtml/genhtml-test.py
+++ b/gw-tests/genhtml/genhtml-test.py
@@ -12,7 +12,7 @@ def Dimension_and_DimValue():
         l.append(v.value)
     lsorted = ['2.6.30', '2.6.31']
     WVPASSEQ(l, lsorted)
-    WVPASSEQ(v.htmlLabel(), '2.6.31')
+    WVPASSEQ(v.htmlTableHeading(), '2.6.31')
     WVPASSEQ(d['2.6.31'].value, '2.6.31')
     
 @wvtest                
@@ -60,7 +60,7 @@ def Three_Dimensions_in_Tests():
     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(str([v for v in iterDimValues([dt, dk])]), str([[1,'a']]))
+    WVPASSEQ(str([v for v in iterDimValues([dt, dk])]), "[[DimValue(DimensionTest, 1), DimValue(DimensionKern, 'a')]]")
     dt.addValue(2)
     dk.addValue('b')
-    WVPASSEQ(str([v for v in iterDimValues([dt, dk])]), str([[1, 'a'], [2, 'a'], [1, 'b'], [2, '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')]]")