[opencv] 37/89: java: backport test changes from master
Nobuhiro Iwamatsu
iwamatsu at moszumanska.debian.org
Sat May 13 09:57:23 UTC 2017
This is an automated email from the git hooks/post-receive script.
iwamatsu pushed a commit to annotated tag 2.4.13.2
in repository opencv.
commit 8e22b1791964c37293981a350395e76d0f919f31
Author: Alexander Alekhin <alexander.alekhin at intel.com>
Date: Wed Nov 23 14:20:06 2016 +0300
java: backport test changes from master
---
.../src/org/opencv/test/OpenCVTestCase.java | 43 ++++++++++++++++++++--
.../src/org/opencv/test/core/CoreTest.java | 2 +-
.../src/org/opencv/test/core/MatTest.java | 4 +-
.../src/org/opencv/test/imgproc/ImgprocTest.java | 8 ++--
modules/java/test/build.xml | 16 ++++++--
.../test/src/org/opencv/test/OpenCVTestCase.java | 43 ++++++++++++++++++++--
6 files changed, 99 insertions(+), 17 deletions(-)
diff --git a/modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java b/modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java
index 5c93211..198dac2 100644
--- a/modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java
+++ b/modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java
@@ -26,6 +26,11 @@ import org.opencv.highgui.Highgui;
import android.util.Log;
public class OpenCVTestCase extends TestCase {
+
+ public static class TestSkipException extends RuntimeException {
+ public TestSkipException() {}
+ }
+
//change to 'true' to unblock fail on fail("Not yet implemented")
public static final boolean passNYI = true;
@@ -182,12 +187,40 @@ public class OpenCVTestCase extends TestCase {
protected void runTest() throws Throwable {
// Do nothing if the precondition does not hold.
if (isTestCaseEnabled) {
- super.runTest();
+ try {
+ super.runTest();
+ } catch (TestSkipException ex) {
+ Log.w(TAG, "Test case \"" + this.getClass().getName() + "\" skipped!");
+ assertTrue(true);
+ }
} else {
Log.e(TAG, "Test case \"" + this.getClass().getName() + "\" disabled!");
}
}
+ public void runBare() throws Throwable {
+ Throwable exception = null;
+ try {
+ setUp();
+ } catch (TestSkipException ex) {
+ Log.w(TAG, "Test case \"" + this.getClass().getName() + "\" skipped!");
+ assertTrue(true);
+ return;
+ }
+ try {
+ runTest();
+ } catch (Throwable running) {
+ exception = running;
+ } finally {
+ try {
+ tearDown();
+ } catch (Throwable tearingDown) {
+ if (exception == null) exception = tearingDown;
+ }
+ }
+ if (exception != null) throw exception;
+ }
+
protected Mat getMat(int type, double... vals)
{
return new Mat(matSize, matSize, type, new Scalar(vals));
@@ -205,6 +238,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();
@@ -419,10 +456,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) {
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 45e4353..83511b9 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
@@ -2052,7 +2052,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) {
{
diff --git a/modules/java/android_test/src/org/opencv/test/core/MatTest.java b/modules/java/android_test/src/org/opencv/test/core/MatTest.java
index a2570f4..610f0eb 100644
--- a/modules/java/android_test/src/org/opencv/test/core/MatTest.java
+++ b/modules/java/android_test/src/org/opencv/test/core/MatTest.java
@@ -488,13 +488,13 @@ public class MatTest extends OpenCVTestCase {
public void testIsContinuous() {
assertTrue(gray0.isContinuous());
- Mat subMat = gray0.submat(0, 0, gray0.rows() / 2, gray0.cols() / 2);
+ Mat subMat = gray0.submat(0, gray0.rows() / 2, 0, gray0.cols() / 2);
assertFalse(subMat.isContinuous());
}
public void testIsSubmatrix() {
assertFalse(gray0.isSubmatrix());
- Mat subMat = gray0.submat(0, 0, gray0.rows() / 2, gray0.cols() / 2);
+ Mat subMat = gray0.submat(0, gray0.rows() / 2, 0, gray0.cols() / 2);
assertTrue(subMat.isSubmatrix());
}
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 7eed06a..ac2fc18 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
@@ -165,7 +165,7 @@ public class ImgprocTest extends OpenCVTestCase {
double arcLength = Imgproc.arcLength(curve, false);
- assertEquals(5.656854152679443, arcLength);
+ assertEquals(5.656854152679443, arcLength, EPS);
}
public void testBilateralFilterMatMatIntDoubleDouble() {
@@ -367,7 +367,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() {
@@ -376,7 +376,7 @@ public class ImgprocTest extends OpenCVTestCase {
double area = Imgproc.contourArea(contour);
- assertEquals(45., area);
+ assertEquals(45., area, EPS);
}
public void testContourAreaMatBoolean() {
@@ -385,7 +385,7 @@ public class ImgprocTest extends OpenCVTestCase {
double area = Imgproc.contourArea(contour, true);
- assertEquals(45., area);
+ assertEquals(45., area, EPS);
// TODO_: write better test
}
diff --git a/modules/java/test/build.xml b/modules/java/test/build.xml
index d3f826c..dac4d4b 100644
--- a/modules/java/test/build.xml
+++ b/modules/java/test/build.xml
@@ -1,5 +1,7 @@
<project>
<property file="ant-${opencv.build.type}.properties"/>
+ <property name="test.dir" value="testResults"/>
+ <property name="build.dir" value="build"/>
<path id="master-classpath">
<fileset dir="lib">
@@ -12,7 +14,7 @@
<target name="clean">
<delete dir="build"/>
- <delete dir="testResults"/>
+ <delete dir="${test.dir}"/>
</target>
<target name="compile">
@@ -34,8 +36,8 @@
</target>
<target name="test">
- <mkdir dir="testResults"/>
- <junit printsummary="true" haltonfailure="false" haltonerror="false" showoutput="false" logfailedtests="true" maxmemory="256m">
+ <mkdir dir="${test.dir}"/>
+ <junit printsummary="true" haltonfailure="false" haltonerror="false" showoutput="true" logfailedtests="true" maxmemory="256m">
<sysproperty key="java.library.path" path="${opencv.lib.path}"/>
<env key="PATH" path="${opencv.lib.path}"/>
<classpath refid="master-classpath"/>
@@ -45,12 +47,18 @@
<formatter type="xml"/>
- <batchtest fork="yes" todir="testResults">
+ <batchtest fork="yes" todir="${test.dir}">
<zipfileset src="build/jar/opencv-test.jar" includes="**/*.class" excludes="**/OpenCVTest*">
<exclude name="**/*$*.class"/>
</zipfileset>
</batchtest>
</junit>
+ <junitreport todir="${test.dir}">
+ <fileset dir="${test.dir}">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="noframes" todir="${test.dir}"/>
+ </junitreport>
</target>
<target name="build">
diff --git a/modules/java/test/src/org/opencv/test/OpenCVTestCase.java b/modules/java/test/src/org/opencv/test/OpenCVTestCase.java
index a9b5041..df0bb04 100644
--- a/modules/java/test/src/org/opencv/test/OpenCVTestCase.java
+++ b/modules/java/test/src/org/opencv/test/OpenCVTestCase.java
@@ -28,6 +28,11 @@ import org.opencv.features2d.KeyPoint;
import org.opencv.highgui.Highgui;
public class OpenCVTestCase extends TestCase {
+
+ public static class TestSkipException extends RuntimeException {
+ public TestSkipException() {}
+ }
+
//change to 'true' to unblock fail on fail("Not yet implemented")
public static final boolean passNYI = true;
@@ -212,12 +217,40 @@ public class OpenCVTestCase extends TestCase {
protected void runTest() throws Throwable {
// Do nothing if the precondition does not hold.
if (isTestCaseEnabled) {
- super.runTest();
+ try {
+ super.runTest();
+ } catch (TestSkipException ex) {
+ OpenCVTestRunner.Log(TAG + " :: " + "Test case \"" + this.getClass().getName() + "\" skipped!");
+ assertTrue(true);
+ }
} else {
OpenCVTestRunner.Log(TAG + " :: " + "Test case \"" + this.getClass().getName() + "\" disabled!");
}
}
+ public void runBare() throws Throwable {
+ Throwable exception = null;
+ try {
+ setUp();
+ } catch (TestSkipException ex) {
+ OpenCVTestRunner.Log(TAG + " :: " + "Test case \"" + this.getClass().getName() + "\" skipped!");
+ assertTrue(true);
+ return;
+ }
+ try {
+ runTest();
+ } catch (Throwable running) {
+ exception = running;
+ } finally {
+ try {
+ tearDown();
+ } catch (Throwable tearingDown) {
+ if (exception == null) exception = tearingDown;
+ }
+ }
+ if (exception != null) throw exception;
+ }
+
protected Mat getMat(int type, double... vals)
{
return new Mat(matSize, matSize, type, new Scalar(vals));
@@ -235,6 +268,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();
@@ -449,10 +486,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) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git
More information about the debian-science-commits
mailing list