From d03d54f8c1202f1736a9d19ba883bf831e481be3 Mon Sep 17 00:00:00 2001
From: Andrey Pavlenko <no@email>
Date: Mon, 9 Apr 2012 14:14:41 +0000
Subject: [PATCH] updating Eclipse projects settings

---
 modules/java/android/.project                                 | 2 +-
 modules/java/android_test/AndroidManifest.xml                 | 4 ++--
 .../android_test/src/org/opencv/test/OpenCVTestRunner.java    | 4 ++++
 samples/android/tutorial-0-androidcamera/.project             | 2 +-
 samples/android/tutorial-1-addopencv/.project                 | 2 +-
 samples/android/tutorial-2-opencvcamera/.project              | 2 +-
 samples/android/tutorial-3-native/.project                    | 2 +-
 samples/android/tutorial-4-mixed/.project                     | 2 +-
 8 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/java/android/.project b/modules/java/android/.project
index 97b71b63a..1d0f02e94 100644
--- a/modules/java/android/.project
+++ b/modules/java/android/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>OpenCV-2.3.1</name>
+	<name>OpenCV-2.4.beta</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/modules/java/android_test/AndroidManifest.xml b/modules/java/android_test/AndroidManifest.xml
index c0f23c25d..e261e2d70 100644
--- a/modules/java/android_test/AndroidManifest.xml
+++ b/modules/java/android_test/AndroidManifest.xml
@@ -17,8 +17,8 @@
     the package of org.opencv.  To run the tests use the command:
     "adb shell am instrument -w org.opencv.test/android.test.InstrumentationTestRunner"
     -->
-    <instrumentation android:name="android.test.InstrumentationTestRunner"
-                     android:targetPackage="org.opencv"
+    <instrumentation android:name="org.opencv.test.OpenCVTestRunner"
+                     android:targetPackage="org.opencv.test"
                      android:label="Tests for org.opencv"/>
     
     <uses-permission android:name="android.permission.CAMERA"/>
diff --git a/modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java b/modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java
index 0ea89a41a..fd2920722 100644
--- a/modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java
+++ b/modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java
@@ -11,6 +11,8 @@ import org.opencv.core.Mat;
 import java.io.File;
 import java.io.IOException;
 
+import junit.framework.Assert;
+
 /**
  * This only class is Android specific.
  * 
@@ -53,7 +55,9 @@ public class OpenCVTestRunner extends InstrumentationTestRunner {
 
     @Override
     public void onStart() {
+    	Log.e("OpenCVTestRunner", "onStart()");
         context = getContext();
+        Assert.assertTrue("Context can't be 'null'", context != null);
         LENA_PATH = Utils.exportResource(context, R.drawable.lena);
         CHESS_PATH = Utils.exportResource(context, R.drawable.chessboard);
         LBPCASCADE_FRONTALFACE_PATH = Utils.exportResource(context, R.raw.lbpcascade_frontalface);
diff --git a/samples/android/tutorial-0-androidcamera/.project b/samples/android/tutorial-0-androidcamera/.project
index 61dd3d526..f34a15ed5 100644
--- a/samples/android/tutorial-0-androidcamera/.project
+++ b/samples/android/tutorial-0-androidcamera/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Tutorial 1 Basic - 0. Android Camera</name>
+	<name>Tutorial 0 (Basic) - Android Camera</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/samples/android/tutorial-1-addopencv/.project b/samples/android/tutorial-1-addopencv/.project
index b67b0d94e..b014ca77b 100644
--- a/samples/android/tutorial-1-addopencv/.project
+++ b/samples/android/tutorial-1-addopencv/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Tutorial 1 Basic - 1. Add OpenCV</name>
+	<name>Tutorial 1 (Basic) - Add OpenCV</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/samples/android/tutorial-2-opencvcamera/.project b/samples/android/tutorial-2-opencvcamera/.project
index aa5deb422..46aad4a15 100644
--- a/samples/android/tutorial-2-opencvcamera/.project
+++ b/samples/android/tutorial-2-opencvcamera/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Tutorial 1 Basic - 2. Use OpenCV Camera</name>
+	<name>Tutorial 2 (Basic) - Use OpenCV Camera</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/samples/android/tutorial-3-native/.project b/samples/android/tutorial-3-native/.project
index 61e222211..49d648d56 100644
--- a/samples/android/tutorial-3-native/.project
+++ b/samples/android/tutorial-3-native/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Tutorial 2 Advanced - 1. Add Native OpenCV</name>
+	<name>Tutorial 3 (Advanced) - Add Native OpenCV</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/samples/android/tutorial-4-mixed/.project b/samples/android/tutorial-4-mixed/.project
index 05a338e9d..e8c3eb475 100644
--- a/samples/android/tutorial-4-mixed/.project
+++ b/samples/android/tutorial-4-mixed/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Tutorial 2 Advanced - 2. Mix Java+Native OpenCV</name>
+	<name>Tutorial 4 (Advanced) - Mix Java+Native OpenCV</name>
 	<comment></comment>
 	<projects>
 	</projects>