More fixes to the test projects.

- add eclipse files for a bunch of them
- package name refactoring to match the folder structure somehow (more
  need this)
- updated the javaproject to have an extra java project and to have
  code that access java resources to test packaging too.

Change-Id: Ie13842c1b891e495e04d8a157a12cac9db13f30e

4 files changed, 31 insertions, 17 deletions

diff --git a/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java b/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java
deleted file mode 100644
index 4a7d31c..0000000
--- a/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.android.tests.basicJavaProject;
-
-import java.util.Random;
-
-public class Foo {
-    public static int FOO = 42;
-
-    public int getFoo() {
-        return FOO;
-    }
-
-    public int getRandomFoo() {
-        Random r = new Random(System.currentTimeMillis());
-        return r.nextInt(FOO);
-    }
-}
diff --git a/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/foo.txt b/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/foo.txt
deleted file mode 100644
index 1c33723..0000000
--- a/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/foo.txt
+++ /dev/null
@@ -1 +0,0 @@
-blah blah
\ No newline at end of file
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
new file mode 100644
index 0000000..4f40648
--- /dev/null
+++ b/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.java
@@ -0,0 +1,30 @@
+package com.android.tests.javaprojecttest.javaproject;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+public class JavaProject {
+
+    public static String getContent() {
+        InputStream input = JavaProject.class.getResourceAsStream("JavaProject.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/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.txt b/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.txt
new file mode 100644
index 0000000..5742eaa
--- /dev/null
+++ b/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.txt
@@ -0,0 +1 @@
+SUCCESS from javaProject
\ No newline at end of file