Skip to content

Commit

Permalink
Test code clean
Browse files Browse the repository at this point in the history
  • Loading branch information
@hdsdi3g
hdsdi3g committed Jul 19, 2024
1 parent 9fbbdc2 commit e77fef8
Show file tree
Hide file tree
Showing 51 changed files with 242 additions and 312 deletions.
7 changes: 3 additions & 4 deletions fflauncher/src/test/java/tv/hd3g/fflauncher/ConversionToolParameterReferenceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,15 @@ class ConversionToolParameterReferenceTest {
ConversionToolParameterReference ctprF;

@BeforeEach
void setUp() throws Exception {
void setUp() {
ctprS = new ConversionToolParameterReference("reference", "<%var%>", Arrays.asList("before1", "before2"));
ctprF = new ConversionToolParameterReference(tempFile, "<%var%>", Arrays.asList("before1", "before2"));
}

@Test
void testNullConstructor() {
final var ctprS = new ConversionToolParameterReference("reference", "<%var%>",
null);
final var ctprF = new ConversionToolParameterReference(tempFile, "<%var%>", null);
ctprS = new ConversionToolParameterReference("reference", "<%var%>", null);
ctprF = new ConversionToolParameterReference(tempFile, "<%var%>", null);

assertEquals(Collections.emptyList(), ctprS.getParametersListBeforeRef());
assertEquals(Collections.emptyList(), ctprF.getParametersListBeforeRef());
Expand Down
11 changes: 3 additions & 8 deletions fflauncher/src/test/java/tv/hd3g/fflauncher/ConversionToolTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package tv.hd3g.fflauncher;

import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.toUnmodifiableList;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand All @@ -44,7 +43,7 @@
class ConversionToolTest {

@Test
void test() throws IOException {
void test() {
final var ct = new ConversionTool("java");
ct.getInternalParameters().addParameters("-firstparam");

Expand Down Expand Up @@ -178,10 +177,6 @@ void testManageOutFiles() throws IOException {
assertFalse(f1.exists());
assertFalse(f2.exists());
assertFalse(f3.exists());
// Flacky on windows
/*assertFalse(d1.exists());
assertTrue(d1.getParentFile().exists());
assertTrue(d1.getParentFile().delete());*/
}

@Nested
Expand Down Expand Up @@ -276,7 +271,7 @@ void testSpacesInInputOutputFileNames() {
throw new UncheckedIOException(e);
}
})
.collect(toUnmodifiableList());
.toList();

ct.addInputSource(files.get(0), "IN0");
ct.addInputSource(files.get(1), "IN1", List.of());
Expand All @@ -291,7 +286,7 @@ void testSpacesInInputOutputFileNames() {
ct.setFixIOParametredVars(PREPEND_PARAM_AT_START, APPEND_PARAM_AT_END);

final var p = ct.getReadyToRunParameters();
final var filesNames = files.stream().map(File::getPath).collect(Collectors.toUnmodifiableList());
final var filesNames = files.stream().map(File::getPath).toList();

final var params = new ArrayList<>();
for (var pos = 0; pos < 10; pos++) {
Expand Down
17 changes: 9 additions & 8 deletions fflauncher/src/test/java/tv/hd3g/fflauncher/about/AboutTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import java.nio.file.Files;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -77,10 +76,11 @@ void testVersion() {
void testCodecs() {
final var list = FFAboutCodec.parse(readLinesFromResource("test-codecs.txt"));

final var test1 = list.stream().filter(c -> (c.type == CodecType.AUDIO & c.encodingSupported
& c.decodingSupported & c.lossyCompression
& c.name.equals("adpcm_g722"))).collect(Collectors
.toUnmodifiableList());
final var test1 = list.stream()
.filter(c -> (c.type == CodecType.AUDIO & c.encodingSupported
& c.decodingSupported & c.lossyCompression
& c.name.equals("adpcm_g722")))
.toList();

assertEquals(1, test1.size());
assertEquals("G.722 ADPCM", test1.get(0).longName);
Expand Down Expand Up @@ -111,8 +111,9 @@ void testFormats() {

assertEquals(326, list.size());

final var test1 = list.stream().filter(f -> (f.muxing == false & f.demuxing == true & f.name.equals(
"bfi"))).collect(Collectors.toUnmodifiableList());
final var test1 = list.stream()
.filter(f -> (f.muxing == false & f.demuxing == true & f.name.equals("bfi")))
.toList();

assertEquals(1, test1.size());
assertEquals("Brute Force & Ignorance", test1.get(0).longName);
Expand All @@ -135,7 +136,7 @@ void testDevices() {
assertEquals("OSS (Open Sound System) playback [oss] muxing and demuxing supported", list.get(i++).toString());
assertEquals("Video4Linux2 output device [v4l2] muxing only supported", list.get(i++).toString());
assertEquals("Video4Linux2 device grab [video4linux2, v4l2] demuxing only supported", list.get(i++).toString());
assertEquals("[libcdio] demuxing only supported", list.get(i++).toString());
assertEquals("[libcdio] demuxing only supported", list.get(i).toString());
}

@Test
Expand Down
13 changes: 6 additions & 7 deletions fflauncher/src/test/java/tv/hd3g/fflauncher/acm/ACMAudioChannelSelectorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package tv.hd3g.fflauncher.acm;

import static java.util.stream.Collectors.toUnmodifiableList;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;

Expand Down Expand Up @@ -50,12 +49,12 @@ void testGetPosInStream() {
@Test
void testCompareTo() {
final var compared = List.of(
new AudioChannelSelector(3),
new AudioChannelSelector(1),
new AudioChannelSelector(2)).stream()
.sorted()
.map(AudioChannelSelector::getPosInStream)
.collect(toUnmodifiableList());
new AudioChannelSelector(3),
new AudioChannelSelector(1),
new AudioChannelSelector(2)).stream()
.sorted()
.map(AudioChannelSelector::getPosInStream)
.toList();
assertEquals(List.of(1, 2, 3), compared);
}

Expand Down
3 changes: 1 addition & 2 deletions fflauncher/src/test/java/tv/hd3g/fflauncher/acm/AudioChannelManipulationSetupTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package tv.hd3g.fflauncher.acm;

import static java.util.stream.Collectors.toUnmodifiableList;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand Down Expand Up @@ -374,7 +373,7 @@ static List<OutputAudioChannel> checkOutputAudioStream(final OutputAudioStream o
assertEquals(fileIndex, outStream.getFileIndex());
assertEquals(streamIndex, outStream.getStreamIndex());
assertEquals(layout, outStream.getLayout());
return outStream.getChannels().stream().sorted().collect(toUnmodifiableList());
return outStream.getChannels().stream().sorted().toList();
}

}
26 changes: 13 additions & 13 deletions fflauncher/src/test/java/tv/hd3g/fflauncher/acm/AudioChannelManipulationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@
import tv.hd3g.processlauncher.cmdline.Parameters;

class AudioChannelManipulationTest {
final static InputAudioStream inMono0 = new InputAudioStream(MONO, 0, 1);
final static InputAudioStream inMono1 = new InputAudioStream(MONO, 0, 2);
final static InputAudioStream inMono2 = new InputAudioStream(MONO, 0, 3);
final static InputAudioStream inMono3 = new InputAudioStream(MONO, 0, 4);
final static InputAudioStream inStereo = new InputAudioStream(STEREO, 1, 0);
final static OutputAudioStream outStreamMono0 = new OutputAudioStream(MONO, 0, 0)
static final InputAudioStream inMono0 = new InputAudioStream(MONO, 0, 1);
static final InputAudioStream inMono1 = new InputAudioStream(MONO, 0, 2);
static final InputAudioStream inMono2 = new InputAudioStream(MONO, 0, 3);
static final InputAudioStream inMono3 = new InputAudioStream(MONO, 0, 4);
static final InputAudioStream inStereo = new InputAudioStream(STEREO, 1, 0);
static final OutputAudioStream outStreamMono0 = new OutputAudioStream(MONO, 0, 0)
.mapChannel(inStereo, IN_CH0);
final static OutputAudioStream outStreamMono1 = new OutputAudioStream(MONO, 0, 1)
static final OutputAudioStream outStreamMono1 = new OutputAudioStream(MONO, 0, 1)
.mapChannel(inStereo, IN_CH1);
final static OutputAudioStream outStreamStereo0 = new OutputAudioStream(STEREO, 1, 0)
static final OutputAudioStream outStreamStereo0 = new OutputAudioStream(STEREO, 1, 0)
.mapChannel(inMono1, IN_CH0)
.mapChannel(inMono0, IN_CH0);
final static OutputAudioStream outStreamStereo1 = new OutputAudioStream(STEREO, 2, 1)
static final OutputAudioStream outStreamStereo1 = new OutputAudioStream(STEREO, 2, 1)
.mapChannel(inMono2, IN_CH0)
.mapChannel(inMono3, IN_CH0);
final static OutputAudioStream outStreamSimpleMono = new OutputAudioStream(MONO, 0, 1)
static final OutputAudioStream outStreamSimpleMono = new OutputAudioStream(MONO, 0, 1)
.mapChannel(inMono0, IN_CH0);

@Test
Expand Down Expand Up @@ -135,12 +135,12 @@ void testACMSandbox_split() {

@Test
void testACMSandbox_split_duplicate() {
final var outStreamMono0 = new OutputAudioStream(MONO, 0, 0)
final var o = new OutputAudioStream(MONO, 0, 0)
.mapChannel(inStereo, IN_CH0);
final var outStreamMono0Again = new OutputAudioStream(MONO, 0, 1)
.mapChannel(inStereo, IN_CH0);

final var acm = new AudioChannelManipulation(List.of(outStreamMono0, outStreamMono0Again));
final var acm = new AudioChannelManipulation(List.of(o, outStreamMono0Again));
assertEquals(2, acm.getToSplitFilterList().size());
final var splitFilter0 = acm.getToSplitFilterList().get(0).toFilter();
assertEquals("channelsplit", splitFilter0.getFilterName());
Expand All @@ -154,7 +154,7 @@ void testACMSandbox_split_duplicate() {

assertTrue(acm.getMergeJoinList().isEmpty());
assertTrue(acm.getStreamRemapFilterMap().isEmpty());
assertEquals(List.of(outStreamMono0, outStreamMono0Again), acm.getAllOutputStreams());
assertEquals(List.of(o, outStreamMono0Again), acm.getAllOutputStreams());
}

@Test
Expand Down
3 changes: 1 addition & 2 deletions fflauncher/src/test/java/tv/hd3g/fflauncher/acm/MakeScriptTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import static java.nio.file.StandardOpenOption.CREATE_NEW;
import static java.nio.file.StandardOpenOption.WRITE;
import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.toUnmodifiableList;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static tv.hd3g.fflauncher.acm.InputAudioChannelSelector.IN_CH0;
import static tv.hd3g.fflauncher.acm.InputAudioChannelSelector.IN_CH1;
Expand Down Expand Up @@ -59,7 +58,7 @@ void writeScript() throws IOException {
IntStream.range(0, 4).forEach(pos -> content.add(createAudioGeneratedFile(pos)));
final var inStreams = IntStream.range(0, 8)
.mapToObj(pos -> new InputAudioStream(MONO, pos, 0))
.collect(toUnmodifiableList());
.toList();

content.add("# createMerge");
final var fileToSplit = createMerge(content, inStreams);
Expand Down
89 changes: 44 additions & 45 deletions fflauncher/src/test/java/tv/hd3g/fflauncher/acm/OutputAudioStreamTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import static tv.hd3g.fflauncher.enums.ChannelLayout.STEREO;

import java.util.List;
import java.util.stream.Collectors;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
Expand All @@ -56,7 +55,7 @@ void init() {
@Test
void testEqualsObject() {
assertEquals(new OutputAudioStream(CH5_1_SIDE, 0, 1),
new OutputAudioStream(CH5_1_SIDE, 0, 1));
new OutputAudioStream(CH5_1_SIDE, 0, 1));
}

@Test
Expand Down Expand Up @@ -101,42 +100,42 @@ void testAddChannel() {
@Test
void testCompareTo() {
final var streams = List.of(new OutputAudioStream(STEREO, 1, 1),
new OutputAudioStream(STEREO, 0, 0),
new OutputAudioStream(MONO, 0, 1),
new OutputAudioStream(STEREO, 1, 0)).stream()
.sorted()
.map(OutputAudioStream::toString)
.collect(joining(","));
new OutputAudioStream(STEREO, 0, 0),
new OutputAudioStream(MONO, 0, 1),
new OutputAudioStream(STEREO, 1, 0)).stream()
.sorted()
.map(OutputAudioStream::toString)
.collect(joining(","));
assertEquals("0:0(stereo),0:1(mono),1:0(stereo),1:1(stereo)", streams);
}

@Test
void testMapChannel_full() {
final var inputAudioStream = new InputAudioStream(STEREO, 0, 1);
assertThrows(IllegalArgumentException.class, () -> audioStream.mapChannel(inputAudioStream, IN_CH2, OUT_CH0));
assertEquals(audioStream, audioStream.mapChannel(inputAudioStream, IN_CH0, OUT_CH0));
assertEquals(audioStream, audioStream.mapChannel(inputAudioStream, IN_CH1, OUT_CH1));
assertThrows(IllegalArgumentException.class, () -> audioStream.mapChannel(inputAudioStream, IN_CH1, OUT_CH2));
final var s = new InputAudioStream(STEREO, 0, 1);
assertThrows(IllegalArgumentException.class, () -> audioStream.mapChannel(s, IN_CH2, OUT_CH0));
assertEquals(audioStream, audioStream.mapChannel(s, IN_CH0, OUT_CH0));
assertEquals(audioStream, audioStream.mapChannel(s, IN_CH1, OUT_CH1));
assertThrows(IllegalArgumentException.class, () -> audioStream.mapChannel(s, IN_CH1, OUT_CH2));
assertEquals(2, audioStream.getChannels().size());
final var channels = audioStream.getChannels().stream()
.sorted()
.map(OutputAudioChannel::toString)
.collect(joining(","));
.sorted()
.map(OutputAudioChannel::toString)
.collect(joining(","));
assertEquals("0:1(stereo).CHIN_0->0:1(stereo).CHOUT_0,0:1(stereo).CHIN_1->0:1(stereo).CHOUT_1", channels);
}

@Test
void testMapChannel_simpleordered() {
final var inputAudioStream = new InputAudioStream(STEREO, 0, 1);
assertThrows(IllegalArgumentException.class, () -> audioStream.mapChannel(inputAudioStream, IN_CH2));
assertEquals(audioStream, audioStream.mapChannel(inputAudioStream, IN_CH1));
assertEquals(audioStream, audioStream.mapChannel(inputAudioStream, IN_CH0));
assertThrows(IllegalArgumentException.class, () -> audioStream.mapChannel(inputAudioStream, IN_CH1));
final var s = new InputAudioStream(STEREO, 0, 1);
assertThrows(IllegalArgumentException.class, () -> audioStream.mapChannel(s, IN_CH2));
assertEquals(audioStream, audioStream.mapChannel(s, IN_CH1));
assertEquals(audioStream, audioStream.mapChannel(s, IN_CH0));
assertThrows(IllegalArgumentException.class, () -> audioStream.mapChannel(s, IN_CH1));
assertEquals(2, audioStream.getChannels().size());
final var channels = audioStream.getChannels().stream()
.sorted()
.map(OutputAudioChannel::toString)
.collect(joining(","));
.sorted()
.map(OutputAudioChannel::toString)
.collect(joining(","));
assertEquals("0:1(stereo).CHIN_1->0:1(stereo).CHOUT_0,0:1(stereo).CHIN_0->0:1(stereo).CHOUT_1", channels);
}

Expand All @@ -153,31 +152,31 @@ void init() {
@Test
void testOutputAudioChannel() {
assertThrows(IllegalArgumentException.class,
() -> audioStream.new OutputAudioChannel(inputAudioStream, IN_CH2, audioStream, OUT_CH0));
() -> audioStream.new OutputAudioChannel(inputAudioStream, IN_CH2, audioStream, OUT_CH0));
assertThrows(IllegalArgumentException.class,
() -> audioStream.new OutputAudioChannel(inputAudioStream, IN_CH0, audioStream, OUT_CH2));
() -> audioStream.new OutputAudioChannel(inputAudioStream, IN_CH0, audioStream, OUT_CH2));
}

@Test
void testCompareTo() {
final var audioStream2 = new OutputAudioStream(MONO, 0, 0);

final var channels = List.of(
audioStream.new OutputAudioChannel(inputAudioStream, IN_CH1, audioStream, OUT_CH1),
audioStream.new OutputAudioChannel(inputAudioStream, IN_CH1, audioStream, OUT_CH0),
audioStream2.new OutputAudioChannel(inputAudioStream, IN_CH0, audioStream2, OUT_CH0),
audioStream.new OutputAudioChannel(inputAudioStream, IN_CH0, audioStream, OUT_CH1),
audioStream.new OutputAudioChannel(inputAudioStream, IN_CH0, audioStream, OUT_CH0)).stream()
.sorted()
.map(OutputAudioChannel::toString)
.collect(Collectors.toUnmodifiableList());
audioStream.new OutputAudioChannel(inputAudioStream, IN_CH1, audioStream, OUT_CH1),
audioStream.new OutputAudioChannel(inputAudioStream, IN_CH1, audioStream, OUT_CH0),
audioStream2.new OutputAudioChannel(inputAudioStream, IN_CH0, audioStream2, OUT_CH0),
audioStream.new OutputAudioChannel(inputAudioStream, IN_CH0, audioStream, OUT_CH1),
audioStream.new OutputAudioChannel(inputAudioStream, IN_CH0, audioStream, OUT_CH0)).stream()
.sorted()
.map(OutputAudioChannel::toString)
.toList();
assertEquals(
List.of("0:1(stereo).CHIN_0->0:0(mono).CHOUT_0",
"0:1(stereo).CHIN_1->0:1(stereo).CHOUT_0",
"0:1(stereo).CHIN_0->0:1(stereo).CHOUT_0",
"0:1(stereo).CHIN_1->0:1(stereo).CHOUT_1",
"0:1(stereo).CHIN_0->0:1(stereo).CHOUT_1"),
channels);
List.of("0:1(stereo).CHIN_0->0:0(mono).CHOUT_0",
"0:1(stereo).CHIN_1->0:1(stereo).CHOUT_0",
"0:1(stereo).CHIN_0->0:1(stereo).CHOUT_0",
"0:1(stereo).CHIN_1->0:1(stereo).CHOUT_1",
"0:1(stereo).CHIN_0->0:1(stereo).CHOUT_1"),
channels);
}

@Test
Expand Down Expand Up @@ -208,15 +207,15 @@ void testEquals() {
final var audioStream1 = new OutputAudioStream(STEREO, 1, 1);

assertEquals(audioStream0.new OutputAudioChannel(inputAudioStream0, IN_CH0, audioStream0, OUT_CH0),
channel);
channel);
assertNotEquals(audioStream0.new OutputAudioChannel(
inputAudioStream0, IN_CH1, audioStream0, OUT_CH0), channel);
inputAudioStream0, IN_CH1, audioStream0, OUT_CH0), channel);
assertNotEquals(audioStream0.new OutputAudioChannel(
inputAudioStream0, IN_CH0, audioStream0, OUT_CH1), channel);
inputAudioStream0, IN_CH0, audioStream0, OUT_CH1), channel);
assertNotEquals(audioStream0.new OutputAudioChannel(
inputAudioStream1, IN_CH0, audioStream0, OUT_CH0), channel);
inputAudioStream1, IN_CH0, audioStream0, OUT_CH0), channel);
assertNotEquals(audioStream0.new OutputAudioChannel(
inputAudioStream0, IN_CH0, audioStream1, OUT_CH0), channel);
inputAudioStream0, IN_CH0, audioStream1, OUT_CH0), channel);
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion fflauncher/src/test/java/tv/hd3g/fflauncher/filtering/AudioFilterAMetadataTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class AudioFilterAMetadataTest {
Mode mode;

@BeforeEach
void init() throws Exception {
void init() {
mode = faker.options().option(Mode.class);
f = new AudioFilterAMetadata(mode);
}
Expand Down
2 changes: 1 addition & 1 deletion fflauncher/src/test/java/tv/hd3g/fflauncher/filtering/AudioFilterAPhasemeterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class AudioFilterAPhasemeterTest {
AudioFilterAPhasemeter f;

@BeforeEach
void init() throws Exception {
void init() {
f = new AudioFilterAPhasemeter();
}

Expand Down
Loading

0 comments on commit e77fef8

Please sign in to comment.