wbrawner/PassAndroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fest -> assertJ

Browse source
This commit is contained in:
ligi 2014-09-05 00:24:50 +02:00
parent 7c28ac759c
commit b11ad795ca
6 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
build.gradle
View file

@ -49,6 +49,14 @@ android {
}
}
// needed for assertJ
packagingOptions {
exclude 'asm-license.txt'
exclude 'LICENSE'
exclude 'NOTICE'
}
// https://groups.google.com/forum/#!topic/adt-dev/-Km7VgExKf4
useOldManifestMerger true
}
@ -65,7 +73,8 @@ dependencies {
}
androidTestCompile 'com.squareup.spoon:spoon-client:1.1.1'
androidTestCompile 'com.squareup:fest-android:1.0.8'
androidTestCompile 'com.squareup.assertj:assertj-android:1.0.0'
androidTestCompile 'org.mockito:mockito-core:1.9.5'
androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.0'

2
src/androidTest/java/org/ligi/passandroid/TheBarcodeHelper.java
View file

@ -9,7 +9,7 @@ import com.google.zxing.common.BitMatrix;
import org.ligi.passandroid.helper.BarcodeHelper;
import static org.fest.assertions.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
public class TheBarcodeHelper extends BaseTest {

2
src/androidTest/java/org/ligi/passandroid/TheCategoryHelper.java
View file

@ -9,7 +9,7 @@ import org.ligi.passandroid.model.Pass;
import java.util.HashSet;
import java.util.Set;
import static org.fest.assertions.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
public class TheCategoryHelper extends BaseTest {

2
src/androidTest/java/org/ligi/passandroid/TheFullscreenBarcodeActivity.java
View file

@ -22,7 +22,7 @@ import static com.google.android.apps.common.testing.ui.espresso.Espresso.onView
import static com.google.android.apps.common.testing.ui.espresso.assertion.ViewAssertions.matches;
import static com.google.android.apps.common.testing.ui.espresso.matcher.ViewMatchers.isDisplayed;
import static com.google.android.apps.common.testing.ui.espresso.matcher.ViewMatchers.withId;
import static org.fest.assertions.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
public class TheFullscreenBarcodeActivity extends BaseIntegration<FullscreenBarcodeActivity> {

2
src/androidTest/java/org/ligi/passandroid/ThePastLocationsStore.java
View file

@ -5,7 +5,7 @@ import android.test.suitebuilder.annotation.SmallTest;
import org.ligi.passandroid.model.PastLocationsStore;
import static org.fest.assertions.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
public class ThePastLocationsStore extends BaseIntegration<Activity> {

2
src/androidTest/java/org/ligi/passandroid/TheQuirkCorrector.java
View file

@ -4,7 +4,7 @@ import android.test.suitebuilder.annotation.SmallTest;
import org.ligi.passandroid.model.Pass;
import static org.fest.assertions.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
public class TheQuirkCorrector extends TheAppleStyleBarcodeReaderBase {