Update test cases for new test file locations

tests/results.txt

@@ -63,7 +63,7 @@ T_213mp4_broken_pixel_dimensions:4ab136f8ed75613590de7ded9d4bbb81:passed:2005091
 T_214one_frame_avi:8b5003e62e885d084c555f80020f1b30:passed:20051004-192755:0.033334586
 T_215X_codec_extradata_avi:3876bc3722144c16d4b1aec484d98c34-3fabc505fdd377c05ce4557b1bc13545:passed:20051004-194707:0.082329916
 T_216mp4_editlists:c67d7eda9eda56e99cf4b9a85d2aa0f2:passed:20051118-191453:0.040645125
-T_217file_identification:ef3c502529537c1d3699d0e0487751c3-713a636c5dbc8b6c8da4913f8e74904d-e13cf277c965e7e08d8698ea7425ecdc-c8a83cbee658c28ed4b8b46fa2ffc9d7-a275e9abb3cc154307663d5ca6fce615-3187bcbc4eb44d78f9eab3d4ca6ed787-d7678dc91cba91a946c22e5b96f3b3b6-3f60e3a03129d1e4610ae668459457cc-c170654ad0688c40fc9e2ceeb9ef0b9f-6b44c4e351ac48b7fdb63355c65783eb-d701319c3f77c58adfee92b1186a3993-12aa395d3bc0431c5acb81bc4407b70f-3e7956db47487933b47241fc7bc76359-52dfc8091ce64db9f8ad44aee34748ec-6b7149a5774a37d214b8085c6409aab3-15beba0108723bff77bf8d88876f8f31-72fabb6ff0194c82321db1c317b11c63-96daf75924808e093476fb1a88d1f314-434910cdf5c654f1b864d83f5816905b-3f953cbe9cedd498aff0765315876f86-e592a5d28c92ebb23fe6d7ea901ec0a9-f997737ca7eff867d33ee58af611e741:passed:20051209-180815:0.841701857
+T_217file_identification:ef3c502529537c1d3699d0e0487751c3-713a636c5dbc8b6c8da4913f8e74904d-e13cf277c965e7e08d8698ea7425ecdc-c8a83cbee658c28ed4b8b46fa2ffc9d7-a275e9abb3cc154307663d5ca6fce615-3187bcbc4eb44d78f9eab3d4ca6ed787-d7678dc91cba91a946c22e5b96f3b3b6-3f60e3a03129d1e4610ae668459457cc-c170654ad0688c40fc9e2ceeb9ef0b9f-6b44c4e351ac48b7fdb63355c65783eb-5c1571f8aa8d488a8fded13da5b543a2-66888ac269acd18d05fe455bce696345-89726ad978c5dcdf5275e070e36fff58-760f02a07e97f484c8f3f8aedcaa7b51-6b7149a5774a37d214b8085c6409aab3-15beba0108723bff77bf8d88876f8f31-f917620b6bb93673307d70018ff7b2be-96daf75924808e093476fb1a88d1f314-434910cdf5c654f1b864d83f5816905b-3f953cbe9cedd498aff0765315876f86-e592a5d28c92ebb23fe6d7ea901ec0a9-f997737ca7eff867d33ee58af611e741:passed:20051209-180815:0.841701857
 T_218theora:59986cbebb1a61762c16ae591ae8c345-88d9297a7f549c68aea49c3b4abf007a:passed:20060428-105054:0.71619861
 T_219srt_short_timecodes:1350b59f405cabe1107c752f009f2f2a:passed:20060926-112658:0.213195421
 T_220ass_with_comments_at_start:4aad786f675e15a5efd623cb8d822cff:passed:20060926-120101:0.839985533
@@ -177,7 +177,7 @@ T_328dts_detected_as_ac3:dfac59530d2d96ab9f41465fdc3931fd:passed:20111229-192324
 T_329X_timecodes_v2:dadc36ce79c1c4b281f8f1f865746598-049cdc2d9226fac8c61d193d803bfc1f-3720aac3f16b66ec3308ffa7bf913c6e-6469e2522a4b48b7b20bae93f5d9086d-1ff091abfcb0938d6ac7fd0495e899b3-049cdc2d9226fac8c61d193d803bfc1f-d172a9340cbf2802690479e396879d1e-bf76c5886cc7c18cc7e6ee796c3406b4-b3f9d126c31505c22f292a1d2bdffba2-4bd97467fac0ac0b561d68b8b15a79dd:passed:20120105-202451:2.051321822
 T_330dts_detection:38c941b579418e6c874950f4c55f84ce:passed:20120107-210130:1.22781858
 T_331read_buffer_underflow:bd81387fb27a29f797bf98a30b00cc36:passed:20120125-232902:0.407400904
-T_332eac3_misdetected_as_avc:23cfe7d9a9893fc5cd9dcd5eafab8389:passed:20120131-145550:0.452730804
+T_332eac3_misdetected_as_avc:95f20b6beea7ef4f9d7d94d6b77375f8:passed:20120131-145550:0.452730804
 T_333wavpack_with_correction:c561a04a67042b048f7059a80d1c366d-e33897409384ca5fd8ed5e497f8c3883+37f802510b43b2ab4bd7d8356a7ac606-ok:passed:20120131-164845:0.299865433
 T_334mp4_audio_encoder_delay:2afe7b533c9f1ed35168e60aaca20dff:passed:20120206-100443:0.195628019
 T_335ui_locale_cs_CZ:71fab8df9e8e061badc87c06cf36f544-a37e1bdc2b0c026c2970c08841c5e4df:passed:20120206-191406:0.506867942

tests/test-002aac.rb

@@ -6,7 +6,7 @@ class T_002aac < Test
   end
 
   def run
-    merge("data/simple/v.aac", 1)
+    merge("data/aac/v.aac", 1)
     return hash_tmp
   end
 end

tests/test-003ac3.rb

@@ -6,7 +6,7 @@ class T_003ac3 < Test
   end
 
   def run
-    merge("data/simple/v.ac3")
+    merge("data/ac3/v.ac3")
     return hash_tmp
   end
 end

tests/test-026sync_pcm.rb

@@ -6,9 +6,9 @@ class T_026sync_pcm < Test
   end
 
   def run
-    merge("--sync 0:500 data/simple/v.wav")
+    merge("--sync 0:500 data/wav/v.wav")
     hash = hash_tmp
-    merge("--sync 0:-500 data/simple/v.wav")
+    merge("--sync 0:-500 data/wav/v.wav")
     return hash + "-" + hash_tmp
   end
 end

tests/test-034ac3misdetected_as_mp2.rb

@@ -6,7 +6,7 @@ class T_034ac3misdetected_as_mp2 < Test
   end
 
   def run
-    merge("data/simple/misdetected_as_mp2.ac3")
+    merge("data/ac3/misdetected_as_mp2.ac3")
     return hash_tmp
   end
 end

tests/test-209ac3misdeetected_as_mpeges.rb

@@ -6,7 +6,7 @@ class T_209ac3misdeetected_as_mpeges < Test
   end
 
   def run
-    merge("data/simple/misdetected_as_mpeges.ac3")
+    merge("data/ac3/misdetected_as_mpeges.ac3")
     return hash_tmp
   end
 end

tests/test-217file_identification.rb

@@ -17,13 +17,13 @@ class T_217file_identification < Test
       "data/ogg/v.ogg",
       "data/rm/rv3.rm",
       "data/rm/rv4.rm",
-      "data/simple/misdetected_as_mp2.ac3",
-      "data/simple/misdetected_as_mpeges.ac3",
-      "data/simple/v.aac",
-      "data/simple/v.ac3",
+      "data/ac3/misdetected_as_mp2.ac3",
+      "data/ac3/misdetected_as_mpeges.ac3",
+      "data/aac/v.aac",
+      "data/ac3/v.ac3",
       "data/simple/v.flac",
       "data/simple/v.mp3",
-      "data/simple/v.wav",
+      "data/wav/v.wav",
       "data/textsubs/fe.ssa",
       "data/textsubs/vde.srt",
       "data/vobsub/ally1-short.sub",

tests/test-231X_ac3_header_removal.rb

@@ -6,7 +6,7 @@ class T_231X_ac3_header_removal < Test
   end
 
   def run
-    xtr_tracks "data/simple/ac3_header_removal.mka", "0:#{tmp}"
+    xtr_tracks "data/ac3/ac3_header_removal.mka", "0:#{tmp}"
     return hash_tmp
   end
 end

tests/test-235wav_fmt_chunk_length.rb

@@ -6,7 +6,7 @@ class T_235wav_fmt_chunk_length < Test
   end
 
   def run
-    merge("data/simple/dts-sample.dts.wav")
+    merge("data/wav/dts-sample.dts.wav")
     return hash_tmp
   end
 end

tests/test-237ac3_in_wav_iec61937_mode.rb

@@ -6,7 +6,7 @@ class T_237ac3_in_wav_iec61937_mode < Test
   end
 
   def run
-    merge("data/simple/shortsample.ac3.wav")
+    merge("data/ac3/shortsample.ac3.wav")
     return hash_tmp
   end
 end

tests/test-238ac3_in_wav_acm_mode.rb

@@ -6,7 +6,7 @@ class T_238ac3_in_wav_acm_mode < Test
   end
 
   def run
-    merge(1, "data/simple/Pirates.Of.The.Caribbean.At.Worlds.End_30secssample.wav")
+    merge(1, "data/wav/Pirates.Of.The.Caribbean.At.Worlds.End_30secssample.wav")
     return hash_tmp
   end
 end

tests/test-239aac_with_id3_tags.rb

@@ -6,7 +6,7 @@ class T_239aac_with_id3_tags < Test
   end
 
   def run
-    merge(1, "data/simple/aac-with-id3-tags.aac")
+    merge(1, "data/aac/aac-with-id3-tags.aac")
     return hash_tmp
   end
 end

tests/test-240dts_hd.rb

@@ -8,7 +8,7 @@ class T_240dts_hd < Test
   def run
     hashes = Array.new
 
-    merge("data/simple/dts-hd.dts")
+    merge("data/dts/dts-hd.dts")
     hashes << hash_tmp
 
     merge("-D data/vob/VC1WithDTSHD.EVO")

tests/test-241ac3_with_id3_tags.rb

@@ -6,7 +6,7 @@ class T_241ac3_with_id3_tags < Test
   end
 
   def run
-    merge("data/simple/ac3-with-id3-tags.ac3")
+    merge("data/ac3/ac3-with-id3-tags.ac3")
     return hash_tmp
   end
 end

tests/test-289wav_unsupported_formattag.rb

@@ -6,7 +6,7 @@ class T_289wav_unsupported_formattag < Test
   end
 
   def run
-    sys "../src/mkvmerge --identify data/simple/wmav2.wav", 3
+    sys "../src/mkvmerge --identify data/wav/wmav2.wav", 3
     ($? >> 8).to_s
   end
 end

tests/test-293aac_adif_misdetected_as_video.rb

@@ -6,7 +6,7 @@ class T_293aac_adif_misdetected_as_video < Test
   end
 
   def run
-    sys "../src/mkvmerge --identify data/simple/aac_adif.aac", 3
+    sys "../src/mkvmerge --identify data/aac/aac_adif.aac", 3
     ($? >> 8).to_s
   end
 end

tests/test-319wav_with_pcm_detected_as_dts.rb

@@ -6,7 +6,7 @@ class T_319wav_with_pcm_detected_as_dts < Test
   end
 
   def run
-    merge "data/simple/wav_with_pcm_detected_as_dts.wav"
+    merge "data/wav/wav_with_pcm_detected_as_dts.wav"
     hash_tmp
   end
 end

tests/test-332eac3_misdetected_as_avc.rb

@@ -2,4 +2,4 @@
 
 describe "mkvmerge / EAC3 misdetected as AVC ES"
 
-test_identify "data/simple/misdetected_as_avc.ac3"
+test_identify "data/ac3/misdetected_as_avc.ac3"