From 601b87e3ed741de17974f4223d5cc9b33dbef9d5 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Mon, 8 Oct 2012 12:41:20 +0400
Subject: [PATCH] Java tests updated. Build fix.

---
 .../engine/manager/PackageListAdapter.java    |  1 -
 android/service/engine_test/.classpath        |  2 +-
 android/service/engine_test/.project          |  2 +-
 .../service/engine_test/AndroidManifest.xml   |  2 +-
 android/service/engine_test/build.xml         | 92 +++++++++++++++++++
 .../service/engine_test/project.properties    | 14 +++
 6 files changed, 109 insertions(+), 4 deletions(-)
 create mode 100644 android/service/engine_test/build.xml
 create mode 100644 android/service/engine_test/project.properties

diff --git a/android/service/engine/src/org/opencv/engine/manager/PackageListAdapter.java b/android/service/engine/src/org/opencv/engine/manager/PackageListAdapter.java
index 15987da997..6ba5c1e66b 100644
--- a/android/service/engine/src/org/opencv/engine/manager/PackageListAdapter.java
+++ b/android/service/engine/src/org/opencv/engine/manager/PackageListAdapter.java
@@ -4,7 +4,6 @@ import java.util.List;
 import java.util.Map;
 
 import android.content.Context;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.SimpleAdapter;
diff --git a/android/service/engine_test/.classpath b/android/service/engine_test/.classpath
index 9409b6ef50..cf437394d2 100644
--- a/android/service/engine_test/.classpath
+++ b/android/service/engine_test/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/JavaService"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/OpenCVEngineService"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
diff --git a/android/service/engine_test/.project b/android/service/engine_test/.project
index 030603b987..910141b5e9 100644
--- a/android/service/engine_test/.project
+++ b/android/service/engine_test/.project
@@ -3,7 +3,7 @@
 	<name>tests</name>
 	<comment></comment>
 	<projects>
-		<project>JavaService</project>
+		<project>OpenCVEngineService</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/android/service/engine_test/AndroidManifest.xml b/android/service/engine_test/AndroidManifest.xml
index d55e1e2bd4..5779d90a62 100644
--- a/android/service/engine_test/AndroidManifest.xml
+++ b/android/service/engine_test/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name" >
         <uses-library android:name="android.test.runner" />
-        
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/android/service/engine_test/build.xml b/android/service/engine_test/build.xml
new file mode 100644
index 0000000000..0684568836
--- /dev/null
+++ b/android/service/engine_test/build.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="engine_test" default="help">
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/android/service/engine_test/project.properties b/android/service/engine_test/project.properties
new file mode 100644
index 0000000000..85aac54016
--- /dev/null
+++ b/android/service/engine_test/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-8