Skip to content

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

partial fix for failing tests; fix for Windows launcher script; more quiet output

parent ad326cb0
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 56 deletions
modules/java/android_test/src/org/opencv/test/core/TermCriteriaTest.java
View file @ c49b1bc6
...@@ -77,7 +77,7 @@ public class TermCriteriaTest extends OpenCVTestCase { ...@@ -77,7 +77,7 @@ public class TermCriteriaTest extends OpenCVTestCase {
public void testToString() { public void testToString() {
String actual = tc2.toString(); String actual = tc2.toString();
String expected = "{ type: 2, maxCount: 4, epsilon: 0.001}"; String expected = "{ type: 2, maxCount: 4, epsilon: " + EPS + "}";
assertEquals(expected, actual); assertEquals(expected, actual);
} }
......
modules/java/android_test/src/org/opencv/test/features2d/BRIEFDescriptorExtractorTest.java
View file @ c49b1bc6
...@@ -26,10 +26,9 @@ public class BRIEFDescriptorExtractorTest extends OpenCVTestCase { ...@@ -26,10 +26,9 @@ public class BRIEFDescriptorExtractorTest extends OpenCVTestCase {
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp();
extractor = DescriptorExtractor.create(DescriptorExtractor.BRIEF); extractor = DescriptorExtractor.create(DescriptorExtractor.BRIEF);
matSize = 100; matSize = 100;
super.setUp();
} }
public void testComputeListOfMatListOfListOfKeyPointListOfMat() { public void testComputeListOfMatListOfListOfKeyPointListOfMat() {
......
modules/java/android_test/src/org/opencv/test/features2d/BruteForceDescriptorMatcherTest.java
View file @ c49b1bc6
...@@ -80,6 +80,7 @@ public class BruteForceDescriptorMatcherTest extends OpenCVTestCase { ...@@ -80,6 +80,7 @@ public class BruteForceDescriptorMatcherTest extends OpenCVTestCase {
} }
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp();
matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE); matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE);
matSize = 100; matSize = 100;
...@@ -90,8 +91,6 @@ public class BruteForceDescriptorMatcherTest extends OpenCVTestCase { ...@@ -90,8 +91,6 @@ public class BruteForceDescriptorMatcherTest extends OpenCVTestCase {
new DMatch(3, 1, 0, 0.48435235f), new DMatch(3, 1, 0, 0.48435235f),
new DMatch(4, 0, 0, 1.0836693f) new DMatch(4, 0, 0, 1.0836693f)
}; };
super.setUp();
} }
public void testAdd() { public void testAdd() {
......
modules/java/android_test/src/org/opencv/test/features2d/BruteForceHammingDescriptorMatcherTest.java
View file @ c49b1bc6
...@@ -65,6 +65,7 @@ public class BruteForceHammingDescriptorMatcherTest extends OpenCVTestCase { ...@@ -65,6 +65,7 @@ public class BruteForceHammingDescriptorMatcherTest extends OpenCVTestCase {
} }
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp();
matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE_HAMMING); matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE_HAMMING);
matSize = 100; matSize = 100;
...@@ -73,7 +74,6 @@ public class BruteForceHammingDescriptorMatcherTest extends OpenCVTestCase { ...@@ -73,7 +74,6 @@ public class BruteForceHammingDescriptorMatcherTest extends OpenCVTestCase {
new DMatch(1, 2, 0, 42), new DMatch(1, 2, 0, 42),
new DMatch(2, 1, 0, 40), new DMatch(2, 1, 0, 40),
new DMatch(3, 3, 0, 53) }; new DMatch(3, 3, 0, 53) };
super.setUp();
} }
public void testAdd() { public void testAdd() {
......
modules/java/android_test/src/org/opencv/test/features2d/BruteForceHammingLUTDescriptorMatcherTest.java
View file @ c49b1bc6
...@@ -65,6 +65,7 @@ public class BruteForceHammingLUTDescriptorMatcherTest extends OpenCVTestCase { ...@@ -65,6 +65,7 @@ public class BruteForceHammingLUTDescriptorMatcherTest extends OpenCVTestCase {
} }
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp();
matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE_HAMMINGLUT); matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE_HAMMINGLUT);
matSize = 100; matSize = 100;
...@@ -73,7 +74,6 @@ public class BruteForceHammingLUTDescriptorMatcherTest extends OpenCVTestCase { ...@@ -73,7 +74,6 @@ public class BruteForceHammingLUTDescriptorMatcherTest extends OpenCVTestCase {
new DMatch(1, 2, 0, 42), new DMatch(1, 2, 0, 42),
new DMatch(2, 1, 0, 40), new DMatch(2, 1, 0, 40),
new DMatch(3, 3, 0, 53) }; new DMatch(3, 3, 0, 53) };
super.setUp();
} }
public void testAdd() { public void testAdd() {
......
modules/java/android_test/src/org/opencv/test/features2d/BruteForceL1DescriptorMatcherTest.java
View file @ c49b1bc6
...@@ -80,6 +80,7 @@ public class BruteForceL1DescriptorMatcherTest extends OpenCVTestCase { ...@@ -80,6 +80,7 @@ public class BruteForceL1DescriptorMatcherTest extends OpenCVTestCase {
} }
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp();
matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE_L1); matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE_L1);
matSize = 100; matSize = 100;
...@@ -90,7 +91,6 @@ public class BruteForceL1DescriptorMatcherTest extends OpenCVTestCase { ...@@ -90,7 +91,6 @@ public class BruteForceL1DescriptorMatcherTest extends OpenCVTestCase {
new DMatch(3, 1, 0, 2.6545324f), new DMatch(3, 1, 0, 2.6545324f),
new DMatch(4, 0, 0, 6.1294870f) new DMatch(4, 0, 0, 6.1294870f)
}; };
super.setUp();
} }
public void testAdd() { public void testAdd() {
......
modules/java/android_test/src/org/opencv/test/features2d/BruteForceSL2DescriptorMatcherTest.java
View file @ c49b1bc6
...@@ -85,6 +85,7 @@ public class BruteForceSL2DescriptorMatcherTest extends OpenCVTestCase { ...@@ -85,6 +85,7 @@ public class BruteForceSL2DescriptorMatcherTest extends OpenCVTestCase {
} }
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp();
matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE_SL2); matcher = DescriptorMatcher.create(DescriptorMatcher.BRUTEFORCE_SL2);
matSize = 100; matSize = 100;
...@@ -95,8 +96,6 @@ public class BruteForceSL2DescriptorMatcherTest extends OpenCVTestCase { ...@@ -95,8 +96,6 @@ public class BruteForceSL2DescriptorMatcherTest extends OpenCVTestCase {
new DMatch(3, 1, 0, 0.23459719f), new DMatch(3, 1, 0, 0.23459719f),
new DMatch(4, 0, 0, 1.174339f) new DMatch(4, 0, 0, 1.174339f)
}; };
super.setUp();
} }
public void testAdd() { public void testAdd() {
......
modules/java/android_test/src/org/opencv/test/features2d/FASTFeatureDetectorTest.java
View file @ c49b1bc6
...@@ -33,12 +33,10 @@ public class FASTFeatureDetectorTest extends OpenCVTestCase { ...@@ -33,12 +33,10 @@ public class FASTFeatureDetectorTest extends OpenCVTestCase {
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp();
detector = FeatureDetector.create(FeatureDetector.FAST); detector = FeatureDetector.create(FeatureDetector.FAST);
truth = new KeyPoint[] { new KeyPoint(32, 27, 7, -1, 254, 0, -1), new KeyPoint(27, 32, 7, -1, 254, 0, -1), new KeyPoint(73, 68, 7, -1, 254, 0, -1), truth = new KeyPoint[] { new KeyPoint(32, 27, 7, -1, 254, 0, -1), new KeyPoint(27, 32, 7, -1, 254, 0, -1), new KeyPoint(73, 68, 7, -1, 254, 0, -1),
new KeyPoint(68, 73, 7, -1, 254, 0, -1) }; new KeyPoint(68, 73, 7, -1, 254, 0, -1) };
super.setUp();
} }
public void testCreate() { public void testCreate() {
......
modules/java/android_test/src/org/opencv/test/features2d/FlannBasedDescriptorMatcherTest.java
View file @ c49b1bc6
...@@ -154,9 +154,9 @@ public class FlannBasedDescriptorMatcherTest extends OpenCVTestCase { ...@@ -154,9 +154,9 @@ public class FlannBasedDescriptorMatcherTest extends OpenCVTestCase {
} }
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp();
matcher = DescriptorMatcher.create(DescriptorMatcher.FLANNBASED); matcher = DescriptorMatcher.create(DescriptorMatcher.FLANNBASED);
matSize = 100; matSize = 100;
truth = new DMatch[] { truth = new DMatch[] {
new DMatch(0, 0, 0, 1.049694f), new DMatch(0, 0, 0, 1.049694f),
new DMatch(1, 0, 0, 1.0984558f), new DMatch(1, 0, 0, 1.0984558f),
...@@ -164,8 +164,6 @@ public class FlannBasedDescriptorMatcherTest extends OpenCVTestCase { ...@@ -164,8 +164,6 @@ public class FlannBasedDescriptorMatcherTest extends OpenCVTestCase {
new DMatch(3, 1, 0, 0.48435235f), new DMatch(3, 1, 0, 0.48435235f),
new DMatch(4, 0, 0, 1.0836693f) new DMatch(4, 0, 0, 1.0836693f)
}; };
super.setUp();
} }
public void testAdd() { public void testAdd() {
......
modules/java/android_test/src/org/opencv/test/features2d/ORBDescriptorExtractorTest.java
View file @ c49b1bc6
...@@ -31,10 +31,9 @@ public class ORBDescriptorExtractorTest extends OpenCVTestCase { ...@@ -31,10 +31,9 @@ public class ORBDescriptorExtractorTest extends OpenCVTestCase {
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp();
extractor = DescriptorExtractor.create(DescriptorExtractor.ORB); extractor = DescriptorExtractor.create(DescriptorExtractor.ORB);
matSize = 100; matSize = 100;
super.setUp();
} }
public void testComputeListOfMatListOfListOfKeyPointListOfMat() { public void testComputeListOfMatListOfListOfKeyPointListOfMat() {
......
modules/java/android_test/src/org/opencv/test/features2d/SIFTDescriptorExtractorTest.java
View file @ c49b1bc6
...@@ -28,6 +28,7 @@ public class SIFTDescriptorExtractorTest extends OpenCVTestCase { ...@@ -28,6 +28,7 @@ public class SIFTDescriptorExtractorTest extends OpenCVTestCase {
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp();
extractor = DescriptorExtractor.create(DescriptorExtractor.SIFT); extractor = DescriptorExtractor.create(DescriptorExtractor.SIFT);
keypoint = new KeyPoint(55.775577545166016f, 44.224422454833984f, 16, 9.754629f, 8617.863f, 1, -1); keypoint = new KeyPoint(55.775577545166016f, 44.224422454833984f, 16, 9.754629f, 8617.863f, 1, -1);
matSize = 100; matSize = 100;
...@@ -44,8 +45,6 @@ public class SIFTDescriptorExtractorTest extends OpenCVTestCase { ...@@ -44,8 +45,6 @@ public class SIFTDescriptorExtractorTest extends OpenCVTestCase {
); );
} }
}; };
super.setUp();
} }
public void testComputeListOfMatListOfListOfKeyPointListOfMat() { public void testComputeListOfMatListOfListOfKeyPointListOfMat() {
......
modules/java/android_test/src/org/opencv/test/features2d/STARFeatureDetectorTest.java
View file @ c49b1bc6
...@@ -42,22 +42,10 @@ public class STARFeatureDetectorTest extends OpenCVTestCase { ...@@ -42,22 +42,10 @@ public class STARFeatureDetectorTest extends OpenCVTestCase {
} }
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp();
detector = FeatureDetector.create(FeatureDetector.STAR); detector = FeatureDetector.create(FeatureDetector.STAR);
matSize = 200; matSize = 200;
truth = new KeyPoint[] { truth = new KeyPoint[] {
/*
new KeyPoint(95, 80, 22, -1, 31.595734f, 0, -1),
new KeyPoint(105, 80, 22, -1, 31.595734f, 0, -1),
new KeyPoint(80, 95, 22, -1, 31.595734f, 0, -1),
new KeyPoint(120, 95, 22, -1, 31.595734f, 0, -1),
new KeyPoint(100, 100, 8, -1, -219.90825f, 0, -1),
new KeyPoint(80, 105, 22, -1, 31.595734f, 0, -1),
new KeyPoint(120, 105, 22, -1, 31.595734f, 0, -1),
new KeyPoint(95, 120, 22, -1, 31.595734f, 0, -1),
new KeyPoint(105, 120, 22, -1, 31.595734f, 0, -1)
*/
new KeyPoint( 95, 80, 22, -1, 31.5957f, 0, -1), new KeyPoint( 95, 80, 22, -1, 31.5957f, 0, -1),
new KeyPoint(105, 80, 22, -1, 31.5957f, 0, -1), new KeyPoint(105, 80, 22, -1, 31.5957f, 0, -1),
new KeyPoint( 80, 95, 22, -1, 31.5957f, 0, -1), new KeyPoint( 80, 95, 22, -1, 31.5957f, 0, -1),
...@@ -68,8 +56,6 @@ public class STARFeatureDetectorTest extends OpenCVTestCase { ...@@ -68,8 +56,6 @@ public class STARFeatureDetectorTest extends OpenCVTestCase {
new KeyPoint( 95, 120, 22, -1, 31.5957f, 0, -1), new KeyPoint( 95, 120, 22, -1, 31.5957f, 0, -1),
new KeyPoint(105, 120, 22, -1, 31.5957f, 0, -1) new KeyPoint(105, 120, 22, -1, 31.5957f, 0, -1)
}; };
super.setUp();
} }
public void testCreate() { public void testCreate() {
......
modules/java/android_test/src/org/opencv/test/features2d/SURFDescriptorExtractorTest.java
View file @ c49b1bc6
...@@ -26,10 +26,9 @@ public class SURFDescriptorExtractorTest extends OpenCVTestCase { ...@@ -26,10 +26,9 @@ public class SURFDescriptorExtractorTest extends OpenCVTestCase {
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp();
extractor = DescriptorExtractor.create(DescriptorExtractor.SURF); extractor = DescriptorExtractor.create(DescriptorExtractor.SURF);
matSize = 100; matSize = 100;
super.setUp();
} }
public void testComputeListOfMatListOfListOfKeyPointListOfMat() { public void testComputeListOfMatListOfListOfKeyPointListOfMat() {
......
modules/java/android_test/src/org/opencv/test/features2d/SURFFeatureDetectorTest.java
View file @ c49b1bc6
...@@ -52,18 +52,15 @@ public class SURFFeatureDetectorTest extends OpenCVTestCase { ...@@ -52,18 +52,15 @@ public class SURFFeatureDetectorTest extends OpenCVTestCase {
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp();
detector = FeatureDetector.create(FeatureDetector.SURF); detector = FeatureDetector.create(FeatureDetector.SURF);
matSize = 100; matSize = 100;
truth = new KeyPoint[] { truth = new KeyPoint[] {
new KeyPoint(55.775578f, 55.775578f, 16, 80.245735f, 8617.8633f, 0, -1), new KeyPoint(55.775578f, 55.775578f, 16, 80.245735f, 8617.8633f, 0, -1),
new KeyPoint(44.224422f, 55.775578f, 16, 170.24574f, 8617.8633f, 0, -1), new KeyPoint(44.224422f, 55.775578f, 16, 170.24574f, 8617.8633f, 0, -1),
new KeyPoint(44.224422f, 44.224422f, 16, 260.24573f, 8617.8633f, 0, -1), new KeyPoint(44.224422f, 44.224422f, 16, 260.24573f, 8617.8633f, 0, -1),
new KeyPoint(55.775578f, 44.224422f, 16, 350.24573f, 8617.8633f, 0, -1) new KeyPoint(55.775578f, 44.224422f, 16, 350.24573f, 8617.8633f, 0, -1)
}; };
super.setUp();
} }
public void testCreate() { public void testCreate() {
......
modules/java/java_test/CMakeLists.txt
View file @ c49b1bc6
...@@ -70,8 +70,8 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/build.xml" DESTINATION "${opencv_test_jav ...@@ -70,8 +70,8 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/build.xml" DESTINATION "${opencv_test_jav
# Create a script for running the Java tests and place it in build/bin. # Create a script for running the Java tests and place it in build/bin.
if(WIN32) if(WIN32)
file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java.cmd" "cd ${opencv_test_java_bin_dir}\nset path=${EXECUTABLE_OUTPUT_PATH};%path%\nant -DjavaLibraryPath=${EXECUTABLE_OUTPUT_PATH}/Release buildAndTest") file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java.cmd" "cd ${opencv_test_java_bin_dir}\nset PATH=${EXECUTABLE_OUTPUT_PATH}/Release;%PATH%\nant -DjavaLibraryPath=${EXECUTABLE_OUTPUT_PATH}/Release buildAndTest")
file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java_D.cmd" "cd ${opencv_test_java_bin_dir}\nset path=${EXECUTABLE_OUTPUT_PATH};%path%\nant -DjavaLibraryPath=${EXECUTABLE_OUTPUT_PATH}/Debug buildAndTest") file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java_D.cmd" "cd ${opencv_test_java_bin_dir}\nset PATH=${EXECUTABLE_OUTPUT_PATH}/Debug;%PATH%\nant -DjavaLibraryPath=${EXECUTABLE_OUTPUT_PATH}/Debug buildAndTest")
else() else()
file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java.sh" "cd ${opencv_test_java_bin_dir};\nant -DjavaLibraryPath=${LIBRARY_OUTPUT_PATH} buildAndTest;\ncd -") file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java.sh" "cd ${opencv_test_java_bin_dir};\nant -DjavaLibraryPath=${LIBRARY_OUTPUT_PATH} buildAndTest;\ncd -")
endif() endif()
......
modules/java/java_test/build.xml
View file @ c49b1bc6
...@@ -31,21 +31,9 @@ ...@@ -31,21 +31,9 @@
</jar> </jar>
</target> </target>
<!-- <target name="run" > -->
<!-- <java fork="true" classname="org.opencv.test.OpenCVTestRunner"> -->
<!-- <sysproperty key="java.library.path" path="${javaLibraryPath}"/> -->
<!-- <classpath refid="master-classpath"/> -->
<!-- <classpath> -->
<!-- <fileset dir="build/jar"> -->
<!-- <include name="*.jar"/> -->
<!-- </fileset> -->
<!-- </classpath> -->
<!-- </java> -->
<!-- </target> -->
<target name="test"> <target name="test">
<mkdir dir="testResults"/> <mkdir dir="testResults"/>
<junit printsummary="yes" haltonfailure="false"> <junit printsummary="false" haltonfailure="false" haltonerror="false" showoutput="false" logfailedtests="true" maxmemory="256m">
<sysproperty key="java.library.path" path="${javaLibraryPath}"/> <sysproperty key="java.library.path" path="${javaLibraryPath}"/>
<classpath refid="master-classpath"/> <classpath refid="master-classpath"/>
<classpath> <classpath>
......
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