Test cases pass now with the navbar

This commit is contained in:
DjBushido 2014-07-05 15:59:34 -04:00
parent 46f8e625c2
commit 60185c934a
4 changed files with 8 additions and 12 deletions

View File

@ -4,7 +4,6 @@ env:
- ANDROID_SDKS=android-19,sysimg-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
before_install:
- echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null
- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
- emulator -avd test -no-skin -no-audio -no-window &

View File

@ -48,7 +48,6 @@ android {
}
dependencies {
compile 'com.squareup.dagger:dagger:1.2.1'
provided 'com.squareup.dagger:dagger-compiler:1.2.1'

View File

@ -1,26 +1,24 @@
package org.bspeice.minimalbible;
import android.content.Intent;
import android.test.ActivityInstrumentationTestCase2;
import android.test.ActivityUnitTestCase;
import android.util.Log;
/**
* Created by Bradlee Speice on 7/5/2014.
*/
public class DownloadActivityTest extends ActivityUnitTestCase<DownloadActivity> {
/* Please note that it is necessary to extend the ActivityInstrumentationTestCase2 if you plan
on using an activity that sets up any underlying fragments (includes navigation drawers).
The ActivityUnitTestCase doesn't set up enough of the Activity lifecycle.
*/
public class DownloadActivityTest extends ActivityInstrumentationTestCase2<DownloadActivity> {
public DownloadActivityTest() {
super(DownloadActivity.class);
}
public void testAndroidTestInjection() {
MinimalBible m = new MinimalBible();
m.buildObjGraph();
setApplication(m);
startActivity(new Intent(getInstrumentation().getTargetContext(),
DownloadActivity.class), null, null);
DownloadActivity a = getActivity();
assertNotNull(a);

View File

@ -4,6 +4,7 @@ import android.app.Activity;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarActivity;
import android.util.Log;
@ -45,12 +46,11 @@ public class DownloadActivity extends ActionBarActivity
mTitle = getTitle();
Log.w("DownloadActivity", "Title: " + mTitle.toString());
/*
// Set up the drawer.
mNavigationDrawerFragment.setUp(
R.id.navigation_drawer,
(DrawerLayout) findViewById(R.id.drawer_layout));
*/
}
@Override