Refactor test cases.

littledot · Apr 13, 2016 · e53fe51 · e53fe51
1 parent c83bd56
commit e53fe51
Show file tree

Hide file tree

Showing 27 changed files with 67 additions and 265 deletions.
diff --git a/app/src/test/java/com/permissionnanny/ClientDeepLinkReceiverTest.java b/app/src/test/java/com/permissionnanny/ClientDeepLinkReceiverTest.java
@@ -4,16 +4,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import com.permissionnanny.common.test.NannyTestCase;
 import com.permissionnanny.lib.Nanny;
 import com.permissionnanny.lib.NannyException;
 import com.permissionnanny.missioncontrol.AppControlActivity;
 import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
@@ -24,11 +19,7 @@
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.verify;
 
-@RunWith(NannyAppTestRunner.class)
-public class ClientDeepLinkReceiverTest extends NannyTestCase {
-
-    @ClassRule public static final RuleChain CLASS_RULES = NannyAppTestRunner.newClassRules();
-    @Rule public final RuleChain TEST_RULES = NannyAppTestRunner.newTestRules(this);
+public class ClientDeepLinkReceiverTest extends NannyAppTestCase {
 
     ClientDeepLinkReceiver mReceiver;
     Intent mIntent;

diff --git a/app/src/test/java/com/permissionnanny/ClientPermissionManifestReceiverTest.java b/app/src/test/java/com/permissionnanny/ClientPermissionManifestReceiverTest.java
@@ -4,7 +4,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import com.permissionnanny.common.test.NannyTestCase;
 import com.permissionnanny.dagger.MockComponentFactory;
 import com.permissionnanny.dagger.MockContextComponent;
 import com.permissionnanny.data.AppPermissionManager;
@@ -13,11 +12,7 @@
 import java.util.ArrayList;
 import javax.inject.Inject;
 import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
@@ -27,11 +22,7 @@
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.verify;
 
-@RunWith(NannyAppTestRunner.class)
-public class ClientPermissionManifestReceiverTest extends NannyTestCase {
-
-    @ClassRule public static final RuleChain CLASS_RULES = NannyAppTestRunner.newClassRules();
-    @Rule public final RuleChain TEST_RULES = NannyAppTestRunner.newTestRules(this);
+public class ClientPermissionManifestReceiverTest extends NannyAppTestCase {
 
     ClientPermissionManifestReceiver mReceiver;
     Intent mIntent;

diff --git a/app/src/test/java/com/permissionnanny/ClientRequestReceiverTest.java b/app/src/test/java/com/permissionnanny/ClientRequestReceiverTest.java
@@ -5,7 +5,6 @@
 import android.content.Intent;
 import android.os.Bundle;
 import com.permissionnanny.common.test.Mockingbird;
-import com.permissionnanny.common.test.NannyTestCase;
 import com.permissionnanny.dagger.ContextComponent;
 import com.permissionnanny.dagger.MockComponentFactory;
 import com.permissionnanny.dagger.MockContextComponent;
@@ -18,11 +17,7 @@
 import com.permissionnanny.lib.request.simple.WifiRequest;
 import javax.inject.Inject;
 import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
@@ -37,11 +32,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@RunWith(NannyAppTestRunner.class)
-public class ClientRequestReceiverTest extends NannyTestCase {
-
-    @ClassRule public static final RuleChain CLASS_RULES = NannyAppTestRunner.newClassRules();
-    @Rule public final RuleChain TEST_RULES = NannyAppTestRunner.newTestRules(this);
+public class ClientRequestReceiverTest extends NannyAppTestCase {
 
     ClientRequestReceiver mReceiver;
     Intent mIntent;

diff --git a/app/src/test/java/com/permissionnanny/ConfirmRequestActivityTest.java b/app/src/test/java/com/permissionnanny/ConfirmRequestActivityTest.java
@@ -3,30 +3,18 @@
 import android.content.Intent;
 import android.view.Menu;
 import android.view.MenuItem;
-import com.permissionnanny.common.test.NannyTestCase;
 import com.permissionnanny.dagger.MockActivityComponent;
 import com.permissionnanny.dagger.MockComponentFactory;
 import javax.inject.Inject;
 import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.robolectric.Robolectric;
 import org.robolectric.util.ActivityController;
 
 import static org.mockito.Mockito.verify;
 
-/**
- *
- */
-@RunWith(NannyAppTestRunner.class)
-public class ConfirmRequestActivityTest extends NannyTestCase {
-
-    @ClassRule public static final RuleChain CLASS_RULES = NannyAppTestRunner.newClassRules();
-    @Rule public final RuleChain TEST_RULES = NannyAppTestRunner.newTestRules(this);
+public class ConfirmRequestActivityTest extends NannyAppTestCase {
 
     ActivityController<ConfirmRequestActivity> mController;
     ConfirmRequestActivity mConfirmRequestActivity;

diff --git a/app/src/test/java/com/permissionnanny/ConfirmRequestBinderTest.java b/app/src/test/java/com/permissionnanny/ConfirmRequestBinderTest.java
@@ -7,7 +7,6 @@
 import android.graphics.drawable.Drawable;
 import android.text.Spanned;
 import android.text.style.StyleSpan;
-import com.permissionnanny.common.test.NannyTestCase;
 import com.permissionnanny.dagger.MockComponentFactory;
 import com.permissionnanny.dagger.MockContextComponent;
 import com.permissionnanny.data.AppPermissionManager;
@@ -16,11 +15,7 @@
 import com.permissionnanny.lib.request.simple.WifiRequest;
 import com.permissionnanny.simple.WifiOperation;
 import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
 
 import static org.hamcrest.Matchers.is;
@@ -29,11 +24,7 @@
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.when;
 
-@RunWith(NannyAppTestRunner.class)
-public class ConfirmRequestBinderTest extends NannyTestCase {
-
-    @ClassRule public static final RuleChain CLASS_RULES = NannyAppTestRunner.newClassRules();
-    @Rule public final RuleChain TEST_RULES = NannyAppTestRunner.newTestRules(this);
+public class ConfirmRequestBinderTest extends NannyAppTestCase {
 
     ConfirmRequestBinder mBinder;
     MockContextComponent mComponent;

diff --git a/app/src/test/java/com/permissionnanny/ConfirmRequestViewTest.java b/app/src/test/java/com/permissionnanny/ConfirmRequestViewTest.java
@@ -7,22 +7,14 @@
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.permissionnanny.common.test.NannyTestCase;
 import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
-@RunWith(NannyAppTestRunner.class)
-public class ConfirmRequestViewTest extends NannyTestCase {
-
-    @ClassRule public static final RuleChain CLASS_RULES = NannyAppTestRunner.newClassRules();
-    @Rule public final RuleChain TEST_RULES = NannyAppTestRunner.newTestRules(this);
+public class ConfirmRequestViewTest extends NannyAppTestCase {
 
     ConfirmRequestView target;
     @Mock Activity activity;

diff --git a/app/src/test/java/com/permissionnanny/NannyAppTestCase.java b/app/src/test/java/com/permissionnanny/NannyAppTestCase.java
@@ -0,0 +1,10 @@
+package com.permissionnanny;
+
+import com.permissionnanny.common.test.NannyTestCase;
+import org.junit.Ignore;
+import org.junit.runner.RunWith;
+
+@Ignore
+@RunWith(NannyAppTestRunner.class)
+public class NannyAppTestCase extends NannyTestCase {
+}
diff --git a/app/src/test/java/com/permissionnanny/TextDialogStubViewTest.java b/app/src/test/java/com/permissionnanny/TextDialogStubViewTest.java
@@ -3,23 +3,17 @@
 import android.view.View;
 import android.view.ViewStub;
 import android.widget.TextView;
-import com.permissionnanny.common.test.NannyTestCase;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- *
- */
-@RunWith(NannyAppTestRunner.class)
-public class TextDialogStubViewTest extends NannyTestCase {
+public class TextDialogStubViewTest extends NannyAppTestCase {
 
     @ClassRule public static final RuleChain CLASS_RULES = NannyAppTestRunner.newClassRules();
     @Rule public final RuleChain TEST_RULES = NannyAppTestRunner.newTestRules(this);

diff --git a/app/src/test/java/com/permissionnanny/UninstallReceiverTest.java b/app/src/test/java/com/permissionnanny/UninstallReceiverTest.java
@@ -3,29 +3,20 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import com.permissionnanny.common.test.NannyTestCase;
 import com.permissionnanny.dagger.DaggerMockContextComponent;
 import com.permissionnanny.dagger.MockComponentFactory;
 import com.permissionnanny.dagger.MockContextComponent;
 import com.permissionnanny.dagger.MockContextModule;
 import com.permissionnanny.data.AppPermissionManager;
 import javax.inject.Inject;
 import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
 
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-@RunWith(NannyAppTestRunner.class)
-public class UninstallReceiverTest extends NannyTestCase {
-
-    @ClassRule public static final RuleChain CLASS_RULES = NannyAppTestRunner.newClassRules();
-    @Rule public final RuleChain TEST_RULES = NannyAppTestRunner.newTestRules(this);
+public class UninstallReceiverTest extends NannyAppTestCase {
 
     UninstallReceiver mReceiver;
     Intent mIntent;

diff --git a/app/src/test/java/com/permissionnanny/UtilTest.java b/app/src/test/java/com/permissionnanny/UtilTest.java
@@ -3,13 +3,8 @@
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import com.permissionnanny.common.test.NannyTestCase;
 import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
 
 import static org.hamcrest.Matchers.nullValue;
@@ -19,11 +14,7 @@
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.when;
 
-@RunWith(NannyAppTestRunner.class)
-public class UtilTest extends NannyTestCase {
-
-    @ClassRule public static final RuleChain CLASS_RULES = NannyAppTestRunner.newClassRules();
-    @Rule public final RuleChain TEST_RULES = NannyAppTestRunner.newTestRules(this);
+public class UtilTest extends NannyAppTestCase {
 
     ApplicationInfo mApplicationInfo;
     @Mock Context mContext;

diff --git a/app/src/test/java/com/permissionnanny/content/ProxyContentProviderTest.java b/app/src/test/java/com/permissionnanny/content/ProxyContentProviderTest.java
@@ -3,12 +3,10 @@
 import android.content.pm.ProviderInfo;
 import android.database.Cursor;
 import android.net.Uri;
-import com.permissionnanny.NannyAppTestRunner;
-import com.permissionnanny.common.test.NannyTestCase;
+import com.permissionnanny.NannyAppTestCase;
 import com.permissionnanny.lib.request.RequestParams;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.robolectric.RuntimeEnvironment;
 
@@ -17,8 +15,7 @@
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
-@RunWith(NannyAppTestRunner.class)
-public class ProxyContentProviderTest extends NannyTestCase {
+public class ProxyContentProviderTest extends NannyAppTestCase {
 
     ProxyContentProvider mProxyContentProvider;
     RequestParams mRequestParams;

diff --git a/app/src/test/java/com/permissionnanny/missioncontrol/AppControlActivityTest.java b/app/src/test/java/com/permissionnanny/missioncontrol/AppControlActivityTest.java
@@ -2,28 +2,19 @@
 
 import android.view.Menu;
 import android.view.MenuItem;
-import com.permissionnanny.NannyAppTestRunner;
-import com.permissionnanny.common.test.NannyTestCase;
+import com.permissionnanny.NannyAppTestCase;
 import com.permissionnanny.dagger.MockActivityComponent;
 import com.permissionnanny.dagger.MockComponentFactory;
 import javax.inject.Inject;
 import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.robolectric.Robolectric;
 import org.robolectric.util.ActivityController;
 
 import static org.mockito.Mockito.verify;
 
-@RunWith(NannyAppTestRunner.class)
-public class AppControlActivityTest extends NannyTestCase {
-
-    @ClassRule public static final RuleChain CLASS_RULES = NannyAppTestRunner.newClassRules();
-    @Rule public final RuleChain TEST_RULES = NannyAppTestRunner.newTestRules(this);
+public class AppControlActivityTest extends NannyAppTestCase {
 
     ActivityController<AppControlActivity> mController;
     AppControlActivity mAppControlActivity;

diff --git a/commonTest/src/main/java/com/permissionnanny/common/test/NannyTestCase.java b/commonTest/src/main/java/com/permissionnanny/common/test/NannyTestCase.java
@@ -1,5 +1,8 @@
 package com.permissionnanny.common.test;
 
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.rules.RuleChain;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 
 /**
@@ -9,4 +12,7 @@
  */
 @PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "android.*", "org.json.*"})
 public class NannyTestCase {
+
+    @ClassRule public static final RuleChain CLASS_RULES = NannyTestRunner.newClassRules();
+    @Rule public final RuleChain TEST_RULES = NannyTestRunner.newTestRules(this);
 }
diff --git a/lib/src/test/java/com/permissionnanny/lib/NannyBundleTest.java b/lib/src/test/java/com/permissionnanny/lib/NannyBundleTest.java
@@ -4,17 +4,11 @@
 import android.content.IntentSender;
 import android.os.Bundle;
 import android.os.Parcelable;
-import com.permissionnanny.common.test.NannyTestCase;
-import com.permissionnanny.common.test.NannyTestRunner;
 import com.permissionnanny.lib.request.RequestParams;
 import java.io.Serializable;
 import org.hamcrest.Matchers;
 import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
 
 import static org.hamcrest.Matchers.is;
@@ -24,11 +18,7 @@
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.when;
 
-@RunWith(NannyLibTestRunner.class)
-public class NannyBundleTest extends NannyTestCase {
-
-    @ClassRule public static final RuleChain CLASS_RULES = NannyTestRunner.newClassRules();
-    @Rule public final RuleChain TEST_RULES = NannyTestRunner.newTestRules(this);
+public class NannyBundleTest extends NannyLibTestCase {
 
     private NannyBundle.Builder mBuilder;
     private Bundle mEntityBody;

diff --git a/lib/src/test/java/com/permissionnanny/lib/NannyLibTestCase.java b/lib/src/test/java/com/permissionnanny/lib/NannyLibTestCase.java
@@ -0,0 +1,10 @@
+package com.permissionnanny.lib;
+
+import com.permissionnanny.common.test.NannyTestCase;
+import org.junit.Ignore;
+import org.junit.runner.RunWith;
+
+@Ignore
+@RunWith(NannyLibTestRunner.class)
+public class NannyLibTestCase extends NannyTestCase {
+}