Merge branch 'develop' into passcode

Author: aint

.travis.yml

@@ -1,5 +1,6 @@
 language: android
 jdk: oraclejdk7
+env: _JAVA_OPTIONS="-Xmx768m -Xms768m"
 android:
   components:
     - platform-tools
@@ -14,18 +15,17 @@ android:
     - extra-google-google_play_services
     - extra-google-m2repository
     - extra-android-m2repository
-    #- addon-google_apis-google-19
+    - addon-google_apis-google-19
 
     # Specify at least one system image,
     # if you need to run emulator(s) during your tests
     - sys-img-armeabi-v7a-android-19
 
-before_install:
-  #- echo yes | android update sdk --all --filter build-tools-22.0.1 --no-ui --force > /dev/null
-
 # Emulator Management: Create, Start and Wait
 before_script:
+  - mkdir sdcard
+  - mksdcard -l gnucash-sdcard 64M sdcard/gnucash-sdcard.img
   - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a
-  - emulator -avd test -no-skin -no-audio -no-window &
+  - emulator -avd test -no-skin -no-audio -no-window -no-boot-anim -sdcard sdcard/gnucash-sdcard.img &
   - android-wait-for-emulator
   - adb shell input keyevent 82 &    

README.md

@@ -1,4 +1,4 @@
-<a href="https://travis-ci.org/codinguser/gnucash-android">
+<a href="https://travis-ci.org/codinguser/gnucash-android" target="_blank">
 <img src="https://travis-ci.org/codinguser/gnucash-android.svg?branch=develop" alt="Travis build status" />
 </a>
 

app/build.gradle

@@ -6,10 +6,10 @@ apply plugin: 'crashlytics'
 def versionMajor = 1
 def versionMinor = 6
 def versionPatch = 0
-def versionBuild = 3
+def versionBuild = 4
 
 def buildTime() {
-    def df = new SimpleDateFormat("yyyyMMdd_HHmm'UTC'")
+    def df = new SimpleDateFormat("yyyyMMdd")
     df.setTimeZone(TimeZone.getTimeZone("UTC"))
     return df.format(new Date())
 }
@@ -24,12 +24,14 @@ android {
     buildToolsVersion "22.0.1"
     defaultConfig {
         applicationId "org.gnucash.android"
+        testApplicationId 'org.gnucash.android.test'
         minSdkVersion 10
         targetSdkVersion 19
         versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild
         versionName "${versionMajor}.${versionMinor}.${versionPatch}"
         resValue "string", "app_version_name", "${versionName}"
         resValue "string", "app_minor_version", "${versionMinor}"
+        buildConfigField "boolean", "USE_CRASHLYTICS", "false"
         if (project.hasProperty("RELEASE_DROPBOX_APP_KEY")){
             resValue "string", "dropbox_app_key", RELEASE_DROPBOX_APP_KEY
             resValue "string", "dropbox_app_secret", RELEASE_DROPBOX_APP_SECRET
@@ -69,11 +71,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             if (project.hasProperty("RELEASE_STORE_FILE")){
                 signingConfig signingConfigs.release
+            } else {
+                signingConfig signingConfigs.debug
             }
         }
         debug {
             debuggable true
-            ext.enableCrashlytics = false
+            signingConfig signingConfigs.debug
         }
     }
     lintOptions {
@@ -83,7 +87,7 @@ android {
     productFlavors {
         development {
             applicationId 'org.gnucash.android.devel'
-            testApplicationId 'org.gnucash.android.test.devel'
+            testApplicationId 'org.gnucash.android.devel.test'
             resValue "string", "app_name", "GnuCash-devel"
             versionName "${versionMajor}.${versionMinor}.${versionPatch}-dev${versionBuild}_${buildTime()}"
             resValue "string", "app_version_name", "${versionName}"
@@ -93,11 +97,11 @@ android {
             resValue "string", "app_name", "GnuCash - beta"
             versionName "${versionMajor}.${versionMinor}.${versionPatch}-beta${versionBuild}_r${gitSha()}"
             resValue "string", "app_version_name", "${versionName}"
+            buildConfigField "boolean", "USE_CRASHLYTICS", "true"
         }
 
         production {
             resValue "string", "app_name", "GnuCash"
-            ext.enableCrashlytics = false //TODO: enable for production builds
         }
 
     }

app/src/androidTest/java/org/gnucash/android/test/ui/AccountsActivityTest.java

@@ -27,7 +27,9 @@
 import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
+
 import com.robotium.solo.Solo;
+
 import org.gnucash.android.R;
 import org.gnucash.android.db.AccountsDbAdapter;
 import org.gnucash.android.db.DatabaseHelper;
@@ -37,7 +39,6 @@
 import org.gnucash.android.model.Money;
 import org.gnucash.android.model.Split;
 import org.gnucash.android.model.Transaction;
-import org.gnucash.android.test.util.ActionBarUtils;
 import org.gnucash.android.ui.account.AccountsActivity;
 import org.gnucash.android.ui.account.AccountsListFragment;
 
@@ -64,10 +65,7 @@ public AccountsActivityTest() {
 
 	protected void setUp() throws Exception {
 		Context context = getInstrumentation().getTargetContext();
-		Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-		editor.putBoolean(context.getString(R.string.key_first_run), false);
-        editor.putInt(AccountsActivity.LAST_OPEN_TAB_INDEX, AccountsActivity.INDEX_TOP_LEVEL_ACCOUNTS_FRAGMENT);
-		editor.commit();
+        preventFirstRunDialogs(context);
 
         mDbHelper = new DatabaseHelper(context);
         try {
@@ -86,32 +84,40 @@ protected void setUp() throws Exception {
         account.setUID(DUMMY_ACCOUNT_UID);
 		account.setCurrency(Currency.getInstance(DUMMY_ACCOUNT_CURRENCY_CODE));
 		mAccountsDbAdapter.addAccount(account);
-
-        //the What's new dialog is usually displayed on first run
-        String dismissDialog = getActivity().getString(R.string.label_dismiss);
-        if (mSolo.waitForText(dismissDialog,1,1000)){
-            mSolo.clickOnText(dismissDialog);
-        }
 	}
 
-/*
-	public void testDisplayAccountsList(){
-        final int NUMBER_OF_ACCOUNTS = 15;
-        for (int i = 0; i < NUMBER_OF_ACCOUNTS; i++) {
-            Account account = new Account("Acct " + i);
-            mAccountsDbAdapter.addAccount(account);
-        }
+    public static void preventFirstRunDialogs(Context context) {
+        Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
 
-        //there should exist a listview of accounts
-        refreshAccountsList();
-        mSolo.waitForText("Acct");
-        mSolo.scrollToBottom();
+        //do not show first run dialog
+        editor.putBoolean(context.getString(R.string.key_first_run), false);
+        editor.putInt(AccountsActivity.LAST_OPEN_TAB_INDEX, AccountsActivity.INDEX_TOP_LEVEL_ACCOUNTS_FRAGMENT);
 
-        ListView accountsListView = (ListView) mSolo.getView(android.R.id.list);
-		assertNotNull(accountsListView);
-        assertEquals(NUMBER_OF_ACCOUNTS + 1, accountsListView.getCount());
-	}
-*/
+        //do not show "What's new" dialog
+        String minorVersion = context.getString(R.string.app_minor_version);
+        int currentMinor = Integer.parseInt(minorVersion);
+        editor.putInt(context.getString(R.string.key_previous_minor_version), currentMinor);
+        editor.commit();
+    }
+
+    /*
+        public void testDisplayAccountsList(){
+            final int NUMBER_OF_ACCOUNTS = 15;
+            for (int i = 0; i < NUMBER_OF_ACCOUNTS; i++) {
+                Account account = new Account("Acct " + i);
+                mAccountsDbAdapter.addAccount(account);
+            }
+
+            //there should exist a listview of accounts
+            refreshAccountsList();
+            mSolo.waitForText("Acct");
+            mSolo.scrollToBottom();
+
+            ListView accountsListView = (ListView) mSolo.getView(android.R.id.list);
+            assertNotNull(accountsListView);
+            assertEquals(NUMBER_OF_ACCOUNTS + 1, accountsListView.getCount());
+        }
+    */
     public void testSearchAccounts(){
         String SEARCH_ACCOUNT_NAME = "Search Account";
 
@@ -122,15 +128,17 @@ public void testSearchAccounts(){
         refreshAccountsList();
 
         //enter search query
-        ActionBarUtils.clickSherlockActionBarItem(mSolo, R.id.menu_search);
-        mSolo.sleep(200);
+//        ActionBarUtils.clickSherlockActionBarItem(mSolo, R.id.menu_search);
+        mSolo.clickOnActionBarItem(R.id.menu_search);
+        mSolo.sleep(2000);
         mSolo.enterText(0, "Se");
-
+        mSolo.sleep(3000);
         boolean accountFound = mSolo.waitForText(SEARCH_ACCOUNT_NAME, 1, 2000);
         assertTrue(accountFound);
 
         mSolo.clearEditText(0);
 
+        mSolo.sleep(2000);
         //the child account should be hidden again
         accountFound = mSolo.waitForText(SEARCH_ACCOUNT_NAME, 1, 2000);
         assertFalse(accountFound);
@@ -174,13 +182,14 @@ public void testChangeParentAccount(){
         mSolo.waitForText(accountName);
 
         mSolo.clickLongOnText(accountName);
-        mSolo.clickOnView(getActivity().findViewById(R.id.context_menu_edit_accounts));
+        mSolo.clickOnView(mSolo.getView(R.id.context_menu_edit_accounts));
         mSolo.waitForView(EditText.class);
 
         mSolo.clickOnCheckBox(1);
         mSolo.pressSpinnerItem(2, 0);
 
-        mSolo.clickOnView(getActivity().findViewById(R.id.menu_save));
+//        mSolo.clickOnView(mSolo.getView(R.id.menu_save));
+        mSolo.clickOnActionBarItem(R.id.menu_save);
 
         mSolo.waitForText(getActivity().getString(R.string.title_accounts));
         Account editedAccount = mAccountsDbAdapter.getAccount(accountUID);
@@ -192,6 +201,7 @@ public void testChangeParentAccount(){
 
 	public void testEditAccount(){
         refreshAccountsList();
+        mSolo.sleep(2000);
 		mSolo.waitForText(DUMMY_ACCOUNT_NAME);
 
 		String editedAccountName = "Edited Account";
@@ -207,7 +217,7 @@ public void testEditAccount(){
 
         clickSherlockActionBarItem(R.id.menu_save);
 
-		mSolo.waitForDialogToClose(2000);
+		mSolo.waitForDialogToClose();
         mSolo.waitForText("Accounts");
 
 		List<Account> accounts = mAccountsDbAdapter.getAllAccounts();
@@ -216,7 +226,8 @@ public void testEditAccount(){
 		assertEquals("Edited Account", latest.getName());
 		assertEquals(DUMMY_ACCOUNT_CURRENCY_CODE, latest.getCurrency().getCurrencyCode());	
 	}
-	
+
+    //TODO: Add test for moving content of accounts before deleting it
 	public void testDeleteAccount(){
         final String accountNameToDelete = "TO BE DELETED";
         final String accountUidToDelete = "to-be-deleted";
@@ -238,9 +249,11 @@ public void testDeleteAccount(){
 
         clickSherlockActionBarItem(R.id.context_menu_delete);
 
+        mSolo.waitForDialogToOpen();
+        mSolo.clickOnRadioButton(0);
         mSolo.clickOnView(mSolo.getView(R.id.btn_save));
 
-        mSolo.waitForDialogToClose(1000);
+        mSolo.waitForDialogToClose();
         mSolo.waitForText("Accounts");
 
         Exception expectedException = null;
@@ -285,7 +298,8 @@ public void testIntentAccountCreation(){
 
 	protected void tearDown() throws Exception {
         mSolo.finishOpenedActivities();
-        mSolo.sleep(1000);
+        mSolo.waitForEmptyActivityStack(20000);
+        mSolo.sleep(5000);
         mAccountsDbAdapter.deleteAllRecords();
 
 		super.tearDown();

app/src/androidTest/java/org/gnucash/android/test/ui/ExportTransactionsTest.java

@@ -61,7 +61,7 @@ public ExportTransactionsTest() {
 
 	@Override
 	protected void setUp() throws Exception {
-		super.setUp();
+		AccountsActivityTest.preventFirstRunDialogs(getInstrumentation().getTargetContext());
 		mSolo = new Solo(getInstrumentation(), getActivity());
 
         mDbHelper = new DatabaseHelper(getActivity());
@@ -111,24 +111,28 @@ public void testXmlExport(){
 
 	/**
 	 * Generates export for the specified format and tests that the file actually is created
-	 * @param format
+	 * @param format Export format to use
 	 */
     public void testExport(ExportFormat format){
 		File folder = new File(Exporter.EXPORT_FOLDER_PATH);
 		folder.mkdirs();
+		mSolo.sleep(5000);
+		assertThat(folder).exists();
+
 		for (File file : folder.listFiles()) {
 			file.delete();
 		}
 
-		mSolo.setNavigationDrawer(Solo.OPENED);
-		mSolo.clickOnText(mSolo.getString(R.string.nav_menu_export));
+		mSolo.clickOnActionBarItem(R.id.menu_export);
+		mSolo.waitForDialogToOpen(5000);
+
+        mSolo.waitForText(getActivity().getString(R.string.title_export_dialog));
 
-        mSolo.waitForText(getActivity().getString(R.string.menu_export_transactions));
 		mSolo.clickOnText(format.name());
-		mSolo.clickOnButton(mSolo.getString(R.string.btn_export));
+		mSolo.clickOnView(mSolo.getView(R.id.btn_save));
 
         mSolo.waitForDialogToClose(10000);
-		mSolo.sleep(2000); //sleep so that emulators can save the file
+		mSolo.sleep(5000); //sleep so that emulators can save the file
 
 		assertThat(folder.listFiles().length).isEqualTo(1);
 		File exportFile = folder.listFiles()[0];
@@ -151,20 +155,26 @@ public void testDeleteTransactionsAfterExport(){
 	/**
 	 * Test creating a scheduled export
 	 */
-	public void atestCreateExportSchedule(){
-		mSolo.setNavigationDrawer(Solo.OPENED);
-		mSolo.clickOnText(mSolo.getString(R.string.nav_menu_export));
-		mSolo.waitForText(getActivity().getString(R.string.menu_export_transactions));
+	public void testCreateExportSchedule(){
+//		mSolo.setNavigationDrawer(Solo.OPENED);
+//		mSolo.clickOnText(mSolo.getString(R.string.nav_menu_export));
+		mSolo.clickOnActionBarItem(R.id.menu_export);
+		mSolo.waitForDialogToOpen(5000);
 
 		mSolo.clickOnText(ExportFormat.XML.name());
 		mSolo.clickOnView(mSolo.getView(R.id.input_recurrence));
-
-		mSolo.clickOnText("OFF");
-		mSolo.pressSpinnerItem(0, 1);
-		mSolo.clickOnText("Done");
-		mSolo.clickOnButton(mSolo.getString(R.string.btn_export));
-		mSolo.waitForDialogToClose(5000);
-
+		mSolo.waitForDialogToOpen();
+		mSolo.sleep(2000);
+		mSolo.clickOnButton(0); //switch on the recurrence dialog
+		mSolo.sleep(2000);
+		mSolo.pressSpinnerItem(0, -1);
+		mSolo.clickOnButton(1);
+		mSolo.waitForDialogToClose();
+		mSolo.sleep(2000);
+		mSolo.clickOnView(mSolo.getView(R.id.btn_save));
+		mSolo.waitForDialogToClose();
+
+		mSolo.sleep(2000); //wait for database save
 
 		ScheduledActionDbAdapter scheduledactionDbAdapter = new ScheduledActionDbAdapter(mDb);
 		assertThat(scheduledactionDbAdapter.getAllEnabledScheduledActions())
@@ -173,13 +183,16 @@ public void atestCreateExportSchedule(){
 
 		ScheduledAction action = scheduledactionDbAdapter.getAllScheduledActions().get(0);
 		assertThat(action.getPeriodType()).isEqualTo(PeriodType.DAY);
+		assertThat(action.getEndTime()).isEqualTo(0);
 	}
 
 	//todo: add testing of export flag to unit test
 	//todo: add test of ignore exported transactions to unit tests
 	@Override
 	protected void tearDown() throws Exception {
 		mSolo.finishOpenedActivities();
+		mSolo.waitForEmptyActivityStack(20000);
+		mSolo.sleep(5000);
 		mAccountsDbAdapter.deleteAllRecords();
         mDbHelper.close();
         mDb.close();