From bb282da92d93e04b6c9375ecbf960c88a08fe5a1 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Fri, 23 Jun 2017 16:25:25 -0400 Subject: [PATCH] Fix tests --- .../test/java/org/isoron/uhabits/BaseAndroidUnitTest.java | 2 +- .../src/test/java/org/isoron/uhabits/core/BaseUnitTest.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidUnitTest.java b/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidUnitTest.java index 95a6ac9db..f35f77ec4 100644 --- a/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidUnitTest.java +++ b/uhabits-android/src/test/java/org/isoron/uhabits/BaseAndroidUnitTest.java @@ -54,7 +54,7 @@ public class BaseAndroidUnitTest modelFactory = new MemoryModelFactory(); habitList = spy(modelFactory.buildHabitList()); - fixtures = new HabitFixtures(modelFactory); + fixtures = new HabitFixtures(modelFactory, habitList); taskRunner = new SingleThreadTaskRunner(); commandRunner = new CommandRunner(taskRunner); } diff --git a/uhabits-core/src/test/java/org/isoron/uhabits/core/BaseUnitTest.java b/uhabits-core/src/test/java/org/isoron/uhabits/core/BaseUnitTest.java index cafdf371d..b2fedc727 100644 --- a/uhabits-core/src/test/java/org/isoron/uhabits/core/BaseUnitTest.java +++ b/uhabits-core/src/test/java/org/isoron/uhabits/core/BaseUnitTest.java @@ -139,6 +139,11 @@ public class BaseUnitTest if (file.exists() && file.canRead()) in = new FileInputStream(file); if (in != null) return in; + basePath = "src/test/resources/"; + file = new File(basePath + assetPath); + if (file.exists() && file.canRead()) in = new FileInputStream(file); + if (in != null) return in; + throw new IllegalStateException("asset not found: " + assetPath); }