From 905f4e624b9279e2c9e44cbcd1c473e3b7851dfb Mon Sep 17 00:00:00 2001 From: venomousboxer Date: Sun, 27 May 2018 11:50:56 +0530 Subject: [PATCH 1/9] Optimized import statements --- .../in/tosc/digitaloceanapp/DOAppTest.java | 3 --- .../activities/AboutActivityTest.java | 19 ++++++--------- .../activities/DropletActivityTest.java | 23 ++++++++----------- .../activities/DropletCreateActivityTest.java | 15 +++++------- .../activities/AboutActivity.java | 4 +--- .../activities/DetailDropletActivity.java | 5 ---- .../digitaloceanapp/utils/FontsOverride.java | 7 ++---- .../in/tosc/doandroidlib/DigitalOcean.java | 1 - .../doandroidlib/api/DigitalOceanClient.java | 5 ---- .../api/DigitalOceanStatisticsClient.java | 1 - .../ClientInitializationException.java | 2 -- .../doandroidlib/mockapi/MockResponses.java | 1 - .../tosc/doandroidlib/mockapi/MockUtils.java | 5 ---- .../doandroidlib/objects/AccountInfo.java | 2 -- .../tosc/doandroidlib/DigitalOceanTest.java | 9 ++------ 15 files changed, 27 insertions(+), 75 deletions(-) diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/DOAppTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/DOAppTest.java index 940b426..43bd572 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/DOAppTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/DOAppTest.java @@ -3,9 +3,6 @@ import android.app.Instrumentation; import android.support.test.InstrumentationRegistry; import android.support.test.runner.AndroidJUnit4; -import android.support.test.runner.lifecycle.ApplicationLifecycleCallback; -import android.support.test.runner.lifecycle.ApplicationLifecycleMonitor; - import org.junit.Before; import org.junit.Test; diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/AboutActivityTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/AboutActivityTest.java index 5eea8f3..e6d7732 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/AboutActivityTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/AboutActivityTest.java @@ -2,26 +2,21 @@ import android.support.test.rule.ActivityTestRule; - -import static android.support.test.espresso.Espresso.onView; - -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static android.support.test.espresso.matcher.ViewMatchers.withText; - import android.support.test.runner.AndroidJUnit4; - - import android.view.WindowManager; -import in.tosc.digitaloceanapp.R; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import in.tosc.digitaloceanapp.R; + +import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.action.ViewActions.click; +import static android.support.test.espresso.assertion.ViewAssertions.matches; +import static android.support.test.espresso.matcher.ViewMatchers.withText; + /** * Created by championswimmer on 15/07/17. diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java index 84c417e..36722a0 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java @@ -4,29 +4,24 @@ import android.support.test.espresso.contrib.NavigationViewActions; import android.support.test.rule.ActivityTestRule; import android.support.test.runner.AndroidJUnit4; - - -import static android.support.test.espresso.Espresso.onView; - -import static android.support.test.espresso.assertion.ViewAssertions.matches; -import static android.support.test.espresso.contrib.DrawerMatchers.isClosed; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withId; - import android.view.Gravity; import android.view.WindowManager; -import static in.tosc.digitaloceanapp.matchers.RecyclerViewMatcher.withRecyclerView; -import in.tosc.digitaloceanapp.R; - -import static junit.framework.Assert.assertNotNull; - import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import in.tosc.digitaloceanapp.R; + +import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.assertion.ViewAssertions.matches; +import static android.support.test.espresso.contrib.DrawerMatchers.isClosed; +import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; +import static in.tosc.digitaloceanapp.matchers.RecyclerViewMatcher.withRecyclerView; +import static junit.framework.Assert.assertNotNull; + diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java index be2d373..a931d78 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java @@ -1,22 +1,19 @@ package in.tosc.digitaloceanapp.activities; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.matcher.ViewMatchers.withId; - import android.support.test.rule.ActivityTestRule; - import android.view.WindowManager; -import in.tosc.digitaloceanapp.R; - -import static junit.framework.Assert.assertNotNull; - import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import in.tosc.digitaloceanapp.R; + +import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.action.ViewActions.click; +import static junit.framework.Assert.assertNotNull; + diff --git a/app/src/main/java/in/tosc/digitaloceanapp/activities/AboutActivity.java b/app/src/main/java/in/tosc/digitaloceanapp/activities/AboutActivity.java index 1bbd518..5e08210 100644 --- a/app/src/main/java/in/tosc/digitaloceanapp/activities/AboutActivity.java +++ b/app/src/main/java/in/tosc/digitaloceanapp/activities/AboutActivity.java @@ -2,12 +2,10 @@ import android.content.Intent; import android.net.Uri; +import android.os.Bundle; import android.support.design.widget.AppBarLayout; -import android.support.design.widget.CoordinatorLayout; import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; import android.support.v7.widget.Toolbar; -import android.view.MenuItem; import android.view.View; import in.tosc.digitaloceanapp.R; diff --git a/app/src/main/java/in/tosc/digitaloceanapp/activities/DetailDropletActivity.java b/app/src/main/java/in/tosc/digitaloceanapp/activities/DetailDropletActivity.java index cec7d71..352b7da 100644 --- a/app/src/main/java/in/tosc/digitaloceanapp/activities/DetailDropletActivity.java +++ b/app/src/main/java/in/tosc/digitaloceanapp/activities/DetailDropletActivity.java @@ -1,9 +1,7 @@ package in.tosc.digitaloceanapp.activities; import android.os.Bundle; -import android.os.Handler; import android.support.annotation.NonNull; -import android.support.design.internal.SnackbarContentLayout; import android.support.design.widget.CoordinatorLayout; import android.support.design.widget.Snackbar; import android.support.v7.app.AppCompatActivity; @@ -25,9 +23,6 @@ import in.tosc.digitaloceanapp.R; import in.tosc.digitaloceanapp.adapters.DropletsAdapter; - - - import in.tosc.digitaloceanapp.interfaces.OnDropletNameChange; import in.tosc.doandroidlib.DigitalOcean; import in.tosc.doandroidlib.api.DigitalOceanClient; diff --git a/app/src/main/java/in/tosc/digitaloceanapp/utils/FontsOverride.java b/app/src/main/java/in/tosc/digitaloceanapp/utils/FontsOverride.java index 81ce2b0..b7c4bcc 100644 --- a/app/src/main/java/in/tosc/digitaloceanapp/utils/FontsOverride.java +++ b/app/src/main/java/in/tosc/digitaloceanapp/utils/FontsOverride.java @@ -3,22 +3,19 @@ /** * Created by championswimmer on 26/11/16. */ -import java.lang.reflect.Field; - import android.app.ActionBar; import android.app.Activity; import android.content.Context; import android.graphics.Paint; import android.graphics.Typeface; import android.support.v4.util.LruCache; -import android.support.v7.widget.Toolbar; import android.text.Spannable; import android.text.SpannableString; import android.text.TextPaint; import android.text.style.MetricAffectingSpan; import android.util.Log; -import android.view.View; -import android.widget.TextView; + +import java.lang.reflect.Field; public final class FontsOverride { diff --git a/doandroidlib/src/main/java/in/tosc/doandroidlib/DigitalOcean.java b/doandroidlib/src/main/java/in/tosc/doandroidlib/DigitalOcean.java index e85bcb6..16895f0 100644 --- a/doandroidlib/src/main/java/in/tosc/doandroidlib/DigitalOcean.java +++ b/doandroidlib/src/main/java/in/tosc/doandroidlib/DigitalOcean.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import java.io.IOException; diff --git a/doandroidlib/src/main/java/in/tosc/doandroidlib/api/DigitalOceanClient.java b/doandroidlib/src/main/java/in/tosc/doandroidlib/api/DigitalOceanClient.java index 9e7a01d..fa6a878 100644 --- a/doandroidlib/src/main/java/in/tosc/doandroidlib/api/DigitalOceanClient.java +++ b/doandroidlib/src/main/java/in/tosc/doandroidlib/api/DigitalOceanClient.java @@ -1,17 +1,12 @@ package in.tosc.doandroidlib.api; -import java.util.List; - import in.tosc.doandroidlib.common.ActionType; -import in.tosc.doandroidlib.objects.Account; import in.tosc.doandroidlib.objects.AccountInfo; import in.tosc.doandroidlib.objects.Action; import in.tosc.doandroidlib.objects.Droplet; import in.tosc.doandroidlib.objects.Droplets; -import in.tosc.doandroidlib.objects.Image; import in.tosc.doandroidlib.objects.Images; import in.tosc.doandroidlib.objects.Regions; -import in.tosc.doandroidlib.objects.Size; import in.tosc.doandroidlib.objects.Sizes; import retrofit2.Call; import retrofit2.http.Field; diff --git a/doandroidlib/src/main/java/in/tosc/doandroidlib/api/DigitalOceanStatisticsClient.java b/doandroidlib/src/main/java/in/tosc/doandroidlib/api/DigitalOceanStatisticsClient.java index f336138..fc213e0 100644 --- a/doandroidlib/src/main/java/in/tosc/doandroidlib/api/DigitalOceanStatisticsClient.java +++ b/doandroidlib/src/main/java/in/tosc/doandroidlib/api/DigitalOceanStatisticsClient.java @@ -4,7 +4,6 @@ import in.tosc.doandroidlib.common.StatisticsType; import in.tosc.doandroidlib.objects.Statistics; import retrofit2.Call; -import retrofit2.http.Field; import retrofit2.http.GET; import retrofit2.http.Path; import retrofit2.http.Query; diff --git a/doandroidlib/src/main/java/in/tosc/doandroidlib/exceptions/ClientInitializationException.java b/doandroidlib/src/main/java/in/tosc/doandroidlib/exceptions/ClientInitializationException.java index b4085db..edc32fc 100644 --- a/doandroidlib/src/main/java/in/tosc/doandroidlib/exceptions/ClientInitializationException.java +++ b/doandroidlib/src/main/java/in/tosc/doandroidlib/exceptions/ClientInitializationException.java @@ -1,7 +1,5 @@ package in.tosc.doandroidlib.exceptions; -import java.io.IOException; - /** * Created by championswimmer on 15/07/17. */ diff --git a/doandroidlib/src/main/java/in/tosc/doandroidlib/mockapi/MockResponses.java b/doandroidlib/src/main/java/in/tosc/doandroidlib/mockapi/MockResponses.java index 0a60005..e8654d7 100644 --- a/doandroidlib/src/main/java/in/tosc/doandroidlib/mockapi/MockResponses.java +++ b/doandroidlib/src/main/java/in/tosc/doandroidlib/mockapi/MockResponses.java @@ -1,7 +1,6 @@ package in.tosc.doandroidlib.mockapi; import java.util.HashMap; -import java.util.Map; /** * Created by championswimmer on 15/07/17. diff --git a/doandroidlib/src/main/java/in/tosc/doandroidlib/mockapi/MockUtils.java b/doandroidlib/src/main/java/in/tosc/doandroidlib/mockapi/MockUtils.java index 3cff536..3629d27 100644 --- a/doandroidlib/src/main/java/in/tosc/doandroidlib/mockapi/MockUtils.java +++ b/doandroidlib/src/main/java/in/tosc/doandroidlib/mockapi/MockUtils.java @@ -1,11 +1,8 @@ package in.tosc.doandroidlib.mockapi; -import android.text.TextUtils; - import org.apache.commons.lang3.StringUtils; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -16,8 +13,6 @@ import okhttp3.Response; import okhttp3.ResponseBody; -import static android.R.attr.path; - /** * Created by championswimmer on 15/07/17. */ diff --git a/doandroidlib/src/main/java/in/tosc/doandroidlib/objects/AccountInfo.java b/doandroidlib/src/main/java/in/tosc/doandroidlib/objects/AccountInfo.java index 810e7fc..7bb39ff 100644 --- a/doandroidlib/src/main/java/in/tosc/doandroidlib/objects/AccountInfo.java +++ b/doandroidlib/src/main/java/in/tosc/doandroidlib/objects/AccountInfo.java @@ -3,8 +3,6 @@ /** * Created by championswimmer on 14/07/17. */ -import com.google.gson.annotations.SerializedName; - import org.apache.commons.lang3.builder.ReflectionToStringBuilder; /** diff --git a/doandroidlib/src/test/java/in/tosc/doandroidlib/DigitalOceanTest.java b/doandroidlib/src/test/java/in/tosc/doandroidlib/DigitalOceanTest.java index 1306608..ee7f122 100644 --- a/doandroidlib/src/test/java/in/tosc/doandroidlib/DigitalOceanTest.java +++ b/doandroidlib/src/test/java/in/tosc/doandroidlib/DigitalOceanTest.java @@ -3,17 +3,12 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; - import java.io.IOException; -import java.util.ArrayList; -import java.util.List; import in.tosc.doandroidlib.api.DigitalOceanClient; -import in.tosc.doandroidlib.mockapi.MockResponses; -import in.tosc.doandroidlib.mockapi.MockUtils; import in.tosc.doandroidlib.objects.AccountInfo; -import okhttp3.Interceptor; + +import static org.junit.Assert.assertEquals; /** * Created by championswimmer on 15/07/17. From f2ce3c5357e32938369d9c119964aeaa43f2ff85 Mon Sep 17 00:00:00 2001 From: venomousboxer Date: Sun, 27 May 2018 12:22:16 +0530 Subject: [PATCH 2/9] solved issues of lexographical order --- .../activities/DropletActivityTest.java | 5 +++-- .../activities/DropletCreateActivityTest.java | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java index 36722a0..8bb0b03 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java @@ -7,6 +7,9 @@ import android.view.Gravity; import android.view.WindowManager; +import static in.tosc.digitaloceanapp.matchers.RecyclerViewMatcher.withRecyclerView; +import static junit.framework.Assert.assertNotNull; + import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -19,8 +22,6 @@ import static android.support.test.espresso.assertion.ViewAssertions.matches; import static android.support.test.espresso.contrib.DrawerMatchers.isClosed; import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static in.tosc.digitaloceanapp.matchers.RecyclerViewMatcher.withRecyclerView; -import static junit.framework.Assert.assertNotNull; diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java index a931d78..2845846 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java @@ -3,17 +3,17 @@ import android.support.test.rule.ActivityTestRule; import android.view.WindowManager; +import in.tosc.digitaloceanapp.R; +import static android.support.test.espresso.action.ViewActions.click; +import static junit.framework.Assert.assertNotNull; +import static android.support.test.espresso.Espresso.onView; + + import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import in.tosc.digitaloceanapp.R; - -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.click; -import static junit.framework.Assert.assertNotNull; - From 6496e3f2b3994d2a573bf97f076c29ef7c982b15 Mon Sep 17 00:00:00 2001 From: venomousboxer Date: Sun, 27 May 2018 16:29:36 +0530 Subject: [PATCH 3/9] resolving travis build errors --- .../digitaloceanapp/activities/DropletActivityTest.java | 6 +++--- .../activities/DropletCreateActivityTest.java | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java index 8bb0b03..c4370db 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java @@ -7,9 +7,6 @@ import android.view.Gravity; import android.view.WindowManager; -import static in.tosc.digitaloceanapp.matchers.RecyclerViewMatcher.withRecyclerView; -import static junit.framework.Assert.assertNotNull; - import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -22,6 +19,9 @@ import static android.support.test.espresso.assertion.ViewAssertions.matches; import static android.support.test.espresso.contrib.DrawerMatchers.isClosed; import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; +import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static in.tosc.digitaloceanapp.matchers.RecyclerViewMatcher.withRecyclerView; +import static junit.framework.Assert.assertNotNull; diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java index 2845846..2980838 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java @@ -5,6 +5,7 @@ import in.tosc.digitaloceanapp.R; import static android.support.test.espresso.action.ViewActions.click; +import static android.support.test.espresso.matcher.ViewMatchers.withId; import static junit.framework.Assert.assertNotNull; import static android.support.test.espresso.Espresso.onView; From 25da4dc7745f99a47f0003da7e2b81fde082a176 Mon Sep 17 00:00:00 2001 From: venomousboxer Date: Sun, 27 May 2018 16:35:46 +0530 Subject: [PATCH 4/9] resolving code climate errors --- .../tosc/digitaloceanapp/activities/DropletActivityTest.java | 5 +++-- .../activities/DropletCreateActivityTest.java | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java index c4370db..39f3b56 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletActivityTest.java @@ -7,6 +7,9 @@ import android.view.Gravity; import android.view.WindowManager; +import static in.tosc.digitaloceanapp.matchers.RecyclerViewMatcher.withRecyclerView; +import static junit.framework.Assert.assertNotNull; + import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -20,8 +23,6 @@ import static android.support.test.espresso.contrib.DrawerMatchers.isClosed; import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static in.tosc.digitaloceanapp.matchers.RecyclerViewMatcher.withRecyclerView; -import static junit.framework.Assert.assertNotNull; diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java index 2980838..89b4c25 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java @@ -3,12 +3,11 @@ import android.support.test.rule.ActivityTestRule; import android.view.WindowManager; -import in.tosc.digitaloceanapp.R; import static android.support.test.espresso.action.ViewActions.click; import static android.support.test.espresso.matcher.ViewMatchers.withId; -import static junit.framework.Assert.assertNotNull; +import in.tosc.digitaloceanapp.R; import static android.support.test.espresso.Espresso.onView; - +import static junit.framework.Assert.assertNotNull; import org.junit.After; import org.junit.Before; From d58e914b2588244f907eb4d71894f912123b770f Mon Sep 17 00:00:00 2001 From: venomousboxer Date: Sun, 27 May 2018 16:43:53 +0530 Subject: [PATCH 5/9] solving more errors --- .../tosc/digitaloceanapp/activities/AboutActivityTest.java | 4 ++-- .../activities/DropletCreateActivityTest.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/AboutActivityTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/AboutActivityTest.java index e6d7732..c778952 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/AboutActivityTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/AboutActivityTest.java @@ -5,13 +5,13 @@ import android.support.test.runner.AndroidJUnit4; import android.view.WindowManager; +import in.tosc.digitaloceanapp.R; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import in.tosc.digitaloceanapp.R; - import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.action.ViewActions.click; import static android.support.test.espresso.assertion.ViewAssertions.matches; diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java index 89b4c25..18f482d 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java @@ -1,12 +1,13 @@ package in.tosc.digitaloceanapp.activities; +import static android.support.test.espresso.action.ViewActions.click; +import static android.support.test.espresso.matcher.ViewMatchers.withId; + import android.support.test.rule.ActivityTestRule; import android.view.WindowManager; -import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.matcher.ViewMatchers.withId; -import in.tosc.digitaloceanapp.R; import static android.support.test.espresso.Espresso.onView; +import in.tosc.digitaloceanapp.R; import static junit.framework.Assert.assertNotNull; import org.junit.After; From 38e21e3923354129b0315e49137e4c66c6c6f80f Mon Sep 17 00:00:00 2001 From: venomousboxer Date: Sun, 27 May 2018 16:46:09 +0530 Subject: [PATCH 6/9] solving more errors --- .../digitaloceanapp/activities/DropletCreateActivityTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java index 18f482d..fcf2b97 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java @@ -2,12 +2,13 @@ import static android.support.test.espresso.action.ViewActions.click; import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static android.support.test.espresso.Espresso.onView; import android.support.test.rule.ActivityTestRule; import android.view.WindowManager; -import static android.support.test.espresso.Espresso.onView; import in.tosc.digitaloceanapp.R; + import static junit.framework.Assert.assertNotNull; import org.junit.After; From 42193b1b32fbb66e9072da6c4afd5dd673aea6af Mon Sep 17 00:00:00 2001 From: venomousboxer Date: Sun, 27 May 2018 16:47:40 +0530 Subject: [PATCH 7/9] solving more errors --- .../digitaloceanapp/activities/DropletCreateActivityTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java index fcf2b97..1d98209 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java @@ -1,8 +1,8 @@ package in.tosc.digitaloceanapp.activities; import static android.support.test.espresso.action.ViewActions.click; -import static android.support.test.espresso.matcher.ViewMatchers.withId; import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.matcher.ViewMatchers.withId; import android.support.test.rule.ActivityTestRule; import android.view.WindowManager; From f0378b230e4a3799acb0a9cc71b7019ea35928c3 Mon Sep 17 00:00:00 2001 From: venomousboxer Date: Sun, 27 May 2018 17:15:20 +0530 Subject: [PATCH 8/9] solving more errors --- .../in/tosc/digitaloceanapp/activities/AboutActivityTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/AboutActivityTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/AboutActivityTest.java index c778952..d328b76 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/AboutActivityTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/AboutActivityTest.java @@ -15,6 +15,7 @@ import static android.support.test.espresso.Espresso.onView; import static android.support.test.espresso.action.ViewActions.click; import static android.support.test.espresso.assertion.ViewAssertions.matches; +import static android.support.test.espresso.matcher.ViewMatchers.withId; import static android.support.test.espresso.matcher.ViewMatchers.withText; From 6906115d003906a057224c08aa653515cb7bf5d0 Mon Sep 17 00:00:00 2001 From: venomousboxer Date: Sun, 27 May 2018 17:17:07 +0530 Subject: [PATCH 9/9] solving more errors --- .../digitaloceanapp/activities/DropletCreateActivityTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java index 1d98209..fd1ee65 100644 --- a/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java +++ b/app/src/androidTest/java/in/tosc/digitaloceanapp/activities/DropletCreateActivityTest.java @@ -1,7 +1,7 @@ package in.tosc.digitaloceanapp.activities; -import static android.support.test.espresso.action.ViewActions.click; import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.action.ViewActions.click; import static android.support.test.espresso.matcher.ViewMatchers.withId; import android.support.test.rule.ActivityTestRule;