Update tests to use hamcrest over junit assertions
Test: Ran tests.
Change-Id: Ie2f0e2e8ccd37f3286ba9d529ac30bf4625ec672
diff --git a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/DependencyDaoTest.java b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/DependencyDaoTest.java
index 35afce4..01f6606 100644
--- a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/DependencyDaoTest.java
+++ b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/DependencyDaoTest.java
@@ -18,9 +18,12 @@
import static android.arch.background.workmanager.Work.STATUS_BLOCKED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.hasSize;
import android.arch.background.workmanager.model.Dependency;
import android.arch.background.workmanager.model.DependencyDao;
@@ -62,8 +65,8 @@
insertDependenciesWithWorkSpecs(dependencies);
List<String> resultWorkSpecIds =
mDependencyDao.getWorkSpecIdsWithSinglePrerequisite(TEST_PREREQUISITE_ID);
- assertEquals(1, resultWorkSpecIds.size());
- assertEquals(expectedWorkSpecId, resultWorkSpecIds.get(0));
+ assertThat(resultWorkSpecIds, hasSize(1));
+ assertThat(resultWorkSpecIds.get(0), is(expectedWorkSpecId));
}
@Test
@@ -84,9 +87,9 @@
insertDependenciesWithWorkSpecs(dependencies);
List<String> resultWorkSpecIds =
mDependencyDao.getWorkSpecIdsWithSinglePrerequisite(TEST_PREREQUISITE_ID);
- assertEquals(2, resultWorkSpecIds.size());
- assertEquals(expectedDep1.getWorkSpecId(), resultWorkSpecIds.get(0));
- assertEquals(expectedDep2.getWorkSpecId(), resultWorkSpecIds.get(1));
+ assertThat(resultWorkSpecIds, hasSize(2));
+ assertThat(resultWorkSpecIds,
+ containsInAnyOrder(expectedDep1.getWorkSpecId(), expectedDep2.getWorkSpecId()));
}
@Test
@@ -104,9 +107,9 @@
// test for that).
mDependencyDao.deleteDependenciesWithPrerequisite(TEST_PREREQUISITE_ID);
List<Dependency> resultDependencies = mDependencyDao.getAllDependencies();
- assertNotNull(resultDependencies);
+ assertThat(resultDependencies, is(notNullValue()));
for (Dependency dependency : resultDependencies) {
- assertNotEquals(TEST_PREREQUISITE_ID, dependency.getPrerequisiteId());
+ assertThat(dependency.getPrerequisiteId(), is(not(TEST_PREREQUISITE_ID)));
}
}
diff --git a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/ForegroundProcessorTests.java b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/ForegroundProcessorTest.java
similarity index 89%
rename from background/workmanager/src/androidTest/java/android/arch/background/workmanager/ForegroundProcessorTests.java
rename to background/workmanager/src/androidTest/java/android/arch/background/workmanager/ForegroundProcessorTest.java
index 71532af..61a125a 100644
--- a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/ForegroundProcessorTests.java
+++ b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/ForegroundProcessorTest.java
@@ -15,7 +15,8 @@
*/
package android.arch.background.workmanager;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
import android.arch.background.workmanager.foreground.ForegroundProcessor;
import android.arch.lifecycle.Lifecycle;
@@ -32,7 +33,7 @@
import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
-public class ForegroundProcessorTests {
+public class ForegroundProcessorTest {
private WorkDatabase mWorkDatabase;
private ForegroundProcessor mForegroundProcessor;
@@ -68,8 +69,7 @@
mWorkDatabase.workSpecDao().insertWorkSpec(work.getWorkSpec());
mForegroundProcessor.process(work.getId());
Thread.sleep(1000L);
- assertEquals(
- Work.STATUS_SUCCEEDED,
- mWorkDatabase.workSpecDao().getWorkSpecStatus(work.getId()));
+ assertThat(mWorkDatabase.workSpecDao().getWorkSpecStatus(work.getId()),
+ is(Work.STATUS_SUCCEEDED));
}
}
diff --git a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/SystemJobConverterTest.java b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/SystemJobConverterTest.java
index f91d754..c359c38 100644
--- a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/SystemJobConverterTest.java
+++ b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/SystemJobConverterTest.java
@@ -16,7 +16,8 @@
package android.arch.background.workmanager;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -57,8 +58,8 @@
JobInfo jobInfo = mConverter.convert(workSpec);
String actualWorkSpecId = jobInfo.getExtras().getString(
SystemJobConverter.EXTRAS_WORK_SPEC_ID);
- assertEquals(expectedWorkSpecId, actualWorkSpecId);
- assertEquals(expectedJobId, jobInfo.getId());
+ assertThat(actualWorkSpecId, is(expectedWorkSpecId));
+ assertThat(jobInfo.getId(), is(expectedJobId));
}
@Test
@@ -77,14 +78,14 @@
JobInfo jobInfo = mConverter.convert(workSpec);
int expectedNetworkType = mConverter.convertNetworkType(workSpecNetworkType);
- assertEquals(expectedNetworkType, jobInfo.getNetworkType());
- assertEquals(expectedConstraints.getInitialDelay(), jobInfo.getMinLatencyMillis());
- assertEquals(expectedConstraints.requiresCharging(), jobInfo.isRequireCharging());
- assertEquals(expectedConstraints.requiresDeviceIdle(), jobInfo.isRequireDeviceIdle());
- assertEquals(expectedConstraints.requiresBatteryNotLow(),
- jobInfo.isRequireBatteryNotLow());
- assertEquals(expectedConstraints.requiresStorageNotLow(),
- jobInfo.isRequireStorageNotLow());
+ assertThat(jobInfo.getNetworkType(), is(expectedNetworkType));
+ assertThat(jobInfo.getMinLatencyMillis(), is(expectedConstraints.getInitialDelay()));
+ assertThat(jobInfo.isRequireCharging(), is(expectedConstraints.requiresCharging()));
+ assertThat(jobInfo.isRequireDeviceIdle(), is(expectedConstraints.requiresDeviceIdle()));
+ assertThat(
+ jobInfo.isRequireBatteryNotLow(), is(expectedConstraints.requiresBatteryNotLow()));
+ assertThat(
+ jobInfo.isRequireStorageNotLow(), is(expectedConstraints.requiresStorageNotLow()));
}
@Test
@@ -117,6 +118,6 @@
private void convertNetworkTypeHelper(@Constraints.NetworkType int constraintNetworkType,
int expectedJobInfoNetworkType) {
int convertedNetworkType = mConverter.convertNetworkType(constraintNetworkType);
- assertEquals(expectedJobInfoNetworkType, convertedNetworkType);
+ assertThat(convertedNetworkType, is(expectedJobInfoNetworkType));
}
}
diff --git a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/SystemJobProcessorTests.java b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/SystemJobProcessorTest.java
similarity index 88%
rename from background/workmanager/src/androidTest/java/android/arch/background/workmanager/SystemJobProcessorTests.java
rename to background/workmanager/src/androidTest/java/android/arch/background/workmanager/SystemJobProcessorTest.java
index 3337600..baf0900 100644
--- a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/SystemJobProcessorTests.java
+++ b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/SystemJobProcessorTest.java
@@ -15,7 +15,8 @@
*/
package android.arch.background.workmanager;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import android.arch.background.workmanager.systemjob.SystemJobProcessor;
import android.content.Context;
@@ -30,7 +31,7 @@
import org.mockito.Mockito;
@RunWith(AndroidJUnit4.class)
-public class SystemJobProcessorTests {
+public class SystemJobProcessorTest {
private WorkDatabase mWorkDatabase;
private ExecutionListener mMockListener;
@@ -58,8 +59,7 @@
mSystemJobProcessor.process(work.getId());
Thread.sleep(1000L);
Mockito.verify(mMockListener).onExecuted(work.getId(), WorkerWrapper.RESULT_SUCCEEDED);
- assertEquals(
- Work.STATUS_SUCCEEDED,
- mWorkDatabase.workSpecDao().getWorkSpecStatus(work.getId()));
+ assertThat(mWorkDatabase.workSpecDao().getWorkSpecStatus(work.getId()),
+ is(Work.STATUS_SUCCEEDED));
}
}
diff --git a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/WorkManagerTest.java b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/WorkManagerTest.java
index ddd4f39..92b3ff7 100644
--- a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/WorkManagerTest.java
+++ b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/WorkManagerTest.java
@@ -16,10 +16,9 @@
package android.arch.background.workmanager;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import android.arch.background.workmanager.model.Arguments;
import android.arch.background.workmanager.model.Constraints;
@@ -68,11 +67,11 @@
for (int i = 0; i < workCount; ++i) {
String id = workArray[i].getId();
- assertNotNull(mDatabase.workSpecDao().getWorkSpec(id));
- assertEquals(
+ assertThat(mDatabase.workSpecDao().getWorkSpec(id), is(notNullValue()));
+ assertThat(
"index " + i + " does not have expected number of dependencies!",
mDatabase.dependencyDao().hasDependencies(id),
- (i > 0));
+ is(i > 0));
}
}
@@ -97,22 +96,22 @@
WorkSpec workSpec1 = mDatabase.workSpecDao().getWorkSpec(work1.getId());
Constraints constraints = workSpec0.getConstraints();
- assertNotNull(constraints);
- assertTrue(constraints.requiresCharging());
- assertTrue(constraints.requiresDeviceIdle());
- assertTrue(constraints.requiresBatteryNotLow());
- assertTrue(constraints.requiresStorageNotLow());
- assertEquals(5000, constraints.getInitialDelay());
- assertEquals(Constraints.NETWORK_TYPE_METERED, constraints.getRequiredNetworkType());
+ assertThat(constraints, is(notNullValue()));
+ assertThat(constraints.requiresCharging(), is(true));
+ assertThat(constraints.requiresDeviceIdle(), is(true));
+ assertThat(constraints.requiresBatteryNotLow(), is(true));
+ assertThat(constraints.requiresStorageNotLow(), is(true));
+ assertThat(constraints.getInitialDelay(), is(5000L));
+ assertThat(constraints.getRequiredNetworkType(), is(Constraints.NETWORK_TYPE_METERED));
constraints = workSpec1.getConstraints();
- assertNotNull(constraints);
- assertFalse(constraints.requiresCharging());
- assertFalse(constraints.requiresDeviceIdle());
- assertFalse(constraints.requiresBatteryNotLow());
- assertFalse(constraints.requiresStorageNotLow());
- assertEquals(0, constraints.getInitialDelay());
- assertEquals(Constraints.NETWORK_TYPE_NONE, constraints.getRequiredNetworkType());
+ assertThat(constraints, is(notNullValue()));
+ assertThat(constraints.requiresCharging(), is(false));
+ assertThat(constraints.requiresDeviceIdle(), is(false));
+ assertThat(constraints.requiresBatteryNotLow(), is(false));
+ assertThat(constraints.requiresStorageNotLow(), is(false));
+ assertThat(constraints.getInitialDelay(), is(0L));
+ assertThat(constraints.getRequiredNetworkType(), is(Constraints.NETWORK_TYPE_NONE));
}
@Test
@@ -127,11 +126,11 @@
WorkSpec workSpec0 = mDatabase.workSpecDao().getWorkSpec(work0.getId());
WorkSpec workSpec1 = mDatabase.workSpecDao().getWorkSpec(work1.getId());
- assertEquals(Work.BACKOFF_POLICY_LINEAR, workSpec0.getBackoffPolicy());
- assertEquals(50000, workSpec0.getBackoffDelayDuration());
+ assertThat(workSpec0.getBackoffPolicy(), is(Work.BACKOFF_POLICY_LINEAR));
+ assertThat(workSpec0.getBackoffDelayDuration(), is(50000L));
- assertEquals(Work.BACKOFF_POLICY_EXPONENTIAL, workSpec1.getBackoffPolicy());
- assertEquals(Work.DEFAULT_BACKOFF_DELAY_DURATION, workSpec1.getBackoffDelayDuration());
+ assertThat(workSpec1.getBackoffPolicy(), is(Work.BACKOFF_POLICY_EXPONENTIAL));
+ assertThat(workSpec1.getBackoffDelayDuration(), is(Work.DEFAULT_BACKOFF_DELAY_DURATION));
}
@Test
@@ -152,15 +151,15 @@
WorkSpec workSpec0 = mDatabase.workSpecDao().getWorkSpec(work0.getId());
WorkSpec workSpec1 = mDatabase.workSpecDao().getWorkSpec(work1.getId());
- assertNotNull(workSpec0.getArguments());
- assertNotNull(workSpec1.getArguments());
+ assertThat(workSpec0.getArguments(), is(notNullValue()));
+ assertThat(workSpec1.getArguments(), is(notNullValue()));
- assertEquals(1, workSpec0.getArguments().size());
- assertEquals(0, workSpec1.getArguments().size());
+ assertThat(workSpec0.getArguments().size(), is(1));
+ assertThat(workSpec1.getArguments().size(), is(0));
String actualValue = workSpec0.getArguments().getString(key, null);
- assertNotNull(actualValue);
- assertEquals(expectedValue, actualValue);
+ assertThat(actualValue, is(notNullValue()));
+ assertThat(actualValue, is(expectedValue));
}
@Test
@@ -172,12 +171,12 @@
workSpec.setStatus(Work.STATUS_RUNNING);
workSpecDao.insertWorkSpec(work.getWorkSpec());
- assertEquals(workSpecDao.getWorkSpec(work.getId()).getStatus(), Work.STATUS_RUNNING);
+ assertThat(workSpecDao.getWorkSpec(work.getId()).getStatus(), is(Work.STATUS_RUNNING));
SupportSQLiteOpenHelper openHelper = mDatabase.getOpenHelper();
SupportSQLiteDatabase db = openHelper.getWritableDatabase();
WorkDatabase.generateCleanupCallback().onOpen(db);
- assertEquals(workSpecDao.getWorkSpec(work.getId()).getStatus(), Work.STATUS_ENQUEUED);
+ assertThat(workSpecDao.getWorkSpec(work.getId()).getStatus(), is(Work.STATUS_ENQUEUED));
}
}
diff --git a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/WorkerTests.java b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/WorkerTests.java
index 8fdfde9..3be4345 100644
--- a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/WorkerTests.java
+++ b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/WorkerTests.java
@@ -16,9 +16,10 @@
package android.arch.background.workmanager;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import android.arch.background.workmanager.model.Arguments;
import android.content.Context;
@@ -45,8 +46,8 @@
Work work = new Work.Builder(TestWorker.class).build();
Worker worker = Worker.fromWorkSpec(mContext, work.getWorkSpec());
- assertNotNull(worker);
- assertEquals(mContext.getApplicationContext(), worker.getAppContext());
+ assertThat(worker, is(notNullValue()));
+ assertThat(worker.getAppContext(), is(equalTo(mContext.getApplicationContext())));
}
@Test
@@ -59,15 +60,13 @@
Work work = new Work.Builder(TestWorker.class).withArguments(arguments).build();
Worker worker = Worker.fromWorkSpec(mContext, work.getWorkSpec());
- assertNotNull(worker);
- assertNotNull(worker.getArguments());
- assertEquals(expectedValue, worker.getArguments().getString(key, null));
+ assertThat(worker, is(notNullValue()));
+ assertThat(worker.getArguments().getString(key, null), is(expectedValue));
work = new Work.Builder(TestWorker.class).build();
worker = Worker.fromWorkSpec(mContext, work.getWorkSpec());
- assertNotNull(worker);
- assertNotNull(worker.getArguments());
- assertTrue(worker.getArguments().isEmpty());
+ assertThat(worker, is(notNullValue()));
+ assertThat(worker.getArguments().isEmpty(), is(true));
}
}
diff --git a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/WorkerWrapperTests.java b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/WorkerWrapperTest.java
similarity index 86%
rename from background/workmanager/src/androidTest/java/android/arch/background/workmanager/WorkerWrapperTests.java
rename to background/workmanager/src/androidTest/java/android/arch/background/workmanager/WorkerWrapperTest.java
index e75d237..1fa0da74 100644
--- a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/WorkerWrapperTests.java
+++ b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/WorkerWrapperTest.java
@@ -20,9 +20,8 @@
import static android.arch.background.workmanager.Work.STATUS_ENQUEUED;
import static android.arch.background.workmanager.Work.STATUS_SUCCEEDED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
@@ -46,7 +45,7 @@
@RunWith(AndroidJUnit4.class)
@SmallTest
-public class WorkerWrapperTests {
+public class WorkerWrapperTest {
private static final long LISTENER_SLEEP_DURATION = 2000;
private WorkDatabase mDatabase;
private WorkSpecDao mWorkSpecDao;
@@ -78,7 +77,7 @@
.run();
Thread.sleep(LISTENER_SLEEP_DURATION);
Mockito.verify(mMockListener).onExecuted(work.getId(), WorkerWrapper.RESULT_SUCCEEDED);
- assertEquals(Work.STATUS_SUCCEEDED, mWorkSpecDao.getWorkSpecStatus(work.getId()));
+ assertThat(mWorkSpecDao.getWorkSpecStatus(work.getId()), is(Work.STATUS_SUCCEEDED));
}
@Test
@@ -119,7 +118,7 @@
Thread.sleep(LISTENER_SLEEP_DURATION);
Mockito.verify(mMockListener)
.onExecuted(work.getId(), WorkerWrapper.RESULT_PERMANENT_ERROR);
- assertEquals(Work.STATUS_FAILED, mWorkSpecDao.getWorkSpecStatus(work.getId()));
+ assertThat(mWorkSpecDao.getWorkSpecStatus(work.getId()), is(Work.STATUS_FAILED));
}
@Test
@@ -132,7 +131,7 @@
.run();
Thread.sleep(LISTENER_SLEEP_DURATION);
Mockito.verify(mMockListener).onExecuted(work.getId(), WorkerWrapper.RESULT_FAILED);
- assertEquals(Work.STATUS_FAILED, mWorkSpecDao.getWorkSpecStatus(work.getId()));
+ assertThat(mWorkSpecDao.getWorkSpecStatus(work.getId()), is(Work.STATUS_FAILED));
}
@Test
@@ -144,7 +143,7 @@
.build();
Executors.newSingleThreadExecutor().submit(wrapper);
Thread.sleep(LISTENER_SLEEP_DURATION);
- assertEquals(Work.STATUS_RUNNING, mWorkSpecDao.getWorkSpecStatus(work.getId()));
+ assertThat(mWorkSpecDao.getWorkSpecStatus(work.getId()), is(Work.STATUS_RUNNING));
Thread.sleep(SleepTestWorker.SLEEP_DURATION);
Mockito.verify(mMockListener).onExecuted(work.getId(), WorkerWrapper.RESULT_SUCCEEDED);
}
@@ -165,18 +164,18 @@
mDatabase.endTransaction();
}
- assertEquals(STATUS_ENQUEUED, mWorkSpecDao.getWorkSpecStatus(prerequisiteWork.getId()));
- assertEquals(STATUS_BLOCKED, mWorkSpecDao.getWorkSpecStatus(work.getId()));
- assertTrue(mDependencyDao.hasDependencies(work.getId()));
+ assertThat(mWorkSpecDao.getWorkSpecStatus(prerequisiteWork.getId()), is(STATUS_ENQUEUED));
+ assertThat(mWorkSpecDao.getWorkSpecStatus(work.getId()), is(STATUS_BLOCKED));
+ assertThat(mDependencyDao.hasDependencies(work.getId()), is(true));
new WorkerWrapper.Builder(mContext, mDatabase, prerequisiteWork.getId())
.withListener(mMockListener)
.build()
.run();
- assertEquals(STATUS_SUCCEEDED, mWorkSpecDao.getWorkSpecStatus(prerequisiteWork.getId()));
- assertEquals(STATUS_ENQUEUED, mWorkSpecDao.getWorkSpecStatus(work.getId()));
- assertFalse(mDependencyDao.hasDependencies(work.getId()));
+ assertThat(mWorkSpecDao.getWorkSpecStatus(prerequisiteWork.getId()), is(STATUS_SUCCEEDED));
+ assertThat(mWorkSpecDao.getWorkSpecStatus(work.getId()), is(STATUS_ENQUEUED));
+ assertThat(mDependencyDao.hasDependencies(work.getId()), is(false));
}
@Test
@@ -205,7 +204,7 @@
Thread.sleep(LISTENER_SLEEP_DURATION);
Mockito.verify(mMockListener).onExecuted(work.getId(), WorkerWrapper.RESULT_RESCHEDULED);
- assertEquals(Work.STATUS_ENQUEUED, mWorkSpecDao.getWorkSpecStatus(work.getId()));
+ assertThat(mWorkSpecDao.getWorkSpecStatus(work.getId()), is(Work.STATUS_ENQUEUED));
doReturn(true).when(mockChecker).areAllConstraintsMet(any(WorkSpec.class));
@@ -217,6 +216,6 @@
Thread.sleep(LISTENER_SLEEP_DURATION);
Mockito.verify(mMockListener).onExecuted(work.getId(), WorkerWrapper.RESULT_SUCCEEDED);
- assertEquals(Work.STATUS_SUCCEEDED, mWorkSpecDao.getWorkSpecStatus(work.getId()));
+ assertThat(mWorkSpecDao.getWorkSpecStatus(work.getId()), is(Work.STATUS_SUCCEEDED));
}
}
diff --git a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/systemjob/SystemJobIdGeneratorTest.java b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/systemjob/SystemJobIdGeneratorTest.java
index 28bc090..ae3a249 100644
--- a/background/workmanager/src/androidTest/java/android/arch/background/workmanager/systemjob/SystemJobIdGeneratorTest.java
+++ b/background/workmanager/src/androidTest/java/android/arch/background/workmanager/systemjob/SystemJobIdGeneratorTest.java
@@ -16,7 +16,8 @@
package android.arch.background.workmanager.systemjob;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
@@ -52,22 +53,22 @@
@Test
public void testNextId_returnsInitialIdWhenNoStoredNextId() {
- assertEquals(SystemJobIdGenerator.INITIAL_ID, mIdGenerator.nextId());
+ assertThat(mIdGenerator.nextId(), is(SystemJobIdGenerator.INITIAL_ID));
}
@Test
public void testNextId_returnsStoredNextId() {
int expectedId = 100;
storeNextIdInSharedPrefs(expectedId);
- assertEquals(expectedId, mIdGenerator.nextId());
+ assertThat(mIdGenerator.nextId(), is(expectedId));
}
@Test
public void testNextId_returnsInitialIdAfterReturningMaxInteger() {
int expectedId = Integer.MAX_VALUE;
storeNextIdInSharedPrefs(expectedId);
- assertEquals(expectedId, mIdGenerator.nextId());
- assertEquals(SystemJobIdGenerator.INITIAL_ID, mIdGenerator.nextId());
+ assertThat(mIdGenerator.nextId(), is(expectedId));
+ assertThat(mIdGenerator.nextId(), is(SystemJobIdGenerator.INITIAL_ID));
}
/**
diff --git a/background/workmanager/src/test/java/android/arch/background/workmanager/ArgumentsTest.java b/background/workmanager/src/test/java/android/arch/background/workmanager/ArgumentsTest.java
index 14919a3..63b4551 100644
--- a/background/workmanager/src/test/java/android/arch/background/workmanager/ArgumentsTest.java
+++ b/background/workmanager/src/test/java/android/arch/background/workmanager/ArgumentsTest.java
@@ -16,9 +16,10 @@
package android.arch.background.workmanager;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import android.arch.background.workmanager.model.Arguments;
import android.test.suitebuilder.annotation.SmallTest;
@@ -39,8 +40,8 @@
byte[] byteArray = Arguments.toByteArray(args);
Arguments restoredArgs = Arguments.fromByteArray(byteArray);
- assertNotNull(restoredArgs);
- assertEquals(0, restoredArgs.size());
+ assertThat(restoredArgs, is(notNullValue()));
+ assertThat(restoredArgs.size(), is(0));
}
@Test
@@ -54,16 +55,16 @@
byte[] byteArray = Arguments.toByteArray(args);
Arguments restoredArgs = Arguments.fromByteArray(byteArray);
- assertNotNull(restoredArgs);
- assertEquals(2, restoredArgs.size());
+ assertThat(restoredArgs, is(notNullValue()));
+ assertThat(restoredArgs.size(), is(2));
String actualValue1 = restoredArgs.getString(KEY1, null);
- assertNotNull(actualValue1);
- assertEquals(expectedValue1, actualValue1);
+ assertThat(actualValue1, is(notNullValue()));
+ assertThat(actualValue1, is(expectedValue1));
String actualValue2 = restoredArgs.getString(KEY2, null);
- assertNotNull(actualValue2);
- assertEquals(expectedValue2, actualValue2);
+ assertThat(actualValue2, is(notNullValue()));
+ assertThat(actualValue2, is(expectedValue2));
}
@Test
@@ -77,13 +78,13 @@
byte[] byteArray = Arguments.toByteArray(args);
Arguments restoredArgs = Arguments.fromByteArray(byteArray);
- assertNotNull(restoredArgs);
- assertEquals(2, restoredArgs.size());
+ assertThat(restoredArgs, is(notNullValue()));
+ assertThat(restoredArgs.size(), is(2));
int[] actualValue1 = restoredArgs.getIntArray(KEY1);
- assertArrayEquals(expectedValue1, actualValue1);
+ assertThat(actualValue1, is(equalTo(expectedValue1)));
int[] actualValue2 = restoredArgs.getIntArray(KEY2);
- assertArrayEquals(expectedValue2, actualValue2);
+ assertThat(actualValue2, is(equalTo(expectedValue2)));
}
}
