From 192f6ddf82f66600f19b75b3505b01782153ea4d Mon Sep 17 00:00:00 2001 From: Konstantin Raev Date: Thu, 16 Jun 2016 04:04:34 -0700 Subject: [PATCH] another fix to OSS tests Summary: Closes https://github.com/facebook/react-native/pull/8151 Differential Revision: D3444091 fbshipit-source-id: a8a43a56332c66b0af84695aa54fb1e4c5d659f6 --- ReactAndroid/build.gradle | 5 +++++ .../com/facebook/react/testing/ReactIntegrationTestCase.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 698399035..efeb36aeb 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -254,6 +254,10 @@ android { lintOptions { abortOnError false } + packagingOptions { + exclude 'META-INF/NOTICE' + exclude 'META-INF/LICENSE' + } } dependencies { @@ -280,6 +284,7 @@ dependencies { testCompile "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}" androidTestCompile 'com.android.support.test:runner:0.3' + androidTestCompile "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}" } apply from: 'release.gradle' diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java index 8591cfeaa..286da50a9 100644 --- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java +++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java @@ -35,7 +35,7 @@ import com.facebook.react.modules.core.Timing; import com.facebook.soloader.SoLoader; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; /** * Use this class for writing integration tests of catalyst. This class will run all JNI call