From b005c487b4e972472105cbead582ed5febe2dc92 Mon Sep 17 00:00:00 2001
From: Robert Haines <rhaines@manchester.ac.uk>
Date: Thu, 1 Sep 2016 12:15:30 +0100
Subject: [PATCH] Clean up file permissions tests.

Now we don't differentiate between Windows and Linux in the library code for
this, we don't need separate tests.
---
 test/file_permissions_test.rb | 47 ++++++++++++-----------------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/test/file_permissions_test.rb b/test/file_permissions_test.rb
index dbef5fac..fd666b88 100644
--- a/test/file_permissions_test.rb
+++ b/test/file_permissions_test.rb
@@ -10,48 +10,33 @@ def teardown
     ::File.unlink(FILENAME)
   end
 
-  if ::Zip::RUNNING_ON_WINDOWS
-    # Windows tests
-
-    DEFAULT_PERMS = 0644
+  def test_current_umask
+    create_files
+    assert_matching_permissions FILENAME, ZIPNAME
+  end
 
-    def test_windows_perms
+  def test_umask_000
+    set_umask(0000) do
       create_files
-      assert_matching_permissions FILENAME, ZIPNAME
     end
 
-  else
-    # Unix tests
+    assert_matching_permissions FILENAME, ZIPNAME
+  end
 
-    def test_current_umask
+  def test_umask_066
+    set_umask(0066) do
       create_files
-      assert_matching_permissions FILENAME, ZIPNAME
-    end
-
-    def test_umask_000
-      set_umask(0000) do
-        create_files
-      end
-
-      assert_matching_permissions FILENAME, ZIPNAME
     end
 
-    def test_umask_066
-      set_umask(0066) do
-        create_files
-      end
-
-      assert_matching_permissions FILENAME, ZIPNAME
-    end
-
-    def test_umask_027
-      set_umask(0027) do
-        create_files
-      end
+    assert_matching_permissions FILENAME, ZIPNAME
+  end
 
-      assert_matching_permissions FILENAME, ZIPNAME
+  def test_umask_027
+    set_umask(0027) do
+      create_files
     end
 
+    assert_matching_permissions FILENAME, ZIPNAME
   end
 
   def assert_matching_permissions(expected_file, actual_file)