From e6d5717adb9cb59dd7d3e4400370f08ae3b01429 Mon Sep 17 00:00:00 2001 From: Hitesh Sondhi Date: Tue, 19 Apr 2016 17:57:04 +0530 Subject: [PATCH] Updated Test Cases --- .../com/github/hiteshsondhi88/libffmpeg/CpuArchHelperTest.java | 2 +- .../java/com/github/hiteshsondhi88/libffmpeg/CpuArchTest.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelperTest.java b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelperTest.java index 5a19b61..6a04526 100644 --- a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelperTest.java +++ b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchHelperTest.java @@ -14,7 +14,7 @@ public void testGetCpuArch() throws Exception { if (Build.CPU_ABI.equals(CpuArchHelper.getx86CpuAbi()) || Build.CPU_ABI.equals(CpuArchHelper.getx86_64CpuAbi())) { assertEquals(cpuArch, CpuArch.x86); } else if (Build.CPU_ABI.equals(CpuArchHelper.getArmeabiv7CpuAbi())) { - assertThat(cpuArch == CpuArch.ARMv7 || cpuArch == CpuArch.ARMv7_NEON).isTrue(); + assertEquals(cpuArch, CpuArch.ARMv7); } else if (Build.CPU_ABI.equals(CpuArchHelper.getArm64CpuAbi())) { assertEquals(cpuArch, CpuArch.ARMv7); }else { diff --git a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchTest.java b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchTest.java index 222d454..88909b6 100644 --- a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchTest.java +++ b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/CpuArchTest.java @@ -14,7 +14,6 @@ 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"); }