Bug 990116 - Post: Clean Robocop imports. r=trivial

build/mobile/robocop/Driver.java

@@ -4,7 +4,6 @@
 
 package org.mozilla.gecko;
 
-import java.util.List;
 import android.app.Activity;
 
 public interface Driver {

build/mobile/robocop/FennecMochitestAssert.java

@@ -5,6 +5,7 @@
 package org.mozilla.gecko;
 
 import java.util.LinkedList;
+
 import android.os.SystemClock;
 
 public class FennecMochitestAssert implements Assert {

build/mobile/robocop/FennecNativeDriver.java

@@ -4,17 +4,13 @@
 
 package org.mozilla.gecko;
 
-import org.mozilla.gecko.gfx.LayerView;
-import org.mozilla.gecko.gfx.PanningPerfAPI;
-import org.mozilla.gecko.util.GeckoEventListener;
-
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.IntBuffer;
@@ -22,11 +18,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import android.app.Activity;
+import org.json.JSONException;
-import android.view.View;
+import org.json.JSONObject;
-import android.util.Log;
+import org.mozilla.gecko.gfx.LayerView;
+import org.mozilla.gecko.gfx.PanningPerfAPI;
+import org.mozilla.gecko.util.GeckoEventListener;
 
-import org.json.*;
+import android.app.Activity;
+import android.util.Log;
+import android.view.View;
 
 import com.jayway.android.robotium.solo.Solo;
 

build/mobile/robocop/PaintedSurface.java

@@ -4,17 +4,16 @@
 
 package org.mozilla.gecko;
 
-import android.graphics.Bitmap;
-import android.util.Base64;
-import android.util.Base64OutputStream;
-
-import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 
+import android.graphics.Bitmap;
+import android.util.Base64;
+import android.util.Base64OutputStream;
+
 public class PaintedSurface {
     private String mFileName;
     private int mWidth;

build/mobile/robocop/RobocopUtils.java

@@ -4,11 +4,11 @@
 
 package org.mozilla.gecko;
 
-import android.app.Activity;
-
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.TimeUnit;
 
+import android.app.Activity;
+
 public final class RobocopUtils {
     private static final int MAX_WAIT_MS = 20000;
 

mobile/android/base/tests/ContentContextMenuTest.java

@@ -1,9 +1,8 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
 import org.mozilla.gecko.util.Clipboard;
 
-import android.content.ContentResolver;
 import android.util.DisplayMetrics;
 
 

mobile/android/base/tests/ContentProviderTest.java

@@ -4,25 +4,6 @@
 
 package org.mozilla.gecko.tests;
 
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.ContentProviderResult;
-import android.content.ContentProviderOperation;
-import android.content.OperationApplicationException;
-import android.content.res.AssetManager;
-import android.content.res.Resources;
-import android.content.pm.ApplicationInfo;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.database.ContentObserver;
-import android.os.Build;
-import android.net.Uri;
-import android.test.IsolatedContext;
-import android.test.RenamingDelegatingContext;
-import android.test.mock.MockContentResolver;
-import android.test.mock.MockContext;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -31,6 +12,25 @@ import java.util.concurrent.Callable;
 import org.mozilla.gecko.db.BrowserContract;
 import org.mozilla.gecko.db.BrowserProvider;
 
+import android.content.ContentProvider;
+import android.content.ContentProviderOperation;
+import android.content.ContentProviderResult;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.OperationApplicationException;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.res.AssetManager;
+import android.content.res.Resources;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.test.IsolatedContext;
+import android.test.RenamingDelegatingContext;
+import android.test.mock.MockContentResolver;
+import android.test.mock.MockContext;
+
 /*
  * ContentProviderTest provides the infrastructure to run content provider
  * tests in an controlled/isolated environment, guaranteeing that your tests

mobile/android/base/tests/DatabaseHelper.java

@@ -1,14 +1,15 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import java.util.ArrayList;
+
+import org.mozilla.gecko.Assert;
+import org.mozilla.gecko.GeckoProfile;
 import org.mozilla.gecko.db.BrowserDB;
 
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.database.Cursor;
 import android.net.Uri;
-import android.test.ActivityInstrumentationTestCase2;
-import java.util.ArrayList;
 
 class DatabaseHelper {
     protected enum BrowserDataType {BOOKMARKS, HISTORY};

mobile/android/base/tests/JavascriptTest.java

@@ -1,12 +1,14 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
 import org.mozilla.gecko.tests.helpers.JavascriptMessageParser;
 
 import android.util.Log;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.json.JSONObject;
-
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.Assert;
 
 public class JavascriptTest extends BaseTest {
     private static final String LOGTAG = "JavascriptTest";

mobile/android/base/tests/MotionEventReplayer.java

@@ -1,16 +1,17 @@
 package org.mozilla.gecko.tests;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import android.app.Instrumentation;
 import android.os.Build;
 import android.os.SystemClock;

mobile/android/base/tests/PixelTest.java

@@ -1,6 +1,7 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.PaintedSurface;
 
 abstract class PixelTest extends BaseTest {
     private static final long PAINT_CLEAR_DELAY = 10000; // milliseconds

mobile/android/base/tests/SessionTest.java

@@ -1,15 +1,16 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-
-import java.io.IOException;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
+import java.io.IOException;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.Assert;
+import org.mozilla.gecko.FennecMochitestAssert;
 
 public abstract class SessionTest extends BaseTest {
     protected Navigation mNavigation;

mobile/android/base/tests/StringHelper.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
 
 public class StringHelper {
     // Note: DEFAULT_BOOKMARKS_TITLES.length == DEFAULT_BOOKMARKS_URLS.length

mobile/android/base/tests/UITest.java

@@ -4,28 +4,25 @@
 
 package org.mozilla.gecko.tests;
 
+import java.util.Map;
+
 import org.mozilla.gecko.Actions;
-import org.mozilla.gecko.AppConstants;
 import org.mozilla.gecko.Assert;
 import org.mozilla.gecko.Driver;
-import org.mozilla.gecko.FennecInstrumentationTestRunner;
-import org.mozilla.gecko.FennecMochitestAssert;
 import org.mozilla.gecko.FennecNativeActions;
 import org.mozilla.gecko.FennecNativeDriver;
-import org.mozilla.gecko.FennecTalosAssert;
+import org.mozilla.gecko.tests.components.AboutHomeComponent;
-import org.mozilla.gecko.tests.BaseRobocopTest.Type;
+import org.mozilla.gecko.tests.components.AppMenuComponent;
-import org.mozilla.gecko.tests.components.*;
+import org.mozilla.gecko.tests.components.BaseComponent;
+import org.mozilla.gecko.tests.components.GeckoViewComponent;
+import org.mozilla.gecko.tests.components.ToolbarComponent;
 import org.mozilla.gecko.tests.helpers.HelperInitializer;
 
-import com.jayway.android.robotium.solo.Solo;
-
 import android.app.Activity;
 import android.content.Intent;
-import android.test.ActivityInstrumentationTestCase2;
 import android.text.TextUtils;
 
-import java.util.HashMap;
+import com.jayway.android.robotium.solo.Solo;
-import java.util.Map;
 
 /**
  * A base test class for Robocop (UI-centric) tests. This and the related classes attempt to

mobile/android/base/tests/UITestContext.java

@@ -9,11 +9,11 @@ import org.mozilla.gecko.Assert;
 import org.mozilla.gecko.Driver;
 import org.mozilla.gecko.tests.components.BaseComponent;
 
-import com.jayway.android.robotium.solo.Solo;
-
 import android.app.Activity;
 import android.app.Instrumentation;
 
+import com.jayway.android.robotium.solo.Solo;
+
 /**
  * Interface to the global information about a UITest environment.
  */

mobile/android/base/tests/components/AboutHomeComponent.java

@@ -4,21 +4,21 @@
 
 package org.mozilla.gecko.tests.components;
 
-import static org.mozilla.gecko.tests.helpers.AssertionHelper.*;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertEquals;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertTrue;
 
-import org.mozilla.gecko.Actions;
 import org.mozilla.gecko.R;
-import org.mozilla.gecko.tests.helpers.*;
 import org.mozilla.gecko.tests.UITestContext;
+import org.mozilla.gecko.tests.helpers.DeviceHelper;
+import org.mozilla.gecko.tests.helpers.WaitHelper;
 
-import com.jayway.android.robotium.solo.Condition;
-import com.jayway.android.robotium.solo.Solo;
-
-import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.View;
 import android.widget.TextView;
 
+import com.jayway.android.robotium.solo.Condition;
+import com.jayway.android.robotium.solo.Solo;
+
 /**
  * A class representing any interactions that take place on the Awesomescreen.
  */

mobile/android/base/tests/components/AppMenuComponent.java

@@ -4,22 +4,25 @@
 
 package org.mozilla.gecko.tests.components;
 
-import static org.mozilla.gecko.tests.helpers.AssertionHelper.*;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertEquals;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertFalse;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertTrue;
 
+import java.util.List;
+
+import org.mozilla.gecko.R;
 import org.mozilla.gecko.menu.MenuItemActionBar;
 import org.mozilla.gecko.menu.MenuItemDefault;
-import org.mozilla.gecko.tests.helpers.*;
 import org.mozilla.gecko.tests.UITestContext;
+import org.mozilla.gecko.tests.helpers.WaitHelper;
 import org.mozilla.gecko.util.HardwareUtils;
-import org.mozilla.gecko.R;
+
+import android.view.View;
 
 import com.jayway.android.robotium.solo.Condition;
 import com.jayway.android.robotium.solo.RobotiumUtils;
 import com.jayway.android.robotium.solo.Solo;
 
-import android.view.View;
-import java.util.List;
-
 /**
  * A class representing any interactions that take place on the app menu.
  */

mobile/android/base/tests/components/BaseComponent.java

@@ -7,10 +7,10 @@ package org.mozilla.gecko.tests.components;
 import org.mozilla.gecko.Actions;
 import org.mozilla.gecko.tests.UITestContext;
 
-import com.jayway.android.robotium.solo.Solo;
-
 import android.app.Activity;
 
+import com.jayway.android.robotium.solo.Solo;
+
 /**
  * A base class for constructing components - an abstraction over small bits of Firefox
  * functionality. For example, the Toolbar or the about:home screen could be considered a

mobile/android/base/tests/components/GeckoViewComponent.java

@@ -4,13 +4,14 @@
 
 package org.mozilla.gecko.tests.components;
 
-import static org.mozilla.gecko.tests.helpers.AssertionHelper.*;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertNotNull;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertNotSame;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertTrue;
 
-import org.mozilla.gecko.tests.helpers.*;
-import org.mozilla.gecko.tests.UITestContext;
 import org.mozilla.gecko.R;
-
+import org.mozilla.gecko.tests.UITestContext;
-import com.jayway.android.robotium.solo.Condition;
+import org.mozilla.gecko.tests.helpers.FrameworkHelper;
+import org.mozilla.gecko.tests.helpers.WaitHelper;
 
 import android.content.Context;
 import android.content.ContextWrapper;
@@ -21,6 +22,8 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 
+import com.jayway.android.robotium.solo.Condition;
+
 /**
  * A class representing any interactions that take place on GeckoView.
  */

mobile/android/base/tests/components/ToolbarComponent.java

@@ -4,21 +4,23 @@
 
 package org.mozilla.gecko.tests.components;
 
-import static org.mozilla.gecko.tests.helpers.AssertionHelper.*;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertEquals;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertFalse;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertNotNull;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertTrue;
 
-import org.mozilla.gecko.InputMethods;
-import org.mozilla.gecko.tests.helpers.*;
-import org.mozilla.gecko.tests.UITestContext;
 import org.mozilla.gecko.R;
-
+import org.mozilla.gecko.tests.UITestContext;
-import com.jayway.android.robotium.solo.Condition;
+import org.mozilla.gecko.tests.helpers.DeviceHelper;
-import com.jayway.android.robotium.solo.Solo;
+import org.mozilla.gecko.tests.helpers.WaitHelper;
 
 import android.view.View;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
+import com.jayway.android.robotium.solo.Condition;
+
 /**
  * A class representing any interactions that take place on the Toolbar.
  */

mobile/android/base/tests/helpers/DeviceHelper.java

@@ -4,18 +4,17 @@
 
 package org.mozilla.gecko.tests.helpers;
 
-import static org.mozilla.gecko.tests.helpers.AssertionHelper.*;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertTrue;
 
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.tests.UITestContext;
 
-import com.jayway.android.robotium.solo.Solo;
-
 import android.app.Activity;
-import android.content.pm.ActivityInfo;
 import android.os.Build;
 import android.util.DisplayMetrics;
 
+import com.jayway.android.robotium.solo.Solo;
+
 /**
  * Provides general hardware (ex: configuration) and software (ex: version) information
  * about the current test device and allows changing its configuration.

mobile/android/base/tests/helpers/FrameworkHelper.java

@@ -4,9 +4,7 @@
 
 package org.mozilla.gecko.tests.helpers;
 
-import static org.mozilla.gecko.tests.helpers.AssertionHelper.*;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fFail;
-
-import org.mozilla.gecko.tests.UITestContext;
 
 import java.lang.reflect.Field;
 

mobile/android/base/tests/helpers/NavigationHelper.java

@@ -4,17 +4,15 @@
 
 package org.mozilla.gecko.tests.helpers;
 
-import static org.mozilla.gecko.tests.helpers.AssertionHelper.*;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertNotNull;
 
-import org.mozilla.gecko.tests.components.AppMenuComponent;
-import org.mozilla.gecko.tests.components.ToolbarComponent;
 import org.mozilla.gecko.tests.UITestContext;
 import org.mozilla.gecko.tests.UITestContext.ComponentType;
+import org.mozilla.gecko.tests.components.AppMenuComponent;
+import org.mozilla.gecko.tests.components.ToolbarComponent;
 
 import com.jayway.android.robotium.solo.Solo;
 
-import android.text.TextUtils;
-
 /**
  * Provides helper functionality for navigating around the Firefox UI. These functions will often
  * combine actions taken on multiple components to perform larger interactions.

mobile/android/base/tests/helpers/TextInputHelper.java

@@ -4,10 +4,7 @@
 
 package org.mozilla.gecko.tests.helpers;
 
-import static org.mozilla.gecko.tests.helpers.AssertionHelper.*;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertEquals;
-
-import org.mozilla.gecko.tests.UITestContext;
-
 import android.view.inputmethod.ExtractedText;
 import android.view.inputmethod.ExtractedTextRequest;
 import android.view.inputmethod.InputConnection;

mobile/android/base/tests/helpers/WaitHelper.java

@@ -4,19 +4,20 @@
 
 package org.mozilla.gecko.tests.helpers;
 
-import static org.mozilla.gecko.tests.helpers.AssertionHelper.*;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertNotNull;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertTrue;
+
+import java.util.regex.Pattern;
 
 import org.mozilla.gecko.Actions;
 import org.mozilla.gecko.Actions.EventExpecter;
-import org.mozilla.gecko.tests.components.ToolbarComponent;
 import org.mozilla.gecko.tests.UITestContext;
 import org.mozilla.gecko.tests.UITestContext.ComponentType;
+import org.mozilla.gecko.tests.components.ToolbarComponent;
 
 import com.jayway.android.robotium.solo.Condition;
 import com.jayway.android.robotium.solo.Solo;
 
-import java.util.regex.Pattern;
-
 /**
  * Provides functionality related to waiting on certain events to happen.
  */

mobile/android/base/tests/testAboutHomePageNavigation.java

@@ -1,9 +1,8 @@
 package org.mozilla.gecko.tests;
 
-import static org.mozilla.gecko.tests.helpers.AssertionHelper.*;
-
 import org.mozilla.gecko.tests.components.AboutHomeComponent.PanelType;
-import org.mozilla.gecko.tests.helpers.*;
+import org.mozilla.gecko.tests.helpers.DeviceHelper;
+import org.mozilla.gecko.tests.helpers.GeckoHelper;
 
 /**
  * Tests functionality related to navigating between the various about:home panels.

mobile/android/base/tests/testAboutHomeVisibility.java

@@ -1,9 +1,8 @@
 package org.mozilla.gecko.tests;
 
-import static org.mozilla.gecko.tests.helpers.AssertionHelper.*;
-
 import org.mozilla.gecko.tests.components.AboutHomeComponent.PanelType;
-import org.mozilla.gecko.tests.helpers.*;
+import org.mozilla.gecko.tests.helpers.GeckoHelper;
+import org.mozilla.gecko.tests.helpers.NavigationHelper;
 
 /**
  * Tests the visibility of about:home after various interactions with the browser.

mobile/android/base/tests/testAboutPage.java

@@ -1,6 +1,8 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.Element;
+import org.mozilla.gecko.R;
 
 /* Tests related to the about: page:
  *  - check that about: loads from the URL bar

mobile/android/base/tests/testAccounts.java

@@ -4,8 +4,6 @@
 
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-import org.mozilla.gecko.fxa.activities.FxAccountGetStartedActivity;
 
 public class testAccounts extends JavascriptTest {
     public testAccounts() {

mobile/android/base/tests/testAddSearchEngine.java

@@ -1,14 +1,15 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-import android.view.View;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-import android.widget.ImageView;
 import java.util.ArrayList;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.mozilla.gecko.Actions;
+
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.ListView;
 
 /**
  * Test adding a search engine from an input field context menu.

mobile/android/base/tests/testAddonManager.java

@@ -1,10 +1,9 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-import android.util.DisplayMetrics;
-
-import org.json.JSONArray;
 import org.json.JSONObject;
+import org.mozilla.gecko.Actions;
+
+import android.util.DisplayMetrics;
 
 public class testAddonManager extends PixelTest  {
     /* This test will check the behavior of the Addons Manager:

mobile/android/base/tests/testAdobeFlash.java

@@ -1,11 +1,9 @@
 package org.mozilla.gecko.tests;
 
-import android.os.Build;
-
-import org.json.JSONArray;
 import org.json.JSONObject;
+import org.mozilla.gecko.PaintedSurface;
 
-import org.mozilla.gecko.*;
+import android.os.Build;
 
 /**
  * Tests that Flash is working

mobile/android/base/tests/testAxisLocking.java

@@ -1,6 +1,7 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.PaintedSurface;
 
 /**
  * Basic test for axis locking behaviour.

mobile/android/base/tests/testBookmark.java

@@ -1,12 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-
-import android.view.View;
-import android.widget.ListView;
-
-import java.util.Arrays;
-import java.util.ArrayList;
 
 public class testBookmark extends AboutHomeTest {
     private static String BOOKMARK_URL;

mobile/android/base/tests/testBookmarkFolders.java

@@ -1,22 +1,16 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
 import org.mozilla.gecko.sync.Utils;
 
-import com.jayway.android.robotium.solo.Condition;
-
 import android.content.ContentResolver;
 import android.content.ContentValues;
-import android.content.ContentUris;
-import android.database.Cursor;
 import android.net.Uri;
 import android.view.View;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import java.util.ArrayList;
+import com.jayway.android.robotium.solo.Condition;
-import java.util.Arrays;
 
 public class testBookmarkFolders extends AboutHomeTest {
     private static String DESKTOP_BOOKMARK_URL;

mobile/android/base/tests/testBookmarkKeyword.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
 
 public class testBookmarkKeyword extends AboutHomeTest {
     public void testBookmarkKeyword() {

mobile/android/base/tests/testBookmarklets.java

@@ -1,8 +1,8 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
-import android.database.Cursor;
 
+import android.database.Cursor;
 import android.widget.ListView;
 
 

mobile/android/base/tests/testBookmarksPanel.java

@@ -1,6 +1,8 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.Element;
+import org.mozilla.gecko.R;
 
 public class testBookmarksPanel extends AboutHomeTest {
     public void testBookmarksPanel() {

mobile/android/base/tests/testBrowserDiscovery.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
 
 
 public class testBrowserDiscovery extends JavascriptTest {

mobile/android/base/tests/testBrowserProvider.java

@@ -1,20 +1,20 @@
 package org.mozilla.gecko.tests;
 
-import android.content.ContentValues;
-import android.content.ContentUris;
-import android.content.ContentProviderResult;
-import android.content.ContentProviderOperation;
-import android.content.OperationApplicationException;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.util.Log;
-
 import java.util.ArrayList;
 import java.util.Random;
 
 import org.mozilla.gecko.db.BrowserContract;
 
+import android.content.ContentProviderOperation;
+import android.content.ContentProviderResult;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.OperationApplicationException;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.util.Log;
+
 /*
  * This test is meant to exercise all operations exposed by Fennec's
  * history and bookmarks content provider. It does so in an isolated

mobile/android/base/tests/testBrowserSearchVisibility.java

@@ -1,16 +1,8 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-import android.app.Activity;
-import android.content.Context;
 import android.support.v4.app.Fragment;
-import android.view.View;
-import android.view.ViewGroup;
 import android.view.KeyEvent;
-import android.widget.TextView;
+import android.view.View;
-import java.lang.RuntimeException;
-import java.util.ArrayList;
-import java.util.HashMap;
 
 /**
  * Test for browser search visibility.

mobile/android/base/tests/testCheck.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.tests.BaseRobocopTest.Type;
 
 public class testCheck extends PixelTest {
     private void pause(int length) {

mobile/android/base/tests/testCheck2.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.tests.BaseRobocopTest.Type;
 
 public class testCheck2 extends PixelTest {
     @Override

mobile/android/base/tests/testClearPrivateData.java

@@ -1,7 +1,8 @@
 package org.mozilla.gecko.tests;
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.R;
+
 import android.view.View;
-import org.mozilla.gecko.*;
-import java.util.ArrayList;
 
 /**
  * This patch tests the clear private data options:

mobile/android/base/tests/testDeviceSearchEngine.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
 
 
 public class testDeviceSearchEngine extends JavascriptTest {

mobile/android/base/tests/testDistribution.java

@@ -1,13 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-import org.mozilla.gecko.db.BrowserContract;
-import org.mozilla.gecko.db.BrowserProvider;
-import org.mozilla.gecko.util.ThreadUtils;
-
-import android.app.Activity;
-import android.content.SharedPreferences;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
@@ -16,6 +8,13 @@ import java.io.OutputStream;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.Distribution;
+import org.mozilla.gecko.db.BrowserContract;
+import org.mozilla.gecko.util.ThreadUtils;
+
+import android.app.Activity;
+import android.content.SharedPreferences;
 
 /**
  * Tests distribution customization.

mobile/android/base/tests/testDoorHanger.java

@@ -1,13 +1,9 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-
-import android.app.Activity;
-import android.content.SharedPreferences;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.mozilla.gecko.Actions;
 
 /* This test will test if doorhangers are displayed and dismissed
    The test will test:

mobile/android/base/tests/testFindInPage.java

@@ -1,8 +1,9 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
-import android.app.Activity;
+import org.mozilla.gecko.Element;
-import android.graphics.Color;
+import org.mozilla.gecko.PaintedSurface;
+import org.mozilla.gecko.R;
 
 public class testFindInPage extends PixelTest {
     private static final int WAIT_FOR_TEST = 3000;

mobile/android/base/tests/testFlingCorrectness.java

@@ -1,6 +1,7 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.PaintedSurface;
 
 /**
  * Basic fling correctness test.

mobile/android/base/tests/testFormHistory.java

@@ -1,12 +1,13 @@
 package org.mozilla.gecko.tests;
 
+import java.io.File;
+
 import org.mozilla.gecko.db.BrowserContract.FormHistory;
 
-import android.content.ContentValues;
 import android.content.ContentResolver;
+import android.content.ContentValues;
 import android.content.Context;
 import android.net.Uri;
-import java.io.File;
 
 /**
  * A basic form history contentprovider test.

mobile/android/base/tests/testGetUserMedia.java

@@ -1,8 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-
-import android.app.Activity;
 import android.hardware.Camera;
 import android.os.Build;
 

mobile/android/base/tests/testHistory.java

@@ -1,11 +1,8 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-import android.widget.ListView;
-import android.app.Activity;
-import java.util.ArrayList;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ListView;
 
 public class testHistory extends AboutHomeTest {
     private View mFirstChild;

mobile/android/base/tests/testHomeBanner.java

@@ -1,12 +1,8 @@
 package org.mozilla.gecko.tests;
 
-import static org.mozilla.gecko.tests.helpers.AssertionHelper.*;
-
 import org.mozilla.gecko.Actions;
-import org.mozilla.gecko.R;
+import org.mozilla.gecko.tests.helpers.GeckoHelper;
-import org.mozilla.gecko.tests.helpers.*;
+import org.mozilla.gecko.tests.helpers.NavigationHelper;
-
-import android.view.View;
 
 public class testHomeBanner extends UITest {
 

mobile/android/base/tests/testHomeListsProvider.java

@@ -1,7 +1,7 @@
 package org.mozilla.gecko.tests;
 
-import android.content.ContentValues;
 import android.content.ContentUris;
+import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
 

mobile/android/base/tests/testHomeProvider.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
 
 public class testHomeProvider extends JavascriptTest {
     public testHomeProvider() {

mobile/android/base/tests/testImportFromAndroid.java

@@ -1,14 +1,15 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import java.util.ArrayList;
-import android.app.Activity;
+
-import android.provider.Browser;
+import org.mozilla.gecko.Actions;
-import android.content.ContentValues;
+import org.mozilla.gecko.GeckoProfile;
+
 import android.content.ContentResolver;
+import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
-import java.util.ArrayList;
+import android.provider.Browser;
-import java.util.Arrays;
 
 /**
   * This test covers the Import from Android feature

mobile/android/base/tests/testInputConnection.java

@@ -1,10 +1,15 @@
 package org.mozilla.gecko.tests;
 
-import static org.mozilla.gecko.tests.helpers.AssertionHelper.*;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertEquals;
-import static org.mozilla.gecko.tests.helpers.TextInputHelper.*;
+import static org.mozilla.gecko.tests.helpers.TextInputHelper.assertSelection;
+import static org.mozilla.gecko.tests.helpers.TextInputHelper.assertSelectionAt;
+import static org.mozilla.gecko.tests.helpers.TextInputHelper.assertText;
+import static org.mozilla.gecko.tests.helpers.TextInputHelper.assertTextAndSelection;
+import static org.mozilla.gecko.tests.helpers.TextInputHelper.assertTextAndSelectionAt;
 
 import org.mozilla.gecko.tests.components.GeckoViewComponent.InputConnectionTest;
-import org.mozilla.gecko.tests.helpers.*;
+import org.mozilla.gecko.tests.helpers.GeckoHelper;
+import org.mozilla.gecko.tests.helpers.NavigationHelper;
 
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;

mobile/android/base/tests/testInputUrlBar.java

@@ -1,9 +1,9 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.Element;
+import org.mozilla.gecko.R;
 
-import android.app.Activity;
-import android.view.View;
 import android.widget.EditText;
 
 /**

mobile/android/base/tests/testJNI.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
 
 
 public class testJNI extends JavascriptTest {

mobile/android/base/tests/testLinkContextMenu.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
 
 public class testLinkContextMenu extends ContentContextMenuTest {
 

mobile/android/base/tests/testMailToContextMenu.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
 
 public class testMailToContextMenu extends ContentContextMenuTest {
 

mobile/android/base/tests/testMasterPassword.java

@@ -1,6 +1,6 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
 
 /* This patch tests the Master Password feature first by enabling the password,
 then testing it on a login page and finally disabling the password */

mobile/android/base/tests/testMozPay.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
 
 
 public class testMozPay extends JavascriptTest {

mobile/android/base/tests/testNativeCrypto.java

@@ -4,7 +4,10 @@
 
 package org.mozilla.gecko.tests;
 
-import static org.mozilla.gecko.tests.helpers.AssertionHelper.*;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertArrayEquals;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertEquals;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertNotNull;
+import static org.mozilla.gecko.tests.helpers.AssertionHelper.fFail;
 
 import java.io.UnsupportedEncodingException;
 import java.security.GeneralSecurityException;
@@ -13,7 +16,7 @@ import java.security.NoSuchAlgorithmException;
 
 import org.mozilla.gecko.background.nativecode.NativeCrypto;
 import org.mozilla.gecko.sync.Utils;
-import org.mozilla.gecko.tests.helpers.*;
+import org.mozilla.gecko.tests.helpers.GeckoHelper;
 
 import android.os.SystemClock;
 

mobile/android/base/tests/testNewTab.java

@@ -1,6 +1,8 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Element;
+import org.mozilla.gecko.R;
+
 import android.app.Activity;
 import android.view.View;
 

mobile/android/base/tests/testOrderedBroadcast.java

@@ -1,20 +1,14 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import android.app.Activity;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 
-import android.util.Log;
-
 
 public class testOrderedBroadcast extends JavascriptTest {
     protected BroadcastReceiver mReceiver;

mobile/android/base/tests/testOverscroll.java

@@ -1,6 +1,7 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.PaintedSurface;
 
 /**
  * Basic test to check bounce-back from overscroll.

mobile/android/base/tests/testPan.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.tests.BaseRobocopTest.Type;
 
 /**
  * A panning performance test.

mobile/android/base/tests/testPanCorrectness.java

@@ -1,6 +1,7 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.PaintedSurface;
 
 /**
  * A basic panning correctness test.

mobile/android/base/tests/testPasswordEncrypt.java

@@ -1,17 +1,16 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-import org.mozilla.gecko.db.BrowserContract;
-
-import android.content.ContentValues;
-import android.content.ContentResolver;
-import android.database.Cursor;
-import android.content.Context;
-import android.net.Uri;
 import java.io.File;
 
-import org.json.JSONArray;
 import org.json.JSONObject;
+import org.mozilla.gecko.NSSBridge;
+import org.mozilla.gecko.db.BrowserContract;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
 
 public class testPasswordEncrypt extends BaseTest {
     public void testPasswordEncrypt() {

mobile/android/base/tests/testPasswordProvider.java

@@ -1,13 +1,14 @@
 package org.mozilla.gecko.tests;
 
+import java.io.File;
+
 import org.mozilla.gecko.db.BrowserContract.Passwords;
 
-import android.content.ContentValues;
 import android.content.ContentResolver;
-import android.database.Cursor;
+import android.content.ContentValues;
 import android.content.Context;
+import android.database.Cursor;
 import android.net.Uri;
-import java.io.File;
 
 /**
  * A basic password contentprovider test.

mobile/android/base/tests/testPermissions.java

@@ -1,9 +1,11 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import java.util.ArrayList;
+
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.PaintedSurface;
 
 import android.widget.CheckBox;
-import java.util.ArrayList;
 
 public class testPermissions extends PixelTest {
     public void testPermissions() {

mobile/android/base/tests/testPictureLinkContextMenu.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
 
 public class testPictureLinkContextMenu extends ContentContextMenuTest {
 

mobile/android/base/tests/testPrefsObserver.java

@@ -1,11 +1,8 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-import android.app.Instrumentation;
-
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.mozilla.gecko.Actions;
 
 /**
  * Basic test to check bounce-back from overscroll.

mobile/android/base/tests/testPrivateBrowsing.java

@@ -1,11 +1,10 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-
 import java.util.ArrayList;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.mozilla.gecko.Actions;
 
 /**
  * The test loads a new private tab and loads a page with a big link on it

mobile/android/base/tests/testPromptGridInput.java

@@ -1,17 +1,6 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
-
-import android.graphics.drawable.Drawable;
-import android.widget.EditText;
-import android.widget.CheckedTextView;
-import android.widget.TextView;
-import android.text.InputType;
-import android.util.DisplayMetrics;
-import android.view.View;
-import android.util.Log;
-
-import org.json.JSONObject;
 
 public class testPromptGridInput extends BaseTest {
     protected int index = 1;

mobile/android/base/tests/testSearchSuggestions.java

@@ -1,18 +1,18 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.R;
 import org.mozilla.gecko.home.BrowserSearch;
 import org.mozilla.gecko.home.SuggestClient;
 
 import android.app.Activity;
-import android.content.Context;
 import android.support.v4.app.Fragment;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import java.lang.RuntimeException;
-import java.util.ArrayList;
-import java.util.HashMap;
 
 /**
  * Test for search suggestions.

mobile/android/base/tests/testSessionHistory.java

@@ -1,8 +1,7 @@
 package org.mozilla.gecko.tests;
 
-import static org.mozilla.gecko.tests.helpers.AssertionHelper.*;
+import org.mozilla.gecko.tests.helpers.GeckoHelper;
-
+import org.mozilla.gecko.tests.helpers.NavigationHelper;
-import org.mozilla.gecko.tests.helpers.*;
 
 /**
  * Tests that navigating through session history (ex: forward, back) sets the correct UI state.

mobile/android/base/tests/testSessionOOMRestore.java

@@ -1,7 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;

mobile/android/base/tests/testSessionOOMSave.java

@@ -1,9 +1,8 @@
 package org.mozilla.gecko.tests;
 
-import com.jayway.android.robotium.solo.Condition;
+import org.mozilla.gecko.Actions;
-import org.mozilla.gecko.*;
 
-import android.content.Intent;
+import com.jayway.android.robotium.solo.Condition;
 
 /**
  * Tests session OOM save behavior.

mobile/android/base/tests/testSettingsMenuItems.java

@@ -1,13 +1,14 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
-
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.HashMap;
+
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.AppConstants;
 
 /** This patch tests the Sections present in the Settings Menu and the
  *  default values for them

mobile/android/base/tests/testShareLink.java

@@ -1,23 +1,23 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import com.jayway.android.robotium.solo.Condition;
+import org.mozilla.gecko.Actions;
 
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Build;
-import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AbsListView;
 import android.widget.GridView;
 import android.widget.ListView;
 import android.widget.TextView;
-import java.util.ArrayList;
+
-import java.util.List;
+import com.jayway.android.robotium.solo.Condition;
 
 /**
  * This test covers the opening and content of the Share Link pop-up list

mobile/android/base/tests/testSharedPreferences.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
 
 
 public class testSharedPreferences extends JavascriptTest {

mobile/android/base/tests/testSimpleDiscovery.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
 
 
 public class testSimpleDiscovery extends JavascriptTest {

mobile/android/base/tests/testSystemPages.java

@@ -1,6 +1,6 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
 
 /** This patch tests the System Pages first by loading system pages from
  *  the awesome bar and then from Firefox menu 

mobile/android/base/tests/testTitleBar.java

@@ -1,7 +1,5 @@
 package org.mozilla.gecko.tests;
-import android.view.View;
+import org.mozilla.gecko.Actions;
-import org.mozilla.gecko.*;
-import java.util.ArrayList;
 
 /**
  * This patch tests the option that shows the full URL and title in the URL Bar

mobile/android/base/tests/testVideoDiscovery.java

@@ -1,6 +1,5 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
 
 
 public class testVideoDiscovery extends JavascriptTest {

mobile/android/base/tests/testVkbOverlap.java

@@ -1,6 +1,8 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.PaintedSurface;
+
 import android.net.Uri;
 
 /**

mobile/android/base/tests/test_bug720538.java

@@ -1,6 +1,7 @@
 package org.mozilla.gecko.tests;
 
-import org.mozilla.gecko.*;
+import org.mozilla.gecko.Actions;
+import org.mozilla.gecko.PaintedSurface;
 
 public class test_bug720538 extends PixelTest {
     public void test_bug720538() {