From eb4a5f0e224de9728fc912419663e45721afbaa1 Mon Sep 17 00:00:00 2001
From: Andrej Rasevic <andrej.petar.rasevic@gmail.com>
Date: Fri, 8 Sep 2017 15:14:44 -0400
Subject: [PATCH] lint clean-up and deleted extra test
---
.../tests/Test1_StartActivityOneTest.java | 4 +-
.../Test2_DoubleRotateActivityOneTest.java | 9 +-
.../Test2_DoubleRotateActivtyOneTest.java | 83 -------------------
.../tests/Test3_StartActivityTwoTest.java | 6 +-
.../Test4_DoubleRotateActivityTwoTest.java | 7 +-
.../tests/Test5_CloseActivityTwoTest.java | 11 +--
.../tests/Test6_ReopenActivityTwoTest.java | 9 +-
7 files changed, 24 insertions(+), 105 deletions(-)
delete mode 100644 app/src/androidTest/java/course/labs/activitylab/tests/Test2_DoubleRotateActivtyOneTest.java
diff --git a/app/src/androidTest/java/course/labs/activitylab/tests/Test1_StartActivityOneTest.java b/app/src/androidTest/java/course/labs/activitylab/tests/Test1_StartActivityOneTest.java
index 0fb55e5..e57382b 100644
--- a/app/src/androidTest/java/course/labs/activitylab/tests/Test1_StartActivityOneTest.java
+++ b/app/src/androidTest/java/course/labs/activitylab/tests/Test1_StartActivityOneTest.java
@@ -6,12 +6,11 @@ import com.robotium.solo.Solo;
import course.labs.activitylab.ActivityOne;
+@SuppressWarnings("ALL")
public class Test1_StartActivityOneTest extends
ActivityInstrumentationTestCase2<ActivityOne> {
private Solo solo;
- private int timeout = 20000;
- private int sleep = 1000;
public Test1_StartActivityOneTest() {
super(ActivityOne.class);
@@ -30,6 +29,7 @@ public class Test1_StartActivityOneTest extends
// ==================== Section One =====================
// Wait for activity: 'course.labs.activitylab.ActivityOne'
+ int timeout = 20000;
assertTrue("StartActivityOneTest failed: " + "Section One:"
+ "ActivityOne did not correctly load", solo.waitForActivity(
course.labs.activitylab.ActivityOne.class, timeout));
diff --git a/app/src/androidTest/java/course/labs/activitylab/tests/Test2_DoubleRotateActivityOneTest.java b/app/src/androidTest/java/course/labs/activitylab/tests/Test2_DoubleRotateActivityOneTest.java
index 2c6dfb8..bfaecc8 100644
--- a/app/src/androidTest/java/course/labs/activitylab/tests/Test2_DoubleRotateActivityOneTest.java
+++ b/app/src/androidTest/java/course/labs/activitylab/tests/Test2_DoubleRotateActivityOneTest.java
@@ -6,12 +6,11 @@ import com.robotium.solo.Solo;
import course.labs.activitylab.ActivityOne;
+@SuppressWarnings("ALL")
public class Test2_DoubleRotateActivityOneTest extends
ActivityInstrumentationTestCase2<ActivityOne> {
private Solo solo;
- private int timeout = 20000;
- private int sleep = 1000;
public Test2_DoubleRotateActivityOneTest() {
super(ActivityOne.class);
@@ -28,12 +27,14 @@ public class Test2_DoubleRotateActivityOneTest extends
public void testRun() {
// ==================== Section One =====================
// Wait for activity: 'course.labs.activitylab.ActivityOne'
+ int timeout = 20000;
assertTrue("DoubleRotateActivityOneTest failed: " +
"Section One:" +
"ActivityOne did not correctly load",
solo.waitForActivity(course.labs.activitylab.ActivityOne.class, timeout));
-
-
+
+
+ int sleep = 1000;
solo.sleep(sleep);
// ==================== Section Two =====================
diff --git a/app/src/androidTest/java/course/labs/activitylab/tests/Test2_DoubleRotateActivtyOneTest.java b/app/src/androidTest/java/course/labs/activitylab/tests/Test2_DoubleRotateActivtyOneTest.java
deleted file mode 100644
index 6f7ba27..0000000
--- a/app/src/androidTest/java/course/labs/activitylab/tests/Test2_DoubleRotateActivtyOneTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package course.labs.activitylab.tests;
-
-import android.test.ActivityInstrumentationTestCase2;
-
-import com.robotium.solo.Solo;
-
-import course.labs.activitylab.ActivityOne;
-
-public class Test2_DoubleRotateActivtyOneTest extends
- ActivityInstrumentationTestCase2<ActivityOne> {
-
- private Solo solo;
- private int timeout = 20000;
- private int sleep = 1000;
-
- public Test2_DoubleRotateActivtyOneTest() {
- super(ActivityOne.class);
- }
-
- public void setUp() throws Exception {
- solo = new Solo(getInstrumentation(), getActivity());
- }
-
- protected void tearDown() throws Exception {
- solo.finishOpenedActivities();
- }
-
- public void testRun() {
- // ==================== Section One =====================
- // Wait for activity: 'course.labs.activitylab.ActivityOne'
- assertTrue("DoubleRotateActivityOneTest failed: " +
- "Section One:" +
- "ActivityOne did not correctly load",
- solo.waitForActivity(course.labs.activitylab.ActivityOne.class, timeout));
-
-
- solo.sleep(sleep);
-
- // ==================== Section Two =====================
- // Rotate the screen
- solo.setActivityOrientation(Solo.LANDSCAPE);
-
- // Wait for activity: 'course.labs.activitylab.ActivityOne'
- assertTrue("DoubleRotateActivityOneTest failed:" +
- "Section Two:" +
- "ActivityOne did not correctly load after first LANDSCAPE rotation.",
- solo.waitForActivity(course.labs.activitylab.ActivityOne.class, timeout));
-
-
- solo.sleep(sleep);
-
- // ==================== Section Three =====================
- // Rotate the screen
- solo.setActivityOrientation(Solo.PORTRAIT);
-
- // Wait for activity: 'course.labs.activitylab.ActivityOne'
- assertTrue("DoubleRotateActivityOneTest failed:" +
- "Section Three:" +
- "ActivityOne did not correctly load after second PORTRAIT rotation.",
- solo.waitForActivity(course.labs.activitylab.ActivityOne.class, timeout));
-
- solo.sleep(sleep);
-
- // Check for proper counts
- assertTrue("DoubleRotateActivityOneTest failed:" +
- "Section Three:" +
- "onCreate() count was off for ActivityOne after second PORTRAIT rotation.",
- solo.searchText("onCreate\\(\\) calls: 3"));
- assertTrue("DoubleRotateActivityOneTest failed:" +
- "Section Three:" +
- "onStart() count was off for ActivityOne after second PORTRAIT rotation.",
- solo.searchText("onStart\\(\\) calls: 3"));
- assertTrue("DoubleRotateActivityOneTest failed:" +
- "Section Three:" +
- "onResume() count was off for ActivityOne after second PORTRAIT rotation.",
- solo.searchText("onResume\\(\\) calls: 3"));
- assertTrue("DoubleRotateActivityOneTest failed:" +
- "Section Three:" +
- "onRestart() count was off for ActivityOne after second PORTRAIT rotation.",
- solo.searchText("onRestart\\(\\) calls: 0"));
- }
-
-}
diff --git a/app/src/androidTest/java/course/labs/activitylab/tests/Test3_StartActivityTwoTest.java b/app/src/androidTest/java/course/labs/activitylab/tests/Test3_StartActivityTwoTest.java
index c635a53..a614ec9 100644
--- a/app/src/androidTest/java/course/labs/activitylab/tests/Test3_StartActivityTwoTest.java
+++ b/app/src/androidTest/java/course/labs/activitylab/tests/Test3_StartActivityTwoTest.java
@@ -6,11 +6,10 @@ import com.robotium.solo.Solo;
import course.labs.activitylab.ActivityOne;
+@SuppressWarnings("ALL")
public class Test3_StartActivityTwoTest extends ActivityInstrumentationTestCase2<ActivityOne> {
private Solo solo;
- private int timeout = 20000;
- private int sleep = 1000;
public Test3_StartActivityTwoTest() {
super(ActivityOne.class);
@@ -29,7 +28,8 @@ public class Test3_StartActivityTwoTest extends ActivityInstrumentationTestCase2
// ==================== Section One =====================
// Wait for activity: 'course.labs.activitylab.ActivityOne'
- assertTrue("StartActivityTwoTest failed:" +
+ int timeout = 20000;
+ assertTrue("StartActivityTwoTest failed:" +
"Section One:" +
"ActivityOne did not load correctly",
solo.waitForActivity(course.labs.activitylab.ActivityOne.class, timeout));
diff --git a/app/src/androidTest/java/course/labs/activitylab/tests/Test4_DoubleRotateActivityTwoTest.java b/app/src/androidTest/java/course/labs/activitylab/tests/Test4_DoubleRotateActivityTwoTest.java
index 2de3b26..186b6a3 100644
--- a/app/src/androidTest/java/course/labs/activitylab/tests/Test4_DoubleRotateActivityTwoTest.java
+++ b/app/src/androidTest/java/course/labs/activitylab/tests/Test4_DoubleRotateActivityTwoTest.java
@@ -2,16 +2,14 @@ package course.labs.activitylab.tests;
import android.test.ActivityInstrumentationTestCase2;
-import com.robotium.solo.Condition;
import com.robotium.solo.Solo;
import course.labs.activitylab.ActivityOne;
+@SuppressWarnings("ALL")
public class Test4_DoubleRotateActivityTwoTest extends ActivityInstrumentationTestCase2<ActivityOne> {
private Solo solo;
- private int timeout = 20000;
- private int sleep = 1000;
public Test4_DoubleRotateActivityTwoTest() {
super(ActivityOne.class);
@@ -25,10 +23,11 @@ public class Test4_DoubleRotateActivityTwoTest extends ActivityInstrumentationTe
solo.finishOpenedActivities();
}
- // Exectues the DoubleRotateActivityTwoTest
+ // Executes the DoubleRotateActivityTwoTest
public void testRun() {
// ==================== Section One =====================
// Wait for activity: 'course.labs.activitylab.ActivityOne'
+ int timeout = 20000;
assertTrue("DoubleRotateActivityTwoTest failed:" +
"Section One:" +
"ActivityOne did not load correctly",
diff --git a/app/src/androidTest/java/course/labs/activitylab/tests/Test5_CloseActivityTwoTest.java b/app/src/androidTest/java/course/labs/activitylab/tests/Test5_CloseActivityTwoTest.java
index 1753db5..543e4c6 100644
--- a/app/src/androidTest/java/course/labs/activitylab/tests/Test5_CloseActivityTwoTest.java
+++ b/app/src/androidTest/java/course/labs/activitylab/tests/Test5_CloseActivityTwoTest.java
@@ -6,12 +6,11 @@ import com.robotium.solo.Solo;
import course.labs.activitylab.ActivityOne;
+@SuppressWarnings("ALL")
public class Test5_CloseActivityTwoTest extends ActivityInstrumentationTestCase2<ActivityOne> {
private Solo solo;
- private int timeout = 20000;
- private int sleep = 1000;
-
+
public Test5_CloseActivityTwoTest() {
super(ActivityOne.class);
}
@@ -29,7 +28,8 @@ public class Test5_CloseActivityTwoTest extends ActivityInstrumentationTestCase2
// ==================== Section One =====================
// Wait for activity: 'course.labs.activitylab.ActivityOne'
- assertTrue("CloseActivityTwoTest failed:" +
+ int timeout = 20000;
+ assertTrue("CloseActivityTwoTest failed:" +
"Section One:" +
"ActivityOne did not load correctly",
solo.waitForActivity(course.labs.activitylab.ActivityOne.class, timeout));
@@ -51,7 +51,8 @@ public class Test5_CloseActivityTwoTest extends ActivityInstrumentationTestCase2
// Click on Close Activity
solo.waitForView(course.labs.activitylab.R.id.bClose);
-
+
+ int sleep = 1000;
solo.sleep(sleep);
solo.clickOnView(solo.getView(course.labs.activitylab.R.id.bClose));
diff --git a/app/src/androidTest/java/course/labs/activitylab/tests/Test6_ReopenActivityTwoTest.java b/app/src/androidTest/java/course/labs/activitylab/tests/Test6_ReopenActivityTwoTest.java
index dd3cef8..e4feea0 100644
--- a/app/src/androidTest/java/course/labs/activitylab/tests/Test6_ReopenActivityTwoTest.java
+++ b/app/src/androidTest/java/course/labs/activitylab/tests/Test6_ReopenActivityTwoTest.java
@@ -6,11 +6,10 @@ import com.robotium.solo.Solo;
import course.labs.activitylab.ActivityOne;
+@SuppressWarnings("ALL")
public class Test6_ReopenActivityTwoTest extends ActivityInstrumentationTestCase2<ActivityOne> {
private Solo solo;
- private int timeout = 20000;
- private int sleep = 1000;
public Test6_ReopenActivityTwoTest() {
super(ActivityOne.class);
@@ -29,7 +28,8 @@ public class Test6_ReopenActivityTwoTest extends ActivityInstrumentationTestCase
// ==================== Section One =====================
// Wait for activity: 'course.labs.activitylab.ActivityOne'
- assertTrue("ReopenActivityTwoTest failed:" +
+ int timeout = 20000;
+ assertTrue("ReopenActivityTwoTest failed:" +
"Section One:" +
"ActivityOne did not load correctly",
solo.waitForActivity(course.labs.activitylab.ActivityOne.class, timeout));
@@ -47,7 +47,8 @@ public class Test6_ReopenActivityTwoTest extends ActivityInstrumentationTestCase
solo.waitForActivity(course.labs.activitylab.ActivityTwo.class, timeout));
solo.waitForView(course.labs.activitylab.R.id.bClose);
-
+
+ int sleep = 1000;
solo.sleep(sleep);
// ==================== Section Three =====================
--
GitLab