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
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'))
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])]), str([[1,'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])]), str([[1, 'a'], [2, 'a'], [1, 'b'], [2, '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')]]")