resolve review remarks w.r.t naming: volume reduction -> volume adaption

3 files changed, 82 insertions, 82 deletions

diff --git a/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java b/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java
new file mode 100644
index 000000000..45c86cb83
--- /dev/null
+++ b/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeAdaptionSettingTest.java
@@ -0,0 +1,64 @@
+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 VolumeAdaptionSettingTest {
+
+    @Test
+    public void mapOffToInteger() {
+        VolumeAdaptionSetting setting = VolumeAdaptionSetting.OFF;
+        assertThat(setting.toInteger(), is(equalTo(0)));
+    }
+
+    @Test
+    public void mapLightReductionToInteger() {
+        VolumeAdaptionSetting setting = VolumeAdaptionSetting.LIGHT_REDUCTION;
+
+        assertThat(setting.toInteger(), is(equalTo(1)));
+    }
+
+    @Test
+    public void mapHeavyReductionToInteger() {
+        VolumeAdaptionSetting setting = VolumeAdaptionSetting.HEAVY_REDUCTION;
+
+        assertThat(setting.toInteger(), is(equalTo(2)));
+    }
+
+    @Test
+    public void mapIntegerToVolumeAdaptionSetting() {
+        assertThat(VolumeAdaptionSetting.fromInteger(0), is(equalTo(VolumeAdaptionSetting.OFF)));
+        assertThat(VolumeAdaptionSetting.fromInteger(1), is(equalTo(VolumeAdaptionSetting.LIGHT_REDUCTION)));
+        assertThat(VolumeAdaptionSetting.fromInteger(2), is(equalTo(VolumeAdaptionSetting.HEAVY_REDUCTION)));
+    }
+
+    @Test(expected =  IllegalArgumentException.class)
+    public void cannotMapNegativeValues() {
+        VolumeAdaptionSetting.fromInteger(-1);
+    }
+
+    @Test(expected =  IllegalArgumentException.class)
+    public void cannotMapValuesOutOfRange() {
+        VolumeAdaptionSetting.fromInteger(3);
+    }
+
+    @Test
+    public void noAdaptionIfTurnedOff() {
+        float adaptionFactor = VolumeAdaptionSetting.OFF.getAdaptionFactor();
+        assertEquals(1.0f, adaptionFactor, 0.01f);
+    }
+
+    @Test
+    public void lightReductionYieldsHigherValueThanHeavyReduction() {
+        float lightReductionFactor = VolumeAdaptionSetting.LIGHT_REDUCTION.getAdaptionFactor();
+
+        float heavyReductionFactor = VolumeAdaptionSetting.HEAVY_REDUCTION.getAdaptionFactor();
+
+        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/feed/VolumeReductionSettingTest.java b/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeReductionSettingTest.java
deleted file mode 100644
index a97fb6f20..000000000
--- a/core/src/test/java/de/danoeh/antennapod/core/feed/VolumeReductionSettingTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-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 {
-
-    @Test
-    public void mapOffToInteger() {
-        VolumeReductionSetting setting = VolumeReductionSetting.OFF;
-        assertThat(setting.toInteger(), is(equalTo(0)));
-    }
-
-    @Test
-    public void mapLightToInteger() {
-        VolumeReductionSetting setting = VolumeReductionSetting.LIGHT;
-
-        assertThat(setting.toInteger(), is(equalTo(1)));
-    }
-
-    @Test
-    public void mapHeavyToInteger() {
-        VolumeReductionSetting setting = VolumeReductionSetting.HEAVY;
-
-        assertThat(setting.toInteger(), is(equalTo(2)));
-    }
-
-    @Test
-    public void mapIntegerToVolumeReductionSetting() {
-        assertThat(VolumeReductionSetting.fromInteger(0), is(equalTo(VolumeReductionSetting.OFF)));
-        assertThat(VolumeReductionSetting.fromInteger(1), is(equalTo(VolumeReductionSetting.LIGHT)));
-        assertThat(VolumeReductionSetting.fromInteger(2), is(equalTo(VolumeReductionSetting.HEAVY)));
-    }
-
-    @Test(expected =  IllegalArgumentException.class)
-    public void cannotMapNegativeValues() {
-        VolumeReductionSetting.fromInteger(-1);
-    }
-
-    @Test(expected =  IllegalArgumentException.class)
-    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/PlaybackVolumeUpdaterTest.java b/core/src/test/java/de/danoeh/antennapod/core/service/playback/PlaybackVolumeUpdaterTest.java
index 4ebe4e5ba..02c3b6efb 100644
--- a/core/src/test/java/de/danoeh/antennapod/core/service/playback/PlaybackVolumeUpdaterTest.java
+++ b/core/src/test/java/de/danoeh/antennapod/core/service/playback/PlaybackVolumeUpdaterTest.java
@@ -4,7 +4,7 @@ import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.feed.FeedPreferences;
-import de.danoeh.antennapod.core.feed.VolumeReductionSetting;
+import de.danoeh.antennapod.core.feed.VolumeAdaptionSetting;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,7 +36,7 @@ public class PlaybackVolumeUpdaterTest {
         Playable noFeedMedia = mock(Playable.class);
         when(mediaPlayer.getPlayable()).thenReturn(noFeedMedia);
 
-        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.OFF);
+        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeAdaptionSetting.OFF);
 
         verify(mediaPlayer, never()).pause(anyBoolean(), anyBoolean());
         verify(mediaPlayer, never()).resume();
@@ -51,7 +51,7 @@ public class PlaybackVolumeUpdaterTest {
         FeedMedia feedMedia = mock(FeedMedia.class);
         when(mediaPlayer.getPlayable()).thenReturn(feedMedia);
 
-        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.OFF);
+        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeAdaptionSetting.OFF);
 
         verify(mediaPlayer, never()).pause(anyBoolean(), anyBoolean());
         verify(mediaPlayer, never()).resume();
@@ -66,7 +66,7 @@ public class PlaybackVolumeUpdaterTest {
         FeedMedia feedMedia = mock(FeedMedia.class);
         when(mediaPlayer.getPlayable()).thenReturn(feedMedia);
 
-        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.OFF);
+        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeAdaptionSetting.OFF);
 
         verify(mediaPlayer, never()).pause(anyBoolean(), anyBoolean());
         verify(mediaPlayer, never()).resume();
@@ -81,7 +81,7 @@ public class PlaybackVolumeUpdaterTest {
         FeedMedia feedMedia = mock(FeedMedia.class);
         when(mediaPlayer.getPlayable()).thenReturn(feedMedia);
 
-        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.OFF);
+        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeAdaptionSetting.OFF);
 
         verify(mediaPlayer, never()).pause(anyBoolean(), anyBoolean());
         verify(mediaPlayer, never()).resume();
@@ -98,7 +98,7 @@ public class PlaybackVolumeUpdaterTest {
         Feed feed = mockFeed(feedMedia, FEED_ID);
         when(feed.getIdentifyingValue()).thenReturn("wrongFeedId");
 
-        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.OFF);
+        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeAdaptionSetting.OFF);
 
         verify(mediaPlayer, never()).pause(anyBoolean(), anyBoolean());
         verify(mediaPlayer, never()).resume();
@@ -114,9 +114,9 @@ public class PlaybackVolumeUpdaterTest {
         when(mediaPlayer.getPlayable()).thenReturn(feedMedia);
         FeedPreferences feedPreferences = mockFeedPreferences(feedMedia, FEED_ID);
 
-        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.LIGHT);
+        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeAdaptionSetting.LIGHT_REDUCTION);
 
-        verify(feedPreferences, times(1)).setVolumeReductionSetting(VolumeReductionSetting.LIGHT);
+        verify(feedPreferences, times(1)).setVolumeAdaptionSetting(VolumeAdaptionSetting.LIGHT_REDUCTION);
 
         verify(mediaPlayer, never()).pause(anyBoolean(), anyBoolean());
         verify(mediaPlayer, never()).resume();
@@ -132,9 +132,9 @@ public class PlaybackVolumeUpdaterTest {
         when(mediaPlayer.getPlayable()).thenReturn(feedMedia);
         FeedPreferences feedPreferences = mockFeedPreferences(feedMedia, FEED_ID);
 
-        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.LIGHT);
+        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeAdaptionSetting.LIGHT_REDUCTION);
 
-        verify(feedPreferences, times(1)).setVolumeReductionSetting(VolumeReductionSetting.LIGHT);
+        verify(feedPreferences, times(1)).setVolumeAdaptionSetting(VolumeAdaptionSetting.LIGHT_REDUCTION);
 
         verify(mediaPlayer, never()).pause(anyBoolean(), anyBoolean());
         verify(mediaPlayer, never()).resume();
@@ -150,9 +150,9 @@ public class PlaybackVolumeUpdaterTest {
         when(mediaPlayer.getPlayable()).thenReturn(feedMedia);
         FeedPreferences feedPreferences = mockFeedPreferences(feedMedia, FEED_ID);
 
-        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.LIGHT);
+        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeAdaptionSetting.LIGHT_REDUCTION);
 
-        verify(feedPreferences, times(1)).setVolumeReductionSetting(VolumeReductionSetting.LIGHT);
+        verify(feedPreferences, times(1)).setVolumeAdaptionSetting(VolumeAdaptionSetting.LIGHT_REDUCTION);
 
         verify(mediaPlayer, never()).pause(anyBoolean(), anyBoolean());
         verify(mediaPlayer, never()).resume();
@@ -168,9 +168,9 @@ public class PlaybackVolumeUpdaterTest {
         when(mediaPlayer.getPlayable()).thenReturn(feedMedia);
         FeedPreferences feedPreferences = mockFeedPreferences(feedMedia, FEED_ID);
 
-        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.LIGHT);
+        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeAdaptionSetting.LIGHT_REDUCTION);
 
-        verify(feedPreferences, times(1)).setVolumeReductionSetting(VolumeReductionSetting.LIGHT);
+        verify(feedPreferences, times(1)).setVolumeAdaptionSetting(VolumeAdaptionSetting.LIGHT_REDUCTION);
 
         verify(mediaPlayer, never()).pause(anyBoolean(), anyBoolean());
         verify(mediaPlayer, never()).resume();
@@ -186,9 +186,9 @@ public class PlaybackVolumeUpdaterTest {
         when(mediaPlayer.getPlayable()).thenReturn(feedMedia);
         FeedPreferences feedPreferences = mockFeedPreferences(feedMedia, FEED_ID);
 
-        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.LIGHT);
+        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeAdaptionSetting.LIGHT_REDUCTION);
 
-        verify(feedPreferences, times(1)).setVolumeReductionSetting(VolumeReductionSetting.LIGHT);
+        verify(feedPreferences, times(1)).setVolumeAdaptionSetting(VolumeAdaptionSetting.LIGHT_REDUCTION);
 
         verify(mediaPlayer, never()).pause(anyBoolean(), anyBoolean());
         verify(mediaPlayer, never()).resume();
@@ -204,9 +204,9 @@ public class PlaybackVolumeUpdaterTest {
         when(mediaPlayer.getPlayable()).thenReturn(feedMedia);
         FeedPreferences feedPreferences = mockFeedPreferences(feedMedia, FEED_ID);
 
-        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeReductionSetting.HEAVY);
+        playbackVolumeUpdater.updateVolumeIfNecessary(mediaPlayer, FEED_ID, VolumeAdaptionSetting.HEAVY_REDUCTION);
 
-        verify(feedPreferences, times(1)).setVolumeReductionSetting(VolumeReductionSetting.HEAVY);
+        verify(feedPreferences, times(1)).setVolumeAdaptionSetting(VolumeAdaptionSetting.HEAVY_REDUCTION);
 
         verify(mediaPlayer, times(1)).pause(false, false);
         verify(mediaPlayer, times(1)).resume();