[Gzz-commits] libvob ./rules.mk test/vob/api/vobcoorder.test

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/25 08:43:16

Modified files:
        .              : rules.mk 
        test/vob/api   : vobcoorder.test 

Log message:
        Concat should pass around the box

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/rules.mk.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/test/vob/api/vobcoorder.test.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: libvob/rules.mk
diff -u libvob/rules.mk:1.18 libvob/rules.mk:1.19
--- libvob/rules.mk:1.18        Fri Apr 25 07:17:54 2003
+++ libvob/rules.mk     Fri Apr 25 08:43:16 2003
@@ -44,7 +44,7 @@
                       [ -s $@ ] || rm -f $@'
 %.transjnidep: %.transgenjni
        $(SHELL) -ec '$(CXX) -x c++ -M $(CPPFLAGS) $< \
-                      | sed '\''s/\($*\)\.o[ :]*/\1.vobjniobj $@ : /g'\'' > 
$@; \
+                      | sed '\''s/\($*\)\.o[ :]*/\1.transjniobj $@ : /g'\'' > 
$@; \
                       [ -s $@ ] || rm -f $@'
 
 %.o: %.cxx
Index: libvob/test/vob/api/vobcoorder.test
diff -u libvob/test/vob/api/vobcoorder.test:1.10 
libvob/test/vob/api/vobcoorder.test:1.11
--- libvob/test/vob/api/vobcoorder.test:1.10    Wed Apr 23 12:44:25 2003
+++ libvob/test/vob/api/vobcoorder.test Fri Apr 25 08:43:16 2003
@@ -30,6 +30,7 @@
 
 vs = getvs()
 c = vs.coords
+tmpsize = zeros(2, 'f')
 
 def testTransform():
 
@@ -293,6 +294,21 @@
     interp = vs.matcher.interpList(vs2.matcher, 0)
     failUnlessEqual(interp[cs1], cs2_w)
     failUnlessEqual(interp[cs1_1], cs2_r)
+
+def testConcatSq():
+    """Test that concatenating works with boxes
+
+    fail: AWT
+    """
+    cs1 = vs.orthoBoxCS(0, "A", 1, 2, 3, 4, 5, 6, 7)
+    cs2 = vs.orthoBoxCS(0, "B", 11, 12, 13, 14, 15, 16, 17)
+    conc = vs.concatCS(cs1, "C", cs2)
+
+    checkTrans(vs, conc, [0, 0, 0], [12*4+2, 13*5+3, 12])
+
+    vs.coords.getSqSize(conc, tmpsize)
+    failUnlessEqual(tmpsize[0], 16)
+    failUnlessEqual(tmpsize[1], 17)