MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/1327'

Browse Source
This commit is contained in:
Andrew DeMaria
2019-10-15 21:09:48 -06:00
parent 0d0683d066 78480ab766
commit 75a280457e
8 changed files with 40 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/test/java/org/airsonic/player/controller/HLSControllerTestCase.java
+6 -6
View File
@@ -20,7 +20,7 @@
package org.airsonic.player.controller;
import junit.framework.TestCase;
import org.airsonic.player.util.Pair;
import org.apache.commons.lang3.tuple.Pair;
import java.awt.*;
@@ -34,13 +34,13 @@ public class HLSControllerTestCase extends TestCase {
HLSController controller = new HLSController();
Pair<Integer,Dimension> pair = controller.parseBitRate("1000");
assertEquals(1000, pair.getFirst().intValue());
assertNull(pair.getSecond());
assertEquals(1000, pair.getLeft().intValue());
assertNull(pair.getRight());
pair = controller.parseBitRate("1000@400x300");
assertEquals(1000, pair.getFirst().intValue());
assertEquals(400, pair.getSecond().width);
assertEquals(300, pair.getSecond().height);
assertEquals(1000, pair.getLeft().intValue());
assertEquals(400, pair.getRight().width);
assertEquals(300, pair.getRight().height);
try {
controller.parseBitRate("asdfl");