Merge pull request ruboto#108 from DatekWireless/master

Trying to get tests green
rscottm · Sep 11, 2011 · 6b0aea2 · 6b0aea2
2 parents 0dca8f6 + 5ed67eb
commit 6b0aea2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/assets/src/org/ruboto/test/ActivityTest.java b/assets/src/org/ruboto/test/ActivityTest.java
@@ -33,28 +33,28 @@ public void runTest() throws Exception {
         Log.i(getClass().getName(), "runTest");
         Log.i(getClass().getName(), "runTest: " + getName());
         if (Script.setUpJRuby(getActivity())) {
-        Log.i(getClass().getName(), "ruby ok");
-        try {
-            final Activity activity = getActivity();
-            Log.i(getClass().getName(), "activity ok");
-            runTestOnUiThread(new Runnable() {
-                public void run() {
-                    String oldFile = Script.getScriptFilename();
+            Log.i(getClass().getName(), "ruby ok");
+            try {
+                final Activity activity = getActivity();
+                Log.i(getClass().getName(), "activity ok");
+                runTestOnUiThread(new Runnable() {
+                    public void run() {
+                        String oldFile = Script.getScriptFilename();
 
-                    Log.i(getClass().getName(), "calling setup");
-                    Script.setScriptFilename(filename);
-                    Script.callMethod(setup, "call", activity);
-                    Log.i(getClass().getName(), "setup ok");
+                        Log.i(getClass().getName(), "calling setup");
+                        Script.setScriptFilename(filename);
+                        Script.callMethod(setup, "call", activity);
+                        Log.i(getClass().getName(), "setup ok");
 
-                    Script.setScriptFilename(filename);
-                    Script.callMethod(block, "call", activity);
-                    Script.setScriptFilename(oldFile);
-                }
-            });
-        } catch (Throwable t) {
-            throw new AssertionFailedError(t.getMessage());
-        }
-        Log.i(getClass().getName(), "runTest ok");
+                        Script.setScriptFilename(filename);
+                        Script.callMethod(block, "call", activity);
+                        Script.setScriptFilename(oldFile);
+                    }
+                });
+            } catch (Throwable t) {
+                throw new AssertionFailedError(t.getMessage() != null ? t.getMessage() : t.getClass().getName());
+            }
+            Log.i(getClass().getName(), "runTest ok");
         } else {
             throw new AssertionFailedError("Ruboto Core platform is missing.");
         }

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -162,7 +162,7 @@ def run_app_tests
       puts "Skipping instrumentation tests on #{ANDROID_OS} since they don't work."
     else
       Dir.chdir "#{APP_DIR}/test" do
-        system 'rake test'
+        system 'rake test:quick'
         assert_equal 0, $?, "tests failed with return code #$?"
       end
     end