third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

java tests fixes

Browse Source
This commit is contained in:
Alexander Alekhin 2016-11-22 20:08:27 +03:00
parent fe29080d59
commit 8019498c6e
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/misc/java/test/CoreTest.java
View File

@ -1777,7 +1777,7 @@ public class CoreTest extends OpenCVTestCase {
};
Mat roots = new Mat();
assertEquals(0.0, Core.solvePoly(coeffs, roots));
assertGE(1e-6, Math.abs(Core.solvePoly(coeffs, roots)));
truth = new Mat(3, 1, CvType.CV_32FC2) {
{

6
modules/imgproc/misc/java/test/ImgprocTest.java
View File

@ -359,7 +359,7 @@ public class ImgprocTest extends OpenCVTestCase {
double distance = Imgproc.compareHist(H1, H2, Imgproc.CV_COMP_CORREL);
assertEquals(1., distance);
assertEquals(1., distance, EPS);
}
public void testContourAreaMat() {
@ -368,7 +368,7 @@ public class ImgprocTest extends OpenCVTestCase {
double area = Imgproc.contourArea(contour);
assertEquals(45., area);
assertEquals(45., area, EPS);
}
public void testContourAreaMatBoolean() {
@ -377,7 +377,7 @@ public class ImgprocTest extends OpenCVTestCase {
double area = Imgproc.contourArea(contour, true);
assertEquals(45., area);
assertEquals(45., area, EPS);
// TODO_: write better test
}

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

@ -244,6 +244,10 @@ public class OpenCVTestCase extends TestCase {
TestCase.fail(msg);
}
public static void assertGE(double v1, double v2) {
assertTrue("Failed: " + v1 + " >= " + v2, v1 >= v2);
}
public static <E extends Number> void assertListEquals(List<E> list1, List<E> list2) {
if (list1.size() != list2.size()) {
throw new UnsupportedOperationException();
@ -458,10 +462,10 @@ public class OpenCVTestCase extends TestCase {
if (isEqualityMeasured)
assertTrue("Max difference between expected and actiual Mats is "+ maxDiff + ", that bigger than " + eps,
Core.checkRange(diff, true, 0.0, eps));
maxDiff <= eps);
else
assertFalse("Max difference between expected and actiual Mats is "+ maxDiff + ", that less than " + eps,
Core.checkRange(diff, true, 0.0, eps));
maxDiff <= eps);
}
protected static String readFile(String path) {

8
modules/java/pure_test/src/org/opencv/test/OpenCVTestCase.java
View File

@ -270,6 +270,10 @@ public class OpenCVTestCase extends TestCase {
TestCase.fail(msg);
}
public static void assertGE(double v1, double v2) {
assertTrue("Failed: " + v1 + " >= " + v2, v1 >= v2);
}
public static <E extends Number> void assertListEquals(List<E> list1, List<E> list2) {
if (list1.size() != list2.size()) {
throw new UnsupportedOperationException();
@ -484,10 +488,10 @@ public class OpenCVTestCase extends TestCase {
if (isEqualityMeasured)
assertTrue("Max difference between expected and actiual Mats is "+ maxDiff + ", that bigger than " + eps,
Core.checkRange(diff, true, 0.0, eps));
maxDiff <= eps);
else
assertFalse("Max difference between expected and actiual Mats is "+ maxDiff + ", that less than " + eps,
Core.checkRange(diff, true, 0.0, eps));
maxDiff <= eps);
}
protected static String readFile(String path) {