genhtml: Correct navigation between pages

[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 68d313135d39a061bed318b655e1758d68bce40b..cb93f32a660e1c67073db86eff29ec0cf72f3c2f 100644 (file)
--- a/gw-tests/genhtml/genhtml-test.py
+++ b/gw-tests/genhtml/genhtml-test.py
@@ -4,8 +4,8 @@ from genhtml import *
 @wvtest
 def Dimension_and_DimValue():
     d = Dimension('kern', 'Kernel')
-    d.addValue('2.6.31')
-    d.addValue('2.6.30')
+    DimValue(d, '2.6.31')
+    DimValue(d, '2.6.30')
     l=[]
     for v in d:
         WVPASSEQ(v.__class__, DimValue)
@@ -60,7 +60,25 @@ def Three_Dimensions_in_Tests():
     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 Space(dt, dk).iterValues()]), "[[DimValue(DimensionTest, 1), DimValue(DimensionKern, 'a')]]")
-    dt.addValue(2)
-    dk.addValue('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')]]")
+    WVPASSEQ(str([v for v in Space(dt, dk).iterValues()]), "[[DimValue(Dimension(test), 1), DimValue(Dimension(gwkern), 'a')]]")
+    DimValue(dt, 2)
+    DimValue(dk, 'b')
+    WVPASSEQ(str([v for v in Space(dt, dk).iterValues()]), "[[DimValue(Dimension(test), 1), DimValue(Dimension(gwkern), 'a')], [DimValue(Dimension(test), 2), DimValue(Dimension(gwkern), 'a')], [DimValue(Dimension(test), 1), DimValue(Dimension(gwkern), 'b')], [DimValue(Dimension(test), 2), DimValue(Dimension(gwkern), 'b')]]")
+
+@wvtest                
+def SpaceTests():
+    d1 = Dimension(1)
+    d2 = Dimension(2)
+    d3 = Dimension(3)
+    s = Space(d1, d2, d3)
+    WVPASSEQ(str(s), "[Dimension(1), Dimension(2), Dimension(3)]")
+    v11 = DimValue(d1, 'one-one')
+    v12 = DimValue(d1, 'one-two')
+    v21 = DimValue(d2, 'two-one')
+    v22 = DimValue(d2, 'two-two')
+    v31 = DimValue(d3, 'three-one')
+    WVPASSEQ(str(DimValues([v11, v21])), "[DimValue(Dimension(1), 'one-one'), DimValue(Dimension(2), 'two-one')]")
+    WVPASSEQ(str(DimValues([v11, v21]) - d1), "[DimValue(Dimension(2), 'two-one')]")
+    WVPASSEQ(str(DimValues([v11, v21]) - d2), "[DimValue(Dimension(1), 'one-one')]")
+    WVPASSEQ(str(DimValues([v21, v31]) + v11), "[DimValue(Dimension(2), 'two-one'), DimValue(Dimension(3), 'three-one'), DimValue(Dimension(1), 'one-one')]")
+    WVPASSEQ(str(s.reorder(DimValues([v21, v31, v11]))), "[DimValue(Dimension(1), 'one-one'), DimValue(Dimension(2), 'two-one'), DimValue(Dimension(3), 'three-one')]")