generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed 2 more tests for Java API

Browse Source
This commit is contained in:
Andrey Kamaev
2011-12-21 12:12:58 +00:00
parent e9dffe1394
commit 3d61f5bdd0
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/java/android_test/src/org/opencv/test/core/CoreTest.java
View File

@@ -12,7 +12,6 @@ import org.opencv.core.Scalar;
import org.opencv.core.Size; import org.opencv.core.Size;
import org.opencv.core.TermCriteria; import org.opencv.core.TermCriteria;
import org.opencv.test.OpenCVTestCase; import org.opencv.test.OpenCVTestCase;
import org.opencv.test.OpenCVTestRunner;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@@ -742,7 +741,6 @@ public class CoreTest extends OpenCVTestCase {
assertTrue(gray0.total() > Core.countNonZero(gray0)); assertTrue(gray0.total() > Core.countNonZero(gray0));
Core.fillConvexPoly(gray0, polyline2, colorBlack, Core.LINE_8, 1); Core.fillConvexPoly(gray0, polyline2, colorBlack, Core.LINE_8, 1);
OpenCVTestRunner.Log(gray0);
assertEquals("see https://code.ros.org/trac/opencv/ticket/1284", 0, Core.countNonZero(gray0)); assertEquals("see https://code.ros.org/trac/opencv/ticket/1284", 0, Core.countNonZero(gray0));
} }

8
modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java
View File

@@ -1780,10 +1780,10 @@ public class ImgprocTest extends OpenCVTestCase {
truth = new Mat(4, 4, CvType.CV_32F) { truth = new Mat(4, 4, CvType.CV_32F) {
{ {
put(0, 0, 2, 1.75, 1.375, 1.25); put(0, 0, 2, 1.75, 1.375, 1.25);
put(1, 0, 2.25, 2, 1.625, 1.5); put(1, 0, 2.25, 2, 1.625, 1.5);
put(2, 0, 2.5, 2.25, 1.875, 1.75); put(2, 0, 2.625, 2.375, 2, 1.875);
put(3, 0, 2.25, 2, 1.625, 1.5); put(3, 0, 2.75, 2.5, 2.125, 2);
} }
}; };
assertMatEqual(truth, dst, EPS); assertMatEqual(truth, dst, EPS);

8
modules/java/android_test/src/org/opencv/test/video/VideoTest.java
View File

@@ -1,8 +1,5 @@
package org.opencv.test.video; package org.opencv.test.video;
import java.util.ArrayList;
import java.util.List;
import org.opencv.core.Core; import org.opencv.core.Core;
import org.opencv.core.Mat; import org.opencv.core.Mat;
import org.opencv.core.Point; import org.opencv.core.Point;
@@ -11,6 +8,9 @@ import org.opencv.test.OpenCVTestCase;
import org.opencv.utils.Converters; import org.opencv.utils.Converters;
import org.opencv.video.Video; import org.opencv.video.Video;
import java.util.ArrayList;
import java.util.List;
public class VideoTest extends OpenCVTestCase { public class VideoTest extends OpenCVTestCase {
private List<Float> err = null; private List<Float> err = null;
@@ -39,7 +39,7 @@ public class VideoTest extends OpenCVTestCase {
subLena2 = rgbLena.submat(shift2, h + shift2, shift2, w + shift2); subLena2 = rgbLena.submat(shift2, h + shift2, shift2, w + shift2);
prevPts = new ArrayList<Point>(); prevPts = new ArrayList<Point>();
prevPts.add(new Point(1.0, 1.0)); prevPts.add(new Point(11.0, 8.0));
prevPts.add(new Point(5.0, 5.0)); prevPts.add(new Point(5.0, 5.0));
prevPts.add(new Point(10.0, 10.0)); prevPts.add(new Point(10.0, 10.0));