From 3d61f5bdd031b8f453246c173a0817cb11687e9e Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Wed, 21 Dec 2011 12:12:58 +0000 Subject: [PATCH] Fixed 2 more tests for Java API --- .../android_test/src/org/opencv/test/core/CoreTest.java | 2 -- .../src/org/opencv/test/imgproc/ImgprocTest.java | 8 ++++---- .../android_test/src/org/opencv/test/video/VideoTest.java | 8 ++++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/java/android_test/src/org/opencv/test/core/CoreTest.java b/modules/java/android_test/src/org/opencv/test/core/CoreTest.java index b2151b9ab..e4e7b81c4 100644 --- a/modules/java/android_test/src/org/opencv/test/core/CoreTest.java +++ b/modules/java/android_test/src/org/opencv/test/core/CoreTest.java @@ -12,7 +12,6 @@ import org.opencv.core.Scalar; import org.opencv.core.Size; import org.opencv.core.TermCriteria; import org.opencv.test.OpenCVTestCase; -import org.opencv.test.OpenCVTestRunner; import java.util.ArrayList; import java.util.Arrays; @@ -742,7 +741,6 @@ public class CoreTest extends OpenCVTestCase { assertTrue(gray0.total() > Core.countNonZero(gray0)); 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)); } diff --git a/modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java b/modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java index e68df26bb..f0dd61b5a 100644 --- a/modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java +++ b/modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java @@ -1780,10 +1780,10 @@ public class ImgprocTest extends OpenCVTestCase { truth = new Mat(4, 4, CvType.CV_32F) { { - put(0, 0, 2, 1.75, 1.375, 1.25); - put(1, 0, 2.25, 2, 1.625, 1.5); - put(2, 0, 2.5, 2.25, 1.875, 1.75); - put(3, 0, 2.25, 2, 1.625, 1.5); + put(0, 0, 2, 1.75, 1.375, 1.25); + put(1, 0, 2.25, 2, 1.625, 1.5); + put(2, 0, 2.625, 2.375, 2, 1.875); + put(3, 0, 2.75, 2.5, 2.125, 2); } }; assertMatEqual(truth, dst, EPS); diff --git a/modules/java/android_test/src/org/opencv/test/video/VideoTest.java b/modules/java/android_test/src/org/opencv/test/video/VideoTest.java index beccccfa1..6d087ca4a 100644 --- a/modules/java/android_test/src/org/opencv/test/video/VideoTest.java +++ b/modules/java/android_test/src/org/opencv/test/video/VideoTest.java @@ -1,8 +1,5 @@ package org.opencv.test.video; -import java.util.ArrayList; -import java.util.List; - import org.opencv.core.Core; import org.opencv.core.Mat; import org.opencv.core.Point; @@ -11,6 +8,9 @@ import org.opencv.test.OpenCVTestCase; import org.opencv.utils.Converters; import org.opencv.video.Video; +import java.util.ArrayList; +import java.util.List; + public class VideoTest extends OpenCVTestCase { private List err = null; @@ -39,7 +39,7 @@ public class VideoTest extends OpenCVTestCase { subLena2 = rgbLena.submat(shift2, h + shift2, shift2, w + shift2); prevPts = new ArrayList(); - 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(10.0, 10.0));