Merge branch 'feature/optimize-travis' into develop

Author: hiteshsondhi88

.travis.yml

@@ -11,14 +11,7 @@ android:
     - android-16
 
     - sys-img-x86-android-16
-before_install:
-  - echo no | android create avd -c 50M --force -n testx86 -t android-16 --abi x86
-  - emulator -avd testx86 -no-skin -no-audio -no-window -gpu on &
-
-before_script:
-    # Make sure the emulator has started before running tests
-    - android-wait-for-emulator
-    - adb shell input keyevent 82 &
+    - sys-img-armeabi-v7a-android-16
 
 script:
-  - ./gradlew --info build connectedAndroidTest
+  - ./runTests.sh || exit 1

FFmpegAndroid/assets/armeabi-v7a-neon/ffmpeg

@@ -8,8 +8,8 @@ android {
         applicationId "com.github.hiteshsondhi88.libffmpeg"
         minSdkVersion 16
         targetSdkVersion 16
-        versionCode 22
-        versionName "0.2.2"
+        versionCode 23
+        versionName "0.2.3"
     }
 
     sourceSets.main {

FFmpegAndroid/assets/armeabi-v7a/ffmpeg

@@ -0,0 +1,13 @@
+package com.github.hiteshsondhi88.libffmpeg;
+
+import android.test.InstrumentationTestCase;
+
+public class CommonInstrumentationTestCase extends InstrumentationTestCase {
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        Log.setDEBUG(true);
+    }
+
+}

FFmpegAndroid/assets/x86/ffmpeg

@@ -20,5 +20,4 @@ public void testGetCpuArch() throws Exception {
         }
     }
 
-
 }

FFmpegAndroid/build.gradle

@@ -0,0 +1,39 @@
+package com.github.hiteshsondhi88.libffmpeg;
+
+import android.content.res.AssetManager;
+import android.text.TextUtils;
+
+import com.github.hiteshsondhi88.libffmpeg.utils.AssertionHelper;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class CpuArchTest extends CommonInstrumentationTestCase {
+
+    public void testFFmpegAssetsWithSha1Sum() {
+        testFFmpegAsset(CpuArch.ARMv7, "armeabi-v7a/ffmpeg");
+        testFFmpegAsset(CpuArch.ARMv7_NEON, "armeabi-v7a-neon/ffmpeg");
+        testFFmpegAsset(CpuArch.x86, "x86/ffmpeg");
+    }
+
+    private void testFFmpegAsset(CpuArch cpuArch, String assetsPath) {
+        AssetManager assetMgr = getInstrumentation().getContext().getResources().getAssets();
+        InputStream is = null;
+        try {
+            is = assetMgr.open(assetsPath);
+            String assetSha1Sum = FileUtils.SHA1(is);
+            assertThat(!TextUtils.isEmpty(cpuArch.getSha1())
+                    && !TextUtils.isEmpty(assetSha1Sum)
+                    && cpuArch.getSha1().equals(assetSha1Sum)).isTrue();
+        } catch (IOException e) {
+            Log.e(e);
+            AssertionHelper.assertError("error validating ffmpeg asset "+assetsPath);
+        } finally {
+            Util.close(is);
+        }
+
+    }
+
+}

FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CommonInstrumentationTestCase.java

@@ -44,7 +44,7 @@ public void run() {
 
     public void testRunWaitFor() throws Exception {
         ShellCommand shellCommand = new ShellCommand();
-        CommandResult commandResult = shellCommand.runWaitFor("ls /sdcard/");
+        CommandResult commandResult = shellCommand.runWaitFor("ls");
         assertNotNull(commandResult);
         assertEquals(true, commandResult.success);
         assertThat(commandResult.output).isNotEmpty();

FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelperTest.java

@@ -1,5 +1,31 @@
 package com.github.hiteshsondhi88.libffmpeg;
 
+import android.text.TextUtils;
+
 enum CpuArch {
-    x86, ARMv7, ARMv7_NEON, NONE
+    x86("a0f523f4fce7e4a4b0ad1e86dfa5c3d54ac93b91"),
+    ARMv7("6b9b3d574740d69fd50fd6d75e04c71ae3a95c72"),
+    ARMv7_NEON("ac0418277061dc8b7547fee51e3e84457069806e"),
+    NONE(null);
+
+    private String sha1;
+
+    CpuArch(String sha1) {
+        this.sha1 = sha1;
+    }
+
+    String getSha1(){
+        return sha1;
+    }
+
+    static CpuArch fromString(String sha1) {
+        if (!TextUtils.isEmpty(sha1)) {
+            for (CpuArch cpuArch : CpuArch.values()) {
+                if (sha1.equalsIgnoreCase(cpuArch.sha1)) {
+                    return cpuArch;
+                }
+            }
+        }
+        return NONE;
+    }
 }