From f74e9acf7737bb33efb7b7e1180da9ba7b723fa8 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Wed, 11 Jan 2012 08:50:11 -0500
Subject: [PATCH] Bug 717042 - assert in Robocop Asserter so that robotium
 framework will recognize failures; r=jmaher

---
 .../mobile/robocop/FennecNativeAssert.java.in | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/build/mobile/robocop/FennecNativeAssert.java.in b/build/mobile/robocop/FennecNativeAssert.java.in
index b4fc44dc7821..412808dfcfa1 100644
--- a/build/mobile/robocop/FennecNativeAssert.java.in
+++ b/build/mobile/robocop/FennecNativeAssert.java.in
@@ -39,36 +39,17 @@
 
 package @ANDROID_PACKAGE_NAME@;
 
-import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.LinkedList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Date;
 
-import java.lang.Class;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.lang.reflect.InvocationHandler;
-import java.lang.Long;
-
-import android.app.Activity;
 import android.util.Log;
-import android.view.View;
-
-import org.json.*;
-
-import com.jayway.android.robotium.solo.Solo;
 
 public class FennecNativeAssert implements Assert {
-  // Map of IDs to element names.
-  private HashMap locators = null;
   private String logFile = null;
   
   // Objects for reflexive access of fennec classes.
@@ -204,6 +185,9 @@ public class FennecNativeAssert implements Assert {
     } else {
       passed++;
     }
+    if (isError) {
+      junit.framework.Assert.fail(message);
+    }
   }
 
   public void finalize()