From a68d0278ba31c3a88afeed792b5b4507ba5632e4 Mon Sep 17 00:00:00 2001
From: Andrey Pavlenko <no@email>
Date: Mon, 9 Apr 2012 11:36:32 +0000
Subject: [PATCH] Java API: fixing tests compatibility with API level 8

---
 modules/java/android_test/AndroidManifest.xml                 | 2 +-
 .../test/features2d/BruteForceDescriptorMatcherTest.java      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/java/android_test/AndroidManifest.xml b/modules/java/android_test/AndroidManifest.xml
index 90978a5252..c0f23c25d1 100644
--- a/modules/java/android_test/AndroidManifest.xml
+++ b/modules/java/android_test/AndroidManifest.xml
@@ -18,7 +18,7 @@
     "adb shell am instrument -w org.opencv.test/android.test.InstrumentationTestRunner"
     -->
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="org.opencv.test"
+                     android:targetPackage="org.opencv"
                      android:label="Tests for org.opencv"/>
     
     <uses-permission android:name="android.permission.CAMERA"/>
diff --git a/modules/java/android_test/src/org/opencv/test/features2d/BruteForceDescriptorMatcherTest.java b/modules/java/android_test/src/org/opencv/test/features2d/BruteForceDescriptorMatcherTest.java
index d8a8e78591..a6c6dd1aa5 100644
--- a/modules/java/android_test/src/org/opencv/test/features2d/BruteForceDescriptorMatcherTest.java
+++ b/modules/java/android_test/src/org/opencv/test/features2d/BruteForceDescriptorMatcherTest.java
@@ -214,7 +214,7 @@ public class BruteForceDescriptorMatcherTest extends OpenCVTestCase {
 
         matcher.match(query, matches, Arrays.asList(mask));
 
-        assertArrayDMatchEquals(Arrays.copyOfRange(truth, 0, 2), matches.toArray(), EPS);
+        assertListDMatchEquals(Arrays.asList(truth[0], truth[1]), matches.toList(), EPS);
     }
 
     public void testMatchMatMatListOfDMatch() {
@@ -239,7 +239,7 @@ public class BruteForceDescriptorMatcherTest extends OpenCVTestCase {
 
         matcher.match(query, train, matches, mask);
 
-        assertArrayDMatchEquals(Arrays.copyOfRange(truth, 0, 2), matches.toArray(), EPS);
+        assertListDMatchEquals(Arrays.asList(truth[0], truth[1]), matches.toList(), EPS);
     }
 
     public void testRadiusMatchMatListOfListOfDMatchFloat() {