From 5bc6365ba52a48726dcf535d75246a93044d3bf6 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Wed, 30 Jan 2013 17:28:22 +0400
Subject: [PATCH] TestCheckVector java test fixed. Warning fixed.

---
 .../java/android_test/src/org/opencv/test/OpenCVTestCase.java | 2 --
 .../java/android_test/src/org/opencv/test/core/MatTest.java   | 4 ++--
 2 files changed, 2 insertions(+), 4 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 59fcc27672..5c932110d3 100644
--- a/modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java
+++ b/modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java
@@ -2,11 +2,9 @@ package org.opencv.test;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
-import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
 import java.util.List;
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 e270e40158..a2570f4342 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
@@ -62,7 +62,7 @@ public class MatTest extends OpenCVTestCase {
         assertEquals(2, new Mat(2, 10, CvType.CV_8U).checkVector(10));
         assertEquals(2, new Mat(1, 2, CvType.CV_8UC(10)).checkVector(10));
         assertEquals(2, new Mat(2, 1, CvType.CV_8UC(10)).checkVector(10));
-        assertEquals(2, new Mat(1, 10, CvType.CV_8UC2).checkVector(10));
+        assertEquals(10, new Mat(1, 10, CvType.CV_8UC2).checkVector(2));
 
         assertTrue(0 > new Mat().checkVector(0));
         assertTrue(0 > new Mat(10, 1, CvType.CV_8U).checkVector(10));
@@ -73,7 +73,7 @@ public class MatTest extends OpenCVTestCase {
         assertEquals(2, new Mat(2, 10, CvType.CV_8U).checkVector(10, CvType.CV_8U));
         assertEquals(2, new Mat(1, 2, CvType.CV_8UC(10)).checkVector(10, CvType.CV_8U));
         assertEquals(2, new Mat(2, 1, CvType.CV_8UC(10)).checkVector(10, CvType.CV_8U));
-        assertEquals(2, new Mat(1, 10, CvType.CV_8UC2).checkVector(10, CvType.CV_8U));
+        assertEquals(10, new Mat(1, 10, CvType.CV_8UC2).checkVector(2, CvType.CV_8U));
 
         assertTrue(0 > new Mat(2, 10, CvType.CV_8U).checkVector(10, CvType.CV_8S));
         assertTrue(0 > new Mat(1, 2, CvType.CV_8UC(10)).checkVector(10, CvType.CV_8S));