From be232d482f015cb74150edfa517e9a26b67eebe2 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Mon, 25 Apr 2011 20:51:02 +0200
Subject: [PATCH] Code simplification; cosmetics

---
 tests/test-222stereo_mode.rb | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/tests/test-222stereo_mode.rb b/tests/test-222stereo_mode.rb
index aff46f102..83ad25b0b 100644
--- a/tests/test-222stereo_mode.rb
+++ b/tests/test-222stereo_mode.rb
@@ -2,41 +2,32 @@
 
 class T_222stereo_mode < Test
   def description
-    return "mkvmerge / Stereo mode flag for video tracks / in(AVI)"
+    "mkvmerge / Stereo mode flag for video tracks / in(AVI)"
   end
 
   def run
-    merge(tmp + "-1",
+    merge tmp + "-1",
            "-A --stereo-mode 0:mono data/avi/v.avi " +
            "-A --stereo-mode 0:side_by_side_left_first data/avi/v.avi " +
            "-A --stereo-mode 0:top_bottom_right_first data/avi/v.avi " +
-           "-A --stereo-mode 0:top_bottom_left_first data/avi/v.avi ")
-    if (!FileTest.exist?(tmp + "-1"))
-      error("First merge failed")
-    end
+           "-A --stereo-mode 0:top_bottom_left_first data/avi/v.avi "
+    error "First merge failed" if !FileTest.exist? tmp + "-1"
 
-    hash = hash_file(tmp + "-1")
+    hash = [ hash_file(tmp + "-1") ]
 
-    merge(tmp + "-2",
+    merge tmp + "-2",
            "--stereo-mode 4:mono --stereo-mode 3:side_by_side_left_first " +
-           "--stereo-mode 2:top_bottom_right_first --stereo-mode 1:top_bottom_left_first #{tmp}-1")
-    File.unlink(tmp + "-1")
-    if (!FileTest.exist?(tmp + "-2"))
-      error("Second merge failed")
-    end
+           "--stereo-mode 2:top_bottom_right_first --stereo-mode 1:top_bottom_left_first #{tmp}-1"
+    error "Second merge failed" if !FileTest.exist? tmp + "-2"
 
-    hash += "-" + hash_file(tmp + "-2")
+    hash << hash_file(tmp + "-2")
 
-    merge(tmp + "-3", tmp + "-2")
-    File.unlink(tmp + "-2")
-    if (!FileTest.exist?(tmp + "-3"))
-      error("Third merge failed")
-    end
+    merge tmp + "-3", tmp + "-2"
+    error "Third merge failed" if !FileTest.exist? tmp + "-3"
 
-    hash += "-" + hash_file(tmp + "-3")
-    File.unlink(tmp + "-3")
+    hash << hash_file(tmp + "-3")
 
-    return hash
+    hash.join"-"
   end
 end