From 14db72ac3532f2258df301074bc781d691d68658 Mon Sep 17 00:00:00 2001 From: Max Bechtold Date: Thu, 17 Oct 2019 11:54:11 +0200 Subject: #3248 Merge FeedVolumeReduction into VolumeReductionSetting --- .../core/feed/VolumeReductionSettingTest.java | 18 ++++++++++- .../service/playback/FeedVolumeReductionTest.java | 37 ---------------------- 2 files changed, 17 insertions(+), 38 deletions(-) delete mode 100644 core/src/test/java/de/danoeh/antennapod/core/service/playback/FeedVolumeReductionTest.java (limited to 'core/src/test/java/de/danoeh/antennapod') diff --git a/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeReductionSettingTest.java b/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeReductionSettingTest.java index 26c2132fe..a97fb6f20 100644 --- a/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeReductionSettingTest.java +++ b/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeReductionSettingTest.java @@ -1,11 +1,12 @@ package de.danoeh.antennapod.core.feed; - import org.junit.Test; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; public class VolumeReductionSettingTest { @@ -45,4 +46,19 @@ public class VolumeReductionSettingTest { public void cannotMapValuesOutOfRange() { VolumeReductionSetting.fromInteger(3); } + + @Test + public void noReductionIfTurnedOff() { + float reductionFactor = VolumeReductionSetting.OFF.getReductionFactor(); + assertEquals(1.0f, reductionFactor, 0.01f); + } + + @Test + public void lightReductionYieldsHigherValueThanHeavyReduction() { + float lightReductionFactor = VolumeReductionSetting.LIGHT.getReductionFactor(); + + float heavyReductionFactor = VolumeReductionSetting.HEAVY.getReductionFactor(); + + assertTrue("Light reduction must have higher factor than heavy reduction", lightReductionFactor > heavyReductionFactor); + } } \ No newline at end of file diff --git a/core/src/test/java/de/danoeh/antennapod/core/service/playback/FeedVolumeReductionTest.java b/core/src/test/java/de/danoeh/antennapod/core/service/playback/FeedVolumeReductionTest.java deleted file mode 100644 index 109b361fe..000000000 --- a/core/src/test/java/de/danoeh/antennapod/core/service/playback/FeedVolumeReductionTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package de.danoeh.antennapod.core.service.playback; - -import de.danoeh.antennapod.core.feed.FeedPreferences; -import de.danoeh.antennapod.core.feed.VolumeReductionSetting; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -public class FeedVolumeReductionTest { - - @Test - public void noReductionIfTurnedOff() { - FeedPreferences feedPreferences = mock(FeedPreferences.class); - when(feedPreferences.getVolumeReductionSetting()).thenReturn(VolumeReductionSetting.OFF); - - FeedVolumeReduction feedVolumeReduction = new FeedVolumeReduction(); - float reductionFactor = feedVolumeReduction.getReductionFactor(feedPreferences); - assertEquals(1.0f, reductionFactor, 0.01f ); - } - - @Test - public void lightReductionYieldsHigherValueThanHeavyReduction() { - FeedPreferences feedPreferences = mock(FeedPreferences.class); - FeedVolumeReduction feedVolumeReduction = new FeedVolumeReduction(); - - when(feedPreferences.getVolumeReductionSetting()).thenReturn(VolumeReductionSetting.LIGHT); - float lightReductionFactor = feedVolumeReduction.getReductionFactor(feedPreferences); - - when(feedPreferences.getVolumeReductionSetting()).thenReturn(VolumeReductionSetting.HEAVY); - float heavyReductionFactor = feedVolumeReduction.getReductionFactor(feedPreferences); - - assertTrue("Light reduction must have higher factor than heavy reduction", lightReductionFactor > heavyReductionFactor); - } -} \ No newline at end of file -- cgit v1.2.3