2020-01-31 Version 1.0.4: Refactored FileCopy class and updated Travis CI configuration

Author: fartem

.travis.yml

@@ -25,9 +25,9 @@ before_install:
 script:
   - ./gradlew checkstyle
   - ./gradlew cpdCheck
-  - ./gradlew test
   - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
   - emulator -avd test -no-skin -no-audio -no-window &
   - android-wait-for-emulator
   - adb shell input keyevent 82 &
-  - ./gradlew connectedAndroidTest
+  - adb logcat &
+  - ./gradlew -Pandroid.testInstrumentationRunnerArguments.class=com.smlnskgmail.jaman.ormlitedatabackup.TravisCIAndroidTestSuite connectedAndroidTest

app/build.gradle

@@ -10,7 +10,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.3"
+        versionName "1.0.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/androidTest/java/com/smlnskgmail/jaman/ormlitedatabackup/TravisCIAndroidTestSuite.java

@@ -0,0 +1,16 @@
+package com.smlnskgmail.jaman.ormlitedatabackup;
+
+import com.smlnskgmail.jaman.ormlitedatabackup.backup.OrmLiteBackupCheckTest;
+import com.smlnskgmail.jaman.ormlitedatabackup.ui.CreateEventTest;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+        CreateEventTest.class,
+        OrmLiteBackupCheckTest.class
+})
+public class TravisCIAndroidTestSuite {
+
+}

app/src/androidTest/java/com/smlnskgmail/jaman/ormlitedatabackup/backup/CreateOrmLiteLocalBackupTaskTest.java

@@ -66,4 +66,4 @@ private File localBackupFile() {
         return new File(ormLiteLocalBackupPath.pathAsString());
     }
 
-}
+}

app/src/main/java/com/smlnskgmail/jaman/ormlitedatabackup/logic/ormlite/backup/FileCopy.java

@@ -50,8 +50,7 @@ public boolean copy() {
         try {
             inputStream = fromAsStream != null
                     ? fromAsStream
-                    : context.getContentResolver().openInputStream(
-                            Uri.fromFile(new File(from))
+                    : context.getContentResolver().openInputStream(Uri.fromFile(new File(from))
             );
             File toFile = new File(to);
             if (toFile.exists()) {
@@ -66,7 +65,7 @@ public boolean copy() {
 
             byte[] buffer = new byte[1024];
             int length;
-            while ((length = Objects.requireNonNull(inputStream).read(buffer)) > 0) {
+            while ((length = inputStream.read(buffer)) > 0) {
                 outputStream.write(buffer, 0, length);
             }
 
@@ -77,8 +76,12 @@ public boolean copy() {
             return false;
         } finally {
             try {
-                Objects.requireNonNull(inputStream).close();
-                Objects.requireNonNull(outputStream).close();
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+                if (outputStream != null) {
+                    outputStream.close();
+                }
             } catch (IOException e) {
                 L.e(e);
             }