Made cosmetic updates to the tests to keep the linter happy

wdullaer · Oct 5, 2019 · e719d6e · e719d6e
1 parent 354f22f
commit e719d6e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 20 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -37,6 +37,7 @@ dependencies {
     testImplementation 'com.pholser:junit-quickcheck-core:0.7'
     testImplementation 'com.pholser:junit-quickcheck-generators:0.7'
 
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test:rules:1.2.0'
 }

diff --git a/...ndroidTest/java/com/wdullaer/materialdatetimepicker/date/DefaultDateRangeLimiterTest.java b/...ndroidTest/java/com/wdullaer/materialdatetimepicker/date/DefaultDateRangeLimiterTest.java
@@ -1,7 +1,7 @@
 package com.wdullaer.materialdatetimepicker.date;
 
 import android.os.Parcel;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/...ndroidTest/java/com/wdullaer/materialdatetimepicker/time/DefaultTimepointLimiterTest.java b/...ndroidTest/java/com/wdullaer/materialdatetimepicker/time/DefaultTimepointLimiterTest.java
@@ -1,7 +1,7 @@
 package com.wdullaer.materialdatetimepicker.time;
 
 import android.os.Parcel;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/library/src/androidTest/java/com/wdullaer/materialdatetimepicker/time/TimepointTest.java b/library/src/androidTest/java/com/wdullaer/materialdatetimepicker/time/TimepointTest.java
@@ -1,7 +1,7 @@
 package com.wdullaer.materialdatetimepicker.time;
 
 import android.os.Parcel;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import static org.junit.Assert.*;
 import org.junit.Test;

diff --git a/library/src/test/java/com/wdullaer/materialdatetimepicker/date/DatePickerDialogTest.java b/library/src/test/java/com/wdullaer/materialdatetimepicker/date/DatePickerDialogTest.java
@@ -10,22 +10,16 @@ public class DatePickerDialogTest {
     // isHighlighted
     @Test
     public void isHighlightedShouldReturnFalseIfNoHighlightedDaysAreSet() {
-        DatePickerDialog dpd = DatePickerDialog.newInstance(new DatePickerDialog.OnDateSetListener() {
-            @Override
-            public void onDateSet(DatePickerDialog view, int year, int monthOfYear, int dayOfMonth) {
+        DatePickerDialog dpd = DatePickerDialog.newInstance((view, year, monthOfYear, dayOfMonth) -> {
 
-            }
         });
         Assert.assertFalse(dpd.isHighlighted(1990, 1, 1));
     }
 
     @Test
     public void isHighlightedShouldReturnFalseIfHighlightedDoesNotContainSelection() {
-        DatePickerDialog dpd = DatePickerDialog.newInstance(new DatePickerDialog.OnDateSetListener() {
-            @Override
-            public void onDateSet(DatePickerDialog view, int year, int monthOfYear, int dayOfMonth) {
+        DatePickerDialog dpd = DatePickerDialog.newInstance((view, year, monthOfYear, dayOfMonth) -> {
 
-            }
         });
         Calendar highlighted = Calendar.getInstance();
         highlighted.set(Calendar.YEAR, 1990);
@@ -41,11 +35,8 @@ public void onDateSet(DatePickerDialog view, int year, int monthOfYear, int dayO
 
     @Test
     public void isHighlightedShouldReturnTrueIfHighlightedDoesContainSelection() {
-        DatePickerDialog dpd = DatePickerDialog.newInstance(new DatePickerDialog.OnDateSetListener() {
-            @Override
-            public void onDateSet(DatePickerDialog view, int year, int monthOfYear, int dayOfMonth) {
+        DatePickerDialog dpd = DatePickerDialog.newInstance((view, year, monthOfYear, dayOfMonth) -> {
 
-            }
         });
         int year = 1990;
         int month = 1;
@@ -67,11 +58,8 @@ public void onDateSet(DatePickerDialog view, int year, int monthOfYear, int dayO
     public void isHighlightedShouldBehaveCorrectlyInCustomTimezones() {
         String timeZoneString = "Americas/Los_Angeles";
         Calendar initial = Calendar.getInstance(TimeZone.getTimeZone(timeZoneString));
-        DatePickerDialog dpd = DatePickerDialog.newInstance(new DatePickerDialog.OnDateSetListener() {
-            @Override
-            public void onDateSet(DatePickerDialog view, int year, int monthOfYear, int dayOfMonth) {
+        DatePickerDialog dpd = DatePickerDialog.newInstance((view, year, monthOfYear, dayOfMonth) -> {
 
-            }
         }, initial);
         int year = 1990;
         int month = 1;

diff --git a/library/src/test/java/com/wdullaer/materialdatetimepicker/time/TimepointTest.java b/library/src/test/java/com/wdullaer/materialdatetimepicker/time/TimepointTest.java
@@ -59,7 +59,7 @@ public void compareToShouldReturnPositiveIfArgumentIsSmaller() {
     public void compareToShouldReturnZeroIfArgumentIsEqual() {
         Timepoint orig = new Timepoint(12, 11, 10);
         Timepoint arg = new Timepoint(12, 11, 10);
-        Assert.assertTrue(orig.compareTo(arg) == 0);
+        Assert.assertEquals(0, orig.compareTo(arg));
     }
 
     @Test