From 259e64c31f72bf54a7f54544c10472107e8c752c Mon Sep 17 00:00:00 2001
From: David Phillips <dbphillipsnz@gmail.com>
Date: Tue, 15 Mar 2016 12:21:10 +1300
Subject: Add simplified test for multiple tracks

---
 .gitignore                                    |  1 -
 test/004-two-tracks.test/run.sh               | 18 ++++++++++++++++++
 test/004-two-tracks.test/stdout.expected      |  4 ++++
 test/004-two-tracks.test/track_1.raw.expected |  1 +
 test/004-two-tracks.test/track_2.raw.expected |  1 +
 test/004-two-tracks.test/track_3.raw.expected |  1 +
 test/004-two-tracks.test/track_4.raw.expected |  1 +
 7 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 test/004-two-tracks.test/run.sh
 create mode 100644 test/004-two-tracks.test/stdout.expected
 create mode 100644 test/004-two-tracks.test/track_1.raw.expected
 create mode 100644 test/004-two-tracks.test/track_2.raw.expected
 create mode 100644 test/004-two-tracks.test/track_3.raw.expected
 create mode 100644 test/004-two-tracks.test/track_4.raw.expected

diff --git a/.gitignore b/.gitignore
index 9667459..7785a85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 cue-bin-split
 *.o
-track_*
 *.bin
 *.cue
 *.raw
diff --git a/test/004-two-tracks.test/run.sh b/test/004-two-tracks.test/run.sh
new file mode 100644
index 0000000..7bb987c
--- /dev/null
+++ b/test/004-two-tracks.test/run.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# create large file
+echo 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ > raw
+
+echo -e '0:0:0\n0:1:0\n0:4:0\n0:10:0' | ${EXECUTABLE} -r 1 -c 1 -s 1 -i raw -f track_%d.raw
+
+
+for track in track_{1..4}.raw ; do
+	diff $track $track.expected >/dev/null
+	if [ $? -eq 0 ] ; then
+		rm $track
+	else
+		exit 1
+	fi
+done
+
+rm raw
diff --git a/test/004-two-tracks.test/stdout.expected b/test/004-two-tracks.test/stdout.expected
new file mode 100644
index 0000000..fc02f0b
--- /dev/null
+++ b/test/004-two-tracks.test/stdout.expected
@@ -0,0 +1,4 @@
+track_1.raw starts 0.000000 s, finishes 1.000000 s
+track_2.raw starts 1.000000 s, finishes 4.000000 s
+track_3.raw starts 4.000000 s, finishes 10.000000 s
+track_4.raw starts 10.000000 s, finishes EOF
diff --git a/test/004-two-tracks.test/track_1.raw.expected b/test/004-two-tracks.test/track_1.raw.expected
new file mode 100644
index 0000000..c227083
--- /dev/null
+++ b/test/004-two-tracks.test/track_1.raw.expected
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/test/004-two-tracks.test/track_2.raw.expected b/test/004-two-tracks.test/track_2.raw.expected
new file mode 100644
index 0000000..d800886
--- /dev/null
+++ b/test/004-two-tracks.test/track_2.raw.expected
@@ -0,0 +1 @@
+123
\ No newline at end of file
diff --git a/test/004-two-tracks.test/track_3.raw.expected b/test/004-two-tracks.test/track_3.raw.expected
new file mode 100644
index 0000000..be01025
--- /dev/null
+++ b/test/004-two-tracks.test/track_3.raw.expected
@@ -0,0 +1 @@
+456789
\ No newline at end of file
diff --git a/test/004-two-tracks.test/track_4.raw.expected b/test/004-two-tracks.test/track_4.raw.expected
new file mode 100644
index 0000000..72d007b
--- /dev/null
+++ b/test/004-two-tracks.test/track_4.raw.expected
@@ -0,0 +1 @@
+ABCDEFGHIJKLMNOPQRSTUVWXYZ
-- 
cgit v1.1


From ccf29e81fb1098d296e525d0d735d3e84cf44bed Mon Sep 17 00:00:00 2001
From: David Phillips <dbphillipsnz@gmail.com>
Date: Tue, 15 Mar 2016 23:01:39 +1300
Subject: Rename test to something that actually describes what it tests

---
 test/004-multi-tracks.test/run.sh               | 18 ++++++++++++++++++
 test/004-multi-tracks.test/stdout.expected      |  4 ++++
 test/004-multi-tracks.test/track_1.raw.expected |  1 +
 test/004-multi-tracks.test/track_2.raw.expected |  1 +
 test/004-multi-tracks.test/track_3.raw.expected |  1 +
 test/004-multi-tracks.test/track_4.raw.expected |  1 +
 test/004-two-tracks.test/run.sh                 | 18 ------------------
 test/004-two-tracks.test/stdout.expected        |  4 ----
 test/004-two-tracks.test/track_1.raw.expected   |  1 -
 test/004-two-tracks.test/track_2.raw.expected   |  1 -
 test/004-two-tracks.test/track_3.raw.expected   |  1 -
 test/004-two-tracks.test/track_4.raw.expected   |  1 -
 12 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 test/004-multi-tracks.test/run.sh
 create mode 100644 test/004-multi-tracks.test/stdout.expected
 create mode 100644 test/004-multi-tracks.test/track_1.raw.expected
 create mode 100644 test/004-multi-tracks.test/track_2.raw.expected
 create mode 100644 test/004-multi-tracks.test/track_3.raw.expected
 create mode 100644 test/004-multi-tracks.test/track_4.raw.expected
 delete mode 100644 test/004-two-tracks.test/run.sh
 delete mode 100644 test/004-two-tracks.test/stdout.expected
 delete mode 100644 test/004-two-tracks.test/track_1.raw.expected
 delete mode 100644 test/004-two-tracks.test/track_2.raw.expected
 delete mode 100644 test/004-two-tracks.test/track_3.raw.expected
 delete mode 100644 test/004-two-tracks.test/track_4.raw.expected

diff --git a/test/004-multi-tracks.test/run.sh b/test/004-multi-tracks.test/run.sh
new file mode 100644
index 0000000..7bb987c
--- /dev/null
+++ b/test/004-multi-tracks.test/run.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# create large file
+echo 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ > raw
+
+echo -e '0:0:0\n0:1:0\n0:4:0\n0:10:0' | ${EXECUTABLE} -r 1 -c 1 -s 1 -i raw -f track_%d.raw
+
+
+for track in track_{1..4}.raw ; do
+	diff $track $track.expected >/dev/null
+	if [ $? -eq 0 ] ; then
+		rm $track
+	else
+		exit 1
+	fi
+done
+
+rm raw
diff --git a/test/004-multi-tracks.test/stdout.expected b/test/004-multi-tracks.test/stdout.expected
new file mode 100644
index 0000000..fc02f0b
--- /dev/null
+++ b/test/004-multi-tracks.test/stdout.expected
@@ -0,0 +1,4 @@
+track_1.raw starts 0.000000 s, finishes 1.000000 s
+track_2.raw starts 1.000000 s, finishes 4.000000 s
+track_3.raw starts 4.000000 s, finishes 10.000000 s
+track_4.raw starts 10.000000 s, finishes EOF
diff --git a/test/004-multi-tracks.test/track_1.raw.expected b/test/004-multi-tracks.test/track_1.raw.expected
new file mode 100644
index 0000000..c227083
--- /dev/null
+++ b/test/004-multi-tracks.test/track_1.raw.expected
@@ -0,0 +1 @@
+0
\ No newline at end of file
diff --git a/test/004-multi-tracks.test/track_2.raw.expected b/test/004-multi-tracks.test/track_2.raw.expected
new file mode 100644
index 0000000..d800886
--- /dev/null
+++ b/test/004-multi-tracks.test/track_2.raw.expected
@@ -0,0 +1 @@
+123
\ No newline at end of file
diff --git a/test/004-multi-tracks.test/track_3.raw.expected b/test/004-multi-tracks.test/track_3.raw.expected
new file mode 100644
index 0000000..be01025
--- /dev/null
+++ b/test/004-multi-tracks.test/track_3.raw.expected
@@ -0,0 +1 @@
+456789
\ No newline at end of file
diff --git a/test/004-multi-tracks.test/track_4.raw.expected b/test/004-multi-tracks.test/track_4.raw.expected
new file mode 100644
index 0000000..72d007b
--- /dev/null
+++ b/test/004-multi-tracks.test/track_4.raw.expected
@@ -0,0 +1 @@
+ABCDEFGHIJKLMNOPQRSTUVWXYZ
diff --git a/test/004-two-tracks.test/run.sh b/test/004-two-tracks.test/run.sh
deleted file mode 100644
index 7bb987c..0000000
--- a/test/004-two-tracks.test/run.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# create large file
-echo 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ > raw
-
-echo -e '0:0:0\n0:1:0\n0:4:0\n0:10:0' | ${EXECUTABLE} -r 1 -c 1 -s 1 -i raw -f track_%d.raw
-
-
-for track in track_{1..4}.raw ; do
-	diff $track $track.expected >/dev/null
-	if [ $? -eq 0 ] ; then
-		rm $track
-	else
-		exit 1
-	fi
-done
-
-rm raw
diff --git a/test/004-two-tracks.test/stdout.expected b/test/004-two-tracks.test/stdout.expected
deleted file mode 100644
index fc02f0b..0000000
--- a/test/004-two-tracks.test/stdout.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-track_1.raw starts 0.000000 s, finishes 1.000000 s
-track_2.raw starts 1.000000 s, finishes 4.000000 s
-track_3.raw starts 4.000000 s, finishes 10.000000 s
-track_4.raw starts 10.000000 s, finishes EOF
diff --git a/test/004-two-tracks.test/track_1.raw.expected b/test/004-two-tracks.test/track_1.raw.expected
deleted file mode 100644
index c227083..0000000
--- a/test/004-two-tracks.test/track_1.raw.expected
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/test/004-two-tracks.test/track_2.raw.expected b/test/004-two-tracks.test/track_2.raw.expected
deleted file mode 100644
index d800886..0000000
--- a/test/004-two-tracks.test/track_2.raw.expected
+++ /dev/null
@@ -1 +0,0 @@
-123
\ No newline at end of file
diff --git a/test/004-two-tracks.test/track_3.raw.expected b/test/004-two-tracks.test/track_3.raw.expected
deleted file mode 100644
index be01025..0000000
--- a/test/004-two-tracks.test/track_3.raw.expected
+++ /dev/null
@@ -1 +0,0 @@
-456789
\ No newline at end of file
diff --git a/test/004-two-tracks.test/track_4.raw.expected b/test/004-two-tracks.test/track_4.raw.expected
deleted file mode 100644
index 72d007b..0000000
--- a/test/004-two-tracks.test/track_4.raw.expected
+++ /dev/null
@@ -1 +0,0 @@
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
-- 
cgit v1.1