Skip to content

O
opencv
Commit 36a5b6e2 authored by Andrey Pavlenko's avatar Andrey Pavlenko
Browse files
Options

Java API: tests are updated after randu/randn args types changes

parent 96ca253a
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java
View file @ 36a5b6e2
...@@ -92,7 +92,7 @@ public class OpenCVTestCase extends TestCase { ...@@ -92,7 +92,7 @@ public class OpenCVTestCase extends TestCase {
gray_16s_1024 = new Mat(matSize, matSize, CvType.CV_16S, new Scalar(1024)); gray_16s_1024 = new Mat(matSize, matSize, CvType.CV_16S, new Scalar(1024));
grayRnd = new Mat(matSize, matSize, CvType.CV_8U); grayRnd = new Mat(matSize, matSize, CvType.CV_8U);
Core.randu(grayRnd, new Scalar(0), new Scalar(256)); Core.randu(grayRnd, 0, 256);
gray0_32f = new Mat(matSize, matSize, CvType.CV_32F, new Scalar(0.0)); gray0_32f = new Mat(matSize, matSize, CvType.CV_32F, new Scalar(0.0));
gray1_32f = new Mat(matSize, matSize, CvType.CV_32F, new Scalar(1.0)); gray1_32f = new Mat(matSize, matSize, CvType.CV_32F, new Scalar(1.0));
...@@ -103,7 +103,7 @@ public class OpenCVTestCase extends TestCase { ...@@ -103,7 +103,7 @@ public class OpenCVTestCase extends TestCase {
grayE_32f = new Mat(matSize, matSize, CvType.CV_32F); grayE_32f = new Mat(matSize, matSize, CvType.CV_32F);
grayE_32f = Mat.eye(matSize, matSize, CvType.CV_32FC1); grayE_32f = Mat.eye(matSize, matSize, CvType.CV_32FC1);
grayRnd_32f = new Mat(matSize, matSize, CvType.CV_32F); grayRnd_32f = new Mat(matSize, matSize, CvType.CV_32F);
Core.randu(grayRnd_32f, new Scalar(0), new Scalar(256)); Core.randu(grayRnd_32f, 0, 256);
gray0_32f_1d = new Mat(1, matSize, CvType.CV_32F, new Scalar(0.0)); gray0_32f_1d = new Mat(1, matSize, CvType.CV_32F, new Scalar(0.0));
......
modules/java/android_test/src/org/opencv/test/core/coreTest.java
View file @ 36a5b6e2
...@@ -1156,7 +1156,7 @@ public class coreTest extends OpenCVTestCase { ...@@ -1156,7 +1156,7 @@ public class coreTest extends OpenCVTestCase {
public void testPerspectiveTransform() { public void testPerspectiveTransform() {
Mat src = new Mat(matSize, matSize, CvType.CV_32FC2); Mat src = new Mat(matSize, matSize, CvType.CV_32FC2);
Core.randu(src, new Scalar(0), new Scalar(256)); Core.randu(src, 0, 256);
//FIXME: use Mat.diag //FIXME: use Mat.diag
Mat transformMatrix = Mat.eye(3, 3, CvType.CV_32F); Mat transformMatrix = Mat.eye(3, 3, CvType.CV_32F);
...@@ -1169,7 +1169,7 @@ public class coreTest extends OpenCVTestCase { ...@@ -1169,7 +1169,7 @@ public class coreTest extends OpenCVTestCase {
public void testPerspectiveTransform3D() { public void testPerspectiveTransform3D() {
Mat src = new Mat(matSize, matSize, CvType.CV_32FC3); Mat src = new Mat(matSize, matSize, CvType.CV_32FC3);
Core.randu(src, new Scalar(0), new Scalar(256)); Core.randu(src, 0, 256);
Mat transformMatrix = Mat.eye(4, 4, CvType.CV_32F); Mat transformMatrix = Mat.eye(4, 4, CvType.CV_32F);
...@@ -1304,7 +1304,7 @@ public class coreTest extends OpenCVTestCase { ...@@ -1304,7 +1304,7 @@ public class coreTest extends OpenCVTestCase {
public void testRandn() { public void testRandn() {
assertTrue(0 == Core.countNonZero(gray0)); assertTrue(0 == Core.countNonZero(gray0));
Core.randn(gray0, new Scalar(0), new Scalar(256)); Core.randn(gray0, 0, 256);
assertTrue(0 != Core.countNonZero(gray0)); assertTrue(0 != Core.countNonZero(gray0));
} }
...@@ -1318,7 +1318,7 @@ public class coreTest extends OpenCVTestCase { ...@@ -1318,7 +1318,7 @@ public class coreTest extends OpenCVTestCase {
public void testRandu() { public void testRandu() {
assertTrue(0 == Core.countNonZero(gray0)); assertTrue(0 == Core.countNonZero(gray0));
Core.randu(gray0, new Scalar(0), new Scalar(256)); Core.randu(gray0, 0, 256);
assertTrue(0 != Core.countNonZero(gray0)); assertTrue(0 != Core.countNonZero(gray0));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment