--- trunk/thuban/test/test_classgen.py 2003/07/02 12:59:20 1361 +++ trunk/thuban/test/test_classgen.py 2003/07/02 12:59:34 1362 @@ -23,6 +23,7 @@ calculate_quantiles, \ GreyRamp from Thuban.Model.range import Range +from Thuban.Model.color import Color from Thuban.Model.classification import ClassGroupRange @@ -30,17 +31,38 @@ def doClassRangeTest(self, clazz, ranges): self.assertEquals(clazz.GetNumGroups(), len(ranges)) - for i in range(len(ranges)): + for i in range(clazz.GetNumGroups()): group = clazz.GetGroup(i) r1 = str(Range(ranges[i])) r2 = group.GetRange() self.assertEquals(r1, r2) + self.doBoundsTest(clazz) + def doClassSingleTest(self, clazz, _list): self.assertEquals(clazz.GetNumGroups(), len(_list)) - for i in range(len(_list)): + for i in range(clazz.GetNumGroups()): group = clazz.GetGroup(i) self.assertEquals(group.GetValue(), _list[i]) + + self.doBoundsTest(clazz) + + def doBoundsTest(self, clazz, ramp = GreyRamp): + + # + # check that the properties are right (i.e. the first group + # is all white, the last is all black). This assumes that + # the GreyRamp, unless another is provided. + # + if clazz.GetNumGroups() >= 1: + groupF = clazz.GetGroup(0) + first = ramp.GetProperties(0) + self.assertEquals(groupF.GetProperties(), first) + + if clazz.GetNumGroups() >= 2: + groupL = clazz.GetGroup(clazz.GetNumGroups() - 1) + last = ramp.GetProperties(1) + self.assertEquals(groupL.GetProperties(), last) def test_generate_singletons(self): """Test generate_singletons"""