commit 6b93202de2074b91d465ac44802516d0c971d47d parent bb8d34999654147fb495189cae13884382b09b28 Author: gstraube <gstraube@mailbox.org> Date: Mon, 21 Aug 2017 18:31:38 +0200 Update reference images Diffstat:
16 files changed, 51 insertions(+), 25 deletions(-)
diff --git a/app/src/androidTest/java/com/github/cythara/TunerViewTest.java b/app/src/androidTest/java/com/github/cythara/TunerViewTest.java @@ -4,6 +4,7 @@ import android.Manifest; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; +import android.graphics.drawable.Drawable; import android.os.Environment; import android.support.test.rule.ActivityTestRule; import android.support.test.rule.GrantPermissionRule; @@ -22,6 +23,7 @@ import java.util.HashMap; import java.util.Map; import static android.support.test.rule.GrantPermissionRule.grant; +import static java.lang.String.*; @RunWith(AndroidJUnit4.class) public class TunerViewTest { @@ -40,57 +42,72 @@ public class TunerViewTest { @Test public void exactly_matching_pitch_is_displayed() throws IOException { - isDisplayedCorrectly(R.drawable.exact, new PitchDifference(Note.E1, 0)); + isDisplayedCorrectly(R.drawable.exact, "exact", new PitchDifference(Note.E1, 0)); } @Test public void close_match_is_displayed_correctly() throws IOException { - isDisplayedCorrectly(R.drawable.close, new PitchDifference(Note.G3, 2.4)); + isDisplayedCorrectly(R.drawable.close, "close", new PitchDifference(Note.G3, 2.4)); } @Test public void exact_deviations_are_displayed_correctly() throws IOException { - Map<Integer, Integer> deviationToReferenceId = new HashMap<>(); - - deviationToReferenceId.put(-30, R.drawable.negative_30_cents); - deviationToReferenceId.put(-20, R.drawable.negative_20_cents); - deviationToReferenceId.put(-10, R.drawable.negative_10_cents); - deviationToReferenceId.put(10, R.drawable.positive_10_cents); - deviationToReferenceId.put(20, R.drawable.positive_20_cents); - deviationToReferenceId.put(30, R.drawable.positive_30_cents); + Map<Integer, DrawableResource> deviationToReferenceId = new HashMap<>(); + + deviationToReferenceId.put(-30, new DrawableResource(R.drawable.negative_30_cents, + "negative_30_cents")); + deviationToReferenceId.put(-20, new DrawableResource(R.drawable.negative_20_cents, + "negative_20_cents")); + deviationToReferenceId.put(-10, new DrawableResource(R.drawable.negative_10_cents, + "negative_10_cents")); + deviationToReferenceId.put(10, new DrawableResource(R.drawable.positive_10_cents, + "positive_10_cents")); + deviationToReferenceId.put(20, new DrawableResource(R.drawable.positive_20_cents, + "positive_20_cents")); + deviationToReferenceId.put(30, new DrawableResource(R.drawable.positive_30_cents, + "positive_30_cents")); for (Integer deviation : deviationToReferenceId.keySet()) { - isDisplayedCorrectly(deviationToReferenceId.get(deviation), + DrawableResource drawableResource = deviationToReferenceId.get(deviation); + isDisplayedCorrectly(drawableResource.id, drawableResource.name, new PitchDifference(Note.B2, deviation)); } } @Test public void non_exact_deviations_are_displayed_correctly() throws IOException { - Map<Double, Integer> deviationToReferenceId = new HashMap<>(); - - deviationToReferenceId.put(-6.4, R.drawable.negative_6_4_cents); - deviationToReferenceId.put(15.41, R.drawable.positive_15_41_cents); - deviationToReferenceId.put(5.1, R.drawable.positive_5_1_cents); - deviationToReferenceId.put(-27.32, R.drawable.negative_27_32_cents); - deviationToReferenceId.put(4.7, R.drawable.positive_4_7_cents); - deviationToReferenceId.put(29.5, R.drawable.positive_29_5_cents); + Map<Double, DrawableResource> deviationToReferenceId = new HashMap<>(); + + deviationToReferenceId.put(-6.4, new DrawableResource(R.drawable.negative_6_4_cents, + "negative_6_4_cents")); + deviationToReferenceId.put(15.41, new DrawableResource(R.drawable.positive_15_41_cents, + "positive_15_41_cents")); + deviationToReferenceId.put(5.1, new DrawableResource(R.drawable.positive_5_1_cents, + "positive_5_1_cents")); + deviationToReferenceId.put(-27.32, new DrawableResource(R.drawable.negative_27_32_cents, + "negative_27_32_cents")); + deviationToReferenceId.put(4.7, new DrawableResource(R.drawable.positive_4_7_cents, + "positive_4_7_cents")); + deviationToReferenceId.put(29.5, new DrawableResource(R.drawable.positive_29_5_cents, + "positive_29_5_cents")); for (Double deviation : deviationToReferenceId.keySet()) { - isDisplayedCorrectly(deviationToReferenceId.get(deviation), + DrawableResource drawableResource = deviationToReferenceId.get(deviation); + isDisplayedCorrectly(drawableResource.id, drawableResource.name, new PitchDifference(Note.B2, deviation)); } } @Test public void values_outside_of_boundaries_are_not_displayed() throws IOException { - isDisplayedCorrectly(R.drawable.blank, + isDisplayedCorrectly(R.drawable.blank, "blank", new PitchDifference(Note.D4, 30.5)); - isDisplayedCorrectly(R.drawable.blank, + isDisplayedCorrectly(R.drawable.blank, "blank", new PitchDifference(Note.D4, -30.5)); } - public void isDisplayedCorrectly(int referenceId, PitchDifference pitchDifference) + public void isDisplayedCorrectly(int referenceId, String fileName, + PitchDifference pitchDifference) throws IOException { MainActivity mainActivity = mActivityRule.getActivity(); @@ -106,8 +123,7 @@ public class TunerViewTest { tunerView.draw(canvas); - writeToFile(generated, "generated.png"); - writeToFile(reference, "reference.png"); + writeToFile(generated, format("%s.png", fileName)); Assert.assertTrue(reference.sameAs(generated)); } @@ -126,4 +142,14 @@ public class TunerViewTest { } } } + + private static class DrawableResource { + int id; + String name; + + DrawableResource(int id, String name) { + this.id = id; + this.name = name; + } + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/blank.png b/app/src/main/res/drawable/blank.png Binary files differ. diff --git a/app/src/main/res/drawable/close.png b/app/src/main/res/drawable/close.png Binary files differ. diff --git a/app/src/main/res/drawable/exact.png b/app/src/main/res/drawable/exact.png Binary files differ. diff --git a/app/src/main/res/drawable/negative_10_cents.png b/app/src/main/res/drawable/negative_10_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/negative_20_cents.png b/app/src/main/res/drawable/negative_20_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/negative_27_32_cents.png b/app/src/main/res/drawable/negative_27_32_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/negative_30_cents.png b/app/src/main/res/drawable/negative_30_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/negative_6_4_cents.png b/app/src/main/res/drawable/negative_6_4_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/positive_10_cents.png b/app/src/main/res/drawable/positive_10_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/positive_15_41_cents.png b/app/src/main/res/drawable/positive_15_41_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/positive_20_cents.png b/app/src/main/res/drawable/positive_20_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/positive_29_5_cents.png b/app/src/main/res/drawable/positive_29_5_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/positive_30_cents.png b/app/src/main/res/drawable/positive_30_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/positive_4_7_cents.png b/app/src/main/res/drawable/positive_4_7_cents.png Binary files differ. diff --git a/app/src/main/res/drawable/positive_5_1_cents.png b/app/src/main/res/drawable/positive_5_1_cents.png Binary files differ.
