From: Andrey Kamaev Date: Mon, 15 Aug 2011 07:03:22 +0000 (+0000) Subject: Fixed Android build. X-Git-Tag: accepted/2.0/20130307.220821~2012 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a69c591927a68bcabb51a9dac7a33e3898b2d1b6;p=profile%2Fivi%2Fopencv.git Fixed Android build. --- diff --git a/modules/java/android_test/src/org/opencv/test/objdetect/ObjdetectTest.java b/modules/java/android_test/src/org/opencv/test/objdetect/ObjdetectTest.java index 6493687..4fe33d1 100644 --- a/modules/java/android_test/src/org/opencv/test/objdetect/ObjdetectTest.java +++ b/modules/java/android_test/src/org/opencv/test/objdetect/ObjdetectTest.java @@ -8,7 +8,8 @@ import org.opencv.test.OpenCVTestCase; public class ObjdetectTest extends OpenCVTestCase { - public void testGroupRectanglesListOfRectInt() { + public void testGroupRectanglesListOfRectListOfIntegerInt() { + fail("Not yet implemented"); Rect r = new Rect(10, 10, 20, 20); ArrayList rects = new ArrayList(); @@ -16,11 +17,12 @@ public class ObjdetectTest extends OpenCVTestCase { rects.add(r); int groupThreshold = 1; - Objdetect.groupRectangles(rects, groupThreshold); + Objdetect.groupRectangles(rects, null, groupThreshold);//TODO: second parameter should not be null assertEquals(1, rects.size()); } - public void testGroupRectanglesListOfRectIntDouble() { + public void testGroupRectanglesListOfRectListOfIntegerIntDouble() { + fail("Not yet implemented"); Rect r1 = new Rect(10, 10, 20, 20); Rect r2 = new Rect(10, 10, 25, 25); ArrayList rects = new ArrayList(); @@ -32,20 +34,7 @@ public class ObjdetectTest extends OpenCVTestCase { int groupThreshold = 1; double eps = 0.2; - Objdetect.groupRectangles(rects, groupThreshold, eps); + Objdetect.groupRectangles(rects, null, groupThreshold, eps);//TODO: second parameter should not be null assertEquals(2, rects.size()); } - - public void testGroupRectanglesListOfRectIntDoubleListOfIntegerListOfDouble() { - fail("Not yet implemented"); - } - - public void testGroupRectanglesListOfRectListOfIntegerInt() { - fail("Not yet implemented"); - } - - public void testGroupRectanglesListOfRectListOfIntegerIntDouble() { - fail("Not yet implemented"); - } - }