Fixed tests
diff --git a/lottie/build.gradle b/lottie/build.gradle
index 16a135f..515cd15 100644
--- a/lottie/build.gradle
+++ b/lottie/build.gradle
@@ -46,9 +46,9 @@
errorprone "com.google.errorprone:error_prone_core:2.3.2"
errorproneJavac "com.google.errorprone:javac:9+181-r4173-1"
- testImplementation "org.mockito:mockito-core:2.15.0"
- testImplementation 'junit:junit:4.12'
- testImplementation "org.robolectric:robolectric:4.3.1"
+ testImplementation "org.mockito:mockito-core:3.5.13"
+ testImplementation 'junit:junit:4.13.1'
+ testImplementation "org.robolectric:robolectric:4.4"
}
task sourcesJar(type: Jar) {
diff --git a/lottie/src/test/java/com/airbnb/lottie/LottieCompositionFactoryTest.java b/lottie/src/test/java/com/airbnb/lottie/LottieCompositionFactoryTest.java
index 7fee47d..95e0050 100644
--- a/lottie/src/test/java/com/airbnb/lottie/LottieCompositionFactoryTest.java
+++ b/lottie/src/test/java/com/airbnb/lottie/LottieCompositionFactoryTest.java
@@ -3,11 +3,11 @@
import com.airbnb.lottie.model.LottieCompositionCache;
import com.airbnb.lottie.parser.moshi.JsonReader;
-import org.apache.tools.ant.filters.StringInputStream;
import org.junit.Before;
import org.junit.Test;
import org.robolectric.RuntimeEnvironment;
+import java.io.ByteArrayInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -54,7 +54,7 @@
@Test
public void testLoadJsonReader() {
- JsonReader reader = JsonReader.of(buffer(source(new StringInputStream(JSON))));
+ JsonReader reader = JsonReader.of(buffer(source(new ByteArrayInputStream(JSON.getBytes()))));
LottieResult<LottieComposition> result = LottieCompositionFactory.fromJsonReaderSync(reader, "json");
assertNull(result.getException());
assertNotNull(result.getValue());
@@ -62,7 +62,7 @@
@Test
public void testLoadInvalidJsonReader() {
- JsonReader reader = JsonReader.of(buffer(source(new StringInputStream(NOT_JSON))));
+ JsonReader reader = JsonReader.of(buffer(source(new ByteArrayInputStream(NOT_JSON.getBytes()))));
LottieResult<LottieComposition> result = LottieCompositionFactory.fromJsonReaderSync(reader, "json");
assertNotNull(result.getException());
assertNull(result.getValue());
diff --git a/lottie/src/test/java/com/airbnb/lottie/MeanCalculatorTest.java b/lottie/src/test/java/com/airbnb/lottie/MeanCalculatorTest.java
index 3cc1d78..772eda7 100644
--- a/lottie/src/test/java/com/airbnb/lottie/MeanCalculatorTest.java
+++ b/lottie/src/test/java/com/airbnb/lottie/MeanCalculatorTest.java
@@ -5,8 +5,8 @@
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
public class MeanCalculatorTest {
diff --git a/lottie/src/test/java/com/airbnb/lottie/PerformanceTrackerTest.java b/lottie/src/test/java/com/airbnb/lottie/PerformanceTrackerTest.java
index f6f0bc2..a541e10 100644
--- a/lottie/src/test/java/com/airbnb/lottie/PerformanceTrackerTest.java
+++ b/lottie/src/test/java/com/airbnb/lottie/PerformanceTrackerTest.java
@@ -7,9 +7,9 @@
import java.util.List;
-import static junit.framework.Assert.assertTrue;
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static junit.framework.TestCase.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.IsEqual.equalTo;
public class PerformanceTrackerTest {
diff --git a/lottie/src/test/java/com/airbnb/lottie/utils/GammaEvaluatorTest.java b/lottie/src/test/java/com/airbnb/lottie/utils/GammaEvaluatorTest.java
index d091ba1..d4d833a 100644
--- a/lottie/src/test/java/com/airbnb/lottie/utils/GammaEvaluatorTest.java
+++ b/lottie/src/test/java/com/airbnb/lottie/utils/GammaEvaluatorTest.java
@@ -2,8 +2,8 @@
import org.junit.Test;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
public class GammaEvaluatorTest {
@Test
