Merge "More changes to the test projects."

21 files changed, 167 insertions, 2 deletions

diff --git a/testapps/javaProjectTest/README.txt b/testapps/javaProjectTest/README.txt
new file mode 100644
index 0000000..2035b7e
--- /dev/null
+++ b/testapps/javaProjectTest/README.txt
@@ -0,0 +1,5 @@
+This test requires a workspace setup:
+
+- Create User Library called "USERLIBTEST2"
+- Add to this library the jar located in lib1/jars/basicJar3.jar
+- App should compile, and deploy on device and UI show show SUCCESS
\ No newline at end of file
diff --git a/testapps/javaProjectTest/app/.classpath b/testapps/javaProjectTest/app/.classpath
index a4763d1..af64480 100644
--- a/testapps/javaProjectTest/app/.classpath
+++ b/testapps/javaProjectTest/app/.classpath
@@ -4,5 +4,6 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/javaProjectTest-javaProject3"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/testapps/javaProjectTest/app/proguard-project.txt b/testapps/javaProjectTest/app/proguard-project.txt
new file mode 100644
index 0000000..f2fe155
--- /dev/null
+++ b/testapps/javaProjectTest/app/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/testapps/javaProjectTest/app/project.properties b/testapps/javaProjectTest/app/project.properties
index 52891d4..9384511 100644
--- a/testapps/javaProjectTest/app/project.properties
+++ b/testapps/javaProjectTest/app/project.properties
@@ -8,7 +8,7 @@
 # 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
+proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
 target=android-15
diff --git a/testapps/javaProjectTest/app/res/layout/main.xml b/testapps/javaProjectTest/app/res/layout/main.xml
index 251905a..29accb3 100644
--- a/testapps/javaProjectTest/app/res/layout/main.xml
+++ b/testapps/javaProjectTest/app/res/layout/main.xml
@@ -41,10 +41,31 @@
         tools:ignore="HardcodedText" />
 
     <TextView
+        android:id="@+id/javaProject3"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="\\?"
+        tools:ignore="HardcodedText" />
+
+    <TextView
         android:id="@+id/basicJar"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:text="\\?"
         tools:ignore="HardcodedText" />
 
+    <TextView
+        android:id="@+id/basicJar2"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="\\?"
+        tools:ignore="HardcodedText" />
+
+    <TextView
+        android:id="@+id/basicJar3"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="\\?"
+        tools:ignore="HardcodedText" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/testapps/javaProjectTest/app/src/com/android/tests/javaprojecttest/app/App.java b/testapps/javaProjectTest/app/src/com/android/tests/javaprojecttest/app/App.java
new file mode 100644
index 0000000..aa5d157
--- /dev/null
+++ b/testapps/javaProjectTest/app/src/com/android/tests/javaprojecttest/app/App.java
@@ -0,0 +1,33 @@
+package com.android.tests.javaprojecttest.app;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+public class App {
+
+    public static String getContent() {
+        InputStream input = App.class.getResourceAsStream("App.txt");
+        if (input == null) {
+            return "FAILED TO FIND App.txt";
+        }
+
+        BufferedReader reader = null;
+        try {
+            reader = new BufferedReader(new InputStreamReader(input, "UTF-8"));
+
+            return reader.readLine();
+        } catch (IOException e) {
+        } finally {
+            if (reader != null) {
+                try {
+                    reader.close();
+                } catch (IOException e) {
+                }
+            }
+        }
+        
+        return "FAILED TO READ CONTENT";
+    }
+}
diff --git a/testapps/javaProjectTest/app/src/com/android/tests/javaprojecttest/app/App.txt b/testapps/javaProjectTest/app/src/com/android/tests/javaprojecttest/app/App.txt
new file mode 100644
index 0000000..d488bc4
--- /dev/null
+++ b/testapps/javaProjectTest/app/src/com/android/tests/javaprojecttest/app/App.txt
@@ -0,0 +1 @@
+SUCCESS from App
\ No newline at end of file
diff --git a/testapps/javaProjectTest/app/src/com/android/tests/javaprojecttest/app/Main.java b/testapps/javaProjectTest/app/src/com/android/tests/javaprojecttest/app/Main.java
index 233989e..51b3228 100644
--- a/testapps/javaProjectTest/app/src/com/android/tests/javaprojecttest/app/Main.java
+++ b/testapps/javaProjectTest/app/src/com/android/tests/javaprojecttest/app/Main.java
@@ -5,8 +5,11 @@ import android.os.Bundle;
 import android.widget.TextView;
 
 import com.android.tests.basicjar.BasicJar;
+import com.android.tests.basicjar2.BasicJar2;
+import com.android.tests.basicjar3.BasicJar3;
 import com.android.tests.javaprojecttest.javaproject.JavaProject;
 import com.android.tests.javaprojecttest.javaproject2.JavaProject2;
+import com.android.tests.javaprojecttest.javaproject3.JavaProject3;
 import com.android.tests.javaprojecttest.lib1.Lib1;
 import com.android.tests.javaprojecttest.lib2.Lib2;
 
@@ -18,7 +21,7 @@ public class Main extends Activity {
         setContentView(R.layout.main);
 
         TextView tv = (TextView) findViewById(R.id.app);
-        tv.setText("app");
+        tv.setText("App: " + App.getContent());
 
         tv = (TextView) findViewById(R.id.lib1);
         tv.setText("Lib1: " + Lib1.getContent());
@@ -32,7 +35,17 @@ public class Main extends Activity {
         tv = (TextView) findViewById(R.id.javaProject2);
         tv.setText("JavaProject2: " + JavaProject2.getContent());
 
+        tv = (TextView) findViewById(R.id.javaProject3);
+        tv.setText("JavaProject3: " + JavaProject3.getContent());
+
         tv = (TextView) findViewById(R.id.basicJar);
         tv.setText("BasicJar: " + BasicJar.getContent());
+
+        tv = (TextView) findViewById(R.id.basicJar2);
+        tv.setText("BasicJar2: " + BasicJar2.getContent());
+
+        tv = (TextView) findViewById(R.id.basicJar3);
+        tv.setText("BasicJar3: " + BasicJar3.getContent());
+
     }
 }
\ No newline at end of file
diff --git a/testapps/javaProjectTest/javaProject/libs/basicJar.jar b/testapps/javaProjectTest/javaProject/libs/basicJar.jar
index 8782c85..6be0e7d 100644
--- a/testapps/javaProjectTest/javaProject/libs/basicJar.jar
+++ b/testapps/javaProjectTest/javaProject/libs/basicJar.jar
diff --git a/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.java b/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.java
index 4f40648..6f31d53 100644
--- a/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.java
+++ b/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.java
@@ -9,6 +9,9 @@ public class JavaProject {
 
     public static String getContent() {
         InputStream input = JavaProject.class.getResourceAsStream("JavaProject.txt");
+        if (input == null) {
+            return "FAILED TO FIND JavaProject.txt";
+        }
 
         BufferedReader reader = null;
         try {
diff --git a/testapps/javaProjectTest/javaProject2/libs/basicJar.jar b/testapps/javaProjectTest/javaProject2/libs/basicJar.jar
index a81b929..6be0e7d 100644
--- a/testapps/javaProjectTest/javaProject2/libs/basicJar.jar
+++ b/testapps/javaProjectTest/javaProject2/libs/basicJar.jar
diff --git a/testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.java b/testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.java
index 05d6c85..3d7a60a 100644
--- a/testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.java
+++ b/testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.java
@@ -9,6 +9,9 @@ public class JavaProject2 {
 
     public static String getContent() {
         InputStream input = JavaProject2.class.getResourceAsStream("JavaProject2.txt");
+        if (input == null) {
+            return "FAILED TO FIND JavaProject2.txt";
+        }
 
         BufferedReader reader = null;
         try {
diff --git a/testapps/javaProjectTest/javaProject3/.classpath b/testapps/javaProjectTest/javaProject3/.classpath
new file mode 100644
index 0000000..3ded304
--- /dev/null
+++ b/testapps/javaProjectTest/javaProject3/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry exported="true" kind="lib" path="libs/basicJar2.jar" sourcepath="/Volumes/Android/int/master/sdk/testapps/basicJar2/src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/testapps/javaProjectTest/javaProject3/.project b/testapps/javaProjectTest/javaProject3/.project
new file mode 100644
index 0000000..b3b3237
--- /dev/null
+++ b/testapps/javaProjectTest/javaProject3/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>javaProjectTest-javaProject3</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/testapps/javaProjectTest/javaProject3/libs/basicJar2.jar b/testapps/javaProjectTest/javaProject3/libs/basicJar2.jar
new file mode 100644
index 0000000..5b9b629
--- /dev/null
+++ b/testapps/javaProjectTest/javaProject3/libs/basicJar2.jar
diff --git a/testapps/javaProjectTest/javaProject3/src/com/android/tests/javaprojecttest/javaproject3/JavaProject3.java b/testapps/javaProjectTest/javaProject3/src/com/android/tests/javaprojecttest/javaproject3/JavaProject3.java
new file mode 100644
index 0000000..190dfc1
--- /dev/null
+++ b/testapps/javaProjectTest/javaProject3/src/com/android/tests/javaprojecttest/javaproject3/JavaProject3.java
@@ -0,0 +1,33 @@
+package com.android.tests.javaprojecttest.javaproject3;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+public class JavaProject3 {
+
+    public static String getContent() {
+        InputStream input = JavaProject3.class.getResourceAsStream("JavaProject3.txt");
+        if (input == null) {
+            return "FAILED TO FIND JavaProject3.txt";
+        }
+
+        BufferedReader reader = null;
+        try {
+            reader = new BufferedReader(new InputStreamReader(input, "UTF-8"));
+
+            return reader.readLine();
+        } catch (IOException e) {
+        } finally {
+            if (reader != null) {
+                try {
+                    reader.close();
+                } catch (IOException e) {
+                }
+            }
+        }
+        
+        return "FAILED TO READ CONTENT";
+    }
+}
diff --git a/testapps/javaProjectTest/javaProject3/src/com/android/tests/javaprojecttest/javaproject3/JavaProject3.txt b/testapps/javaProjectTest/javaProject3/src/com/android/tests/javaprojecttest/javaproject3/JavaProject3.txt
new file mode 100644
index 0000000..b47ec76
--- /dev/null
+++ b/testapps/javaProjectTest/javaProject3/src/com/android/tests/javaprojecttest/javaproject3/JavaProject3.txt
@@ -0,0 +1 @@
+SUCCESS from javaProject3
\ No newline at end of file
diff --git a/testapps/javaProjectTest/lib1/.classpath b/testapps/javaProjectTest/lib1/.classpath
index 3cdb2e0..e609be1 100644
--- a/testapps/javaProjectTest/lib1/.classpath
+++ b/testapps/javaProjectTest/lib1/.classpath
@@ -5,5 +5,6 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/javaProjectTest-javaProject"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.USER_LIBRARY/USERLIBTEST2"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/testapps/javaProjectTest/lib1/jars/basicJar3.jar b/testapps/javaProjectTest/lib1/jars/basicJar3.jar
new file mode 100644
index 0000000..b4fbb94
--- /dev/null
+++ b/testapps/javaProjectTest/lib1/jars/basicJar3.jar
diff --git a/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.java b/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.java
index b1e7702..fe4a2a1 100644
--- a/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.java
+++ b/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.java
@@ -9,6 +9,9 @@ public class Lib1 {
 
     public static String getContent() {
         InputStream input = Lib1.class.getResourceAsStream("Lib1.txt");
+        if (input == null) {
+            return "FAILED TO FIND Lib1.txt";
+        }
 
         BufferedReader reader = null;
         try {
diff --git a/testapps/javaProjectTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.java b/testapps/javaProjectTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.java
index fecc780..5831cb2 100644
--- a/testapps/javaProjectTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.java
+++ b/testapps/javaProjectTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.java
@@ -9,6 +9,9 @@ public class Lib2 {
 
     public static String getContent() {
         InputStream input = Lib2.class.getResourceAsStream("Lib2.txt");
+        if (input == null) {
+            return "FAILED TO FIND Lib2.txt";
+        }
 
         BufferedReader reader = null;
         try {