Skip to content

Commit 25261e6

Browse files
author
Andrey Kamaev
committed
Added new tests written by Hussein Abdinoor; Added support for new classes in features2d and imgproc
1 parent d3f8b2e commit 25261e6

File tree

11 files changed

+649
-128
lines changed

11 files changed

+649
-128
lines changed

modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.opencv.core.CvType;
1616
import org.opencv.core.Mat;
1717
import org.opencv.core.Point;
18+
import org.opencv.core.Point3;
1819
import org.opencv.core.Rect;
1920
import org.opencv.core.Scalar;
2021
import org.opencv.features2d.DMatch;
@@ -221,6 +222,15 @@ public static void assertListPointEquals(List<Point> list1, List<Point> list2, d
221222
assertPointEquals(list1.get(i), list2.get(i), epsilon);
222223
}
223224

225+
public static void assertListPoint3Equals(List<Point3> list1, List<Point3> list2, double epsilon) {
226+
if (list1.size() != list2.size()) {
227+
throw new UnsupportedOperationException();
228+
}
229+
230+
for (int i = 0; i < list1.size(); i++)
231+
assertPoint3Equals(list1.get(i), list2.get(i), epsilon);
232+
}
233+
224234
public static void assertListRectEquals(List<Rect> list1, List<Rect> list2) {
225235
if (list1.size() != list2.size()) {
226236
throw new UnsupportedOperationException();
@@ -297,6 +307,13 @@ public static void assertPointEquals(Point expected, Point actual, double eps) {
297307
assertEquals(msg, expected.x, actual.x, eps);
298308
assertEquals(msg, expected.y, actual.y, eps);
299309
}
310+
311+
public static void assertPoint3Equals(Point3 expected, Point3 actual, double eps) {
312+
String msg = "expected:<" + expected + "> but was:<" + actual + ">";
313+
assertEquals(msg, expected.x, actual.x, eps);
314+
assertEquals(msg, expected.y, actual.y, eps);
315+
assertEquals(msg, expected.z, actual.z, eps);
316+
}
300317

301318
static private void compareMats(Mat expected, Mat actual, boolean isEqualityMeasured) {
302319
if (expected.type() != actual.type() || expected.cols() != actual.cols() || expected.rows() != actual.rows()) {

0 commit comments

Comments
 (0)