From 7f2248408cd9b2cd2c6a695b4fbb6e7a40eebb7d Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Sat, 20 Aug 2016 00:03:11 +0200
Subject: [PATCH] Normalize asset names.

---
 .../Homebrew/cask/test/cask/installer_test.rb | 228 +++++++++---------
 .../cask/test/support/Casks/bzipped-asset.rb  |   9 -
 .../cask/test/support/Casks/cab-container.rb  |  11 -
 .../cask/test/support/Casks/container-7z.rb   |  11 +
 .../test/support/Casks/container-bzip2.rb     |   9 +
 .../cask/test/support/Casks/container-cab.rb  |  11 +
 .../cask/test/support/Casks/container-dmg.rb  |   9 +
 .../cask/test/support/Casks/container-gzip.rb |   9 +
 .../cask/test/support/Casks/container-lzma.rb |  11 +
 .../cask/test/support/Casks/container-pkg.rb  |   7 +
 .../cask/test/support/Casks/container-rar.rb  |  11 +
 .../cask/test/support/Casks/container-sit.rb  |  11 +
 .../test/support/Casks/container-tar-gz.rb    |   9 +
 .../cask/test/support/Casks/container-xar.rb  |   9 +
 .../cask/test/support/Casks/container-xz.rb   |  11 +
 .../cask/test/support/Casks/gzipped-asset.rb  |   9 -
 .../cask/test/support/Casks/lzma-asset.rb     |  11 -
 .../cask/test/support/Casks/naked-pkg.rb      |   7 -
 .../cask/test/support/Casks/rar-container.rb  |  11 -
 .../test/support/Casks/sevenzip-container.rb  |  11 -
 .../test/support/Casks/stuffit-container.rb   |  11 -
 .../cask/test/support/Casks/tarball.rb        |   9 -
 .../cask/test/support/Casks/xar-container.rb  |   9 -
 .../cask/test/support/Casks/xzipped-asset.rb  |  11 -
 .../test/support/binaries/cabcontainer.cab    | Bin 139 -> 0 bytes
 .../cask/test/support/binaries/container.7z   | Bin 0 -> 143 bytes
 .../{bzipped_asset.bz2 => container.bz2}      | Bin
 .../cask/test/support/binaries/container.cab  | Bin 0 -> 95 bytes
 .../cask/test/support/binaries/container.dmg  | Bin 0 -> 25337 bytes
 .../cask/test/support/binaries/container.gz   | Bin 0 -> 47 bytes
 .../{lzma-asset.lzma => container.lzma}       | Bin
 .../binaries/{Naked.pkg => container.pkg}     | Bin
 .../cask/test/support/binaries/container.rar  | Bin 0 -> 87 bytes
 .../cask/test/support/binaries/container.sit  | Bin 0 -> 236 bytes
 .../test/support/binaries/container.tar.gz    | Bin 0 -> 154 bytes
 .../cask/test/support/binaries/container.xar  | Bin 0 -> 4679 bytes
 .../{xzipped-asset.xz => container.xz}        | Bin
 .../test/support/binaries/gzipped_asset.gz    | Bin 51 -> 0 bytes
 .../test/support/binaries/rarcontainer.rar    | Bin 308 -> 0 bytes
 .../support/binaries/sevenzipcontainer.7z     | Bin 247 -> 0 bytes
 .../cask/test/support/binaries/sheldonmac.sit | Bin 5633 -> 0 bytes
 .../cask/test/support/binaries/tarball.tgz    | Bin 188 -> 0 bytes
 .../test/support/binaries/xarcontainer.xar    | Bin 790 -> 0 bytes
 43 files changed, 232 insertions(+), 223 deletions(-)
 delete mode 100644 Library/Homebrew/cask/test/support/Casks/bzipped-asset.rb
 delete mode 100644 Library/Homebrew/cask/test/support/Casks/cab-container.rb
 create mode 100644 Library/Homebrew/cask/test/support/Casks/container-7z.rb
 create mode 100644 Library/Homebrew/cask/test/support/Casks/container-bzip2.rb
 create mode 100644 Library/Homebrew/cask/test/support/Casks/container-cab.rb
 create mode 100644 Library/Homebrew/cask/test/support/Casks/container-dmg.rb
 create mode 100644 Library/Homebrew/cask/test/support/Casks/container-gzip.rb
 create mode 100644 Library/Homebrew/cask/test/support/Casks/container-lzma.rb
 create mode 100644 Library/Homebrew/cask/test/support/Casks/container-pkg.rb
 create mode 100644 Library/Homebrew/cask/test/support/Casks/container-rar.rb
 create mode 100644 Library/Homebrew/cask/test/support/Casks/container-sit.rb
 create mode 100644 Library/Homebrew/cask/test/support/Casks/container-tar-gz.rb
 create mode 100644 Library/Homebrew/cask/test/support/Casks/container-xar.rb
 create mode 100644 Library/Homebrew/cask/test/support/Casks/container-xz.rb
 delete mode 100644 Library/Homebrew/cask/test/support/Casks/gzipped-asset.rb
 delete mode 100644 Library/Homebrew/cask/test/support/Casks/lzma-asset.rb
 delete mode 100644 Library/Homebrew/cask/test/support/Casks/naked-pkg.rb
 delete mode 100644 Library/Homebrew/cask/test/support/Casks/rar-container.rb
 delete mode 100644 Library/Homebrew/cask/test/support/Casks/sevenzip-container.rb
 delete mode 100644 Library/Homebrew/cask/test/support/Casks/stuffit-container.rb
 delete mode 100644 Library/Homebrew/cask/test/support/Casks/tarball.rb
 delete mode 100644 Library/Homebrew/cask/test/support/Casks/xar-container.rb
 delete mode 100644 Library/Homebrew/cask/test/support/Casks/xzipped-asset.rb
 delete mode 100644 Library/Homebrew/cask/test/support/binaries/cabcontainer.cab
 create mode 100644 Library/Homebrew/cask/test/support/binaries/container.7z
 rename Library/Homebrew/cask/test/support/binaries/{bzipped_asset.bz2 => container.bz2} (100%)
 mode change 100644 => 100755
 create mode 100644 Library/Homebrew/cask/test/support/binaries/container.cab
 create mode 100644 Library/Homebrew/cask/test/support/binaries/container.dmg
 create mode 100755 Library/Homebrew/cask/test/support/binaries/container.gz
 rename Library/Homebrew/cask/test/support/binaries/{lzma-asset.lzma => container.lzma} (100%)
 mode change 100644 => 100755
 rename Library/Homebrew/cask/test/support/binaries/{Naked.pkg => container.pkg} (100%)
 create mode 100644 Library/Homebrew/cask/test/support/binaries/container.rar
 create mode 100755 Library/Homebrew/cask/test/support/binaries/container.sit
 create mode 100644 Library/Homebrew/cask/test/support/binaries/container.tar.gz
 create mode 100644 Library/Homebrew/cask/test/support/binaries/container.xar
 rename Library/Homebrew/cask/test/support/binaries/{xzipped-asset.xz => container.xz} (100%)
 mode change 100644 => 100755
 delete mode 100644 Library/Homebrew/cask/test/support/binaries/gzipped_asset.gz
 delete mode 100644 Library/Homebrew/cask/test/support/binaries/rarcontainer.rar
 delete mode 100644 Library/Homebrew/cask/test/support/binaries/sevenzipcontainer.7z
 delete mode 100644 Library/Homebrew/cask/test/support/binaries/sheldonmac.sit
 delete mode 100644 Library/Homebrew/cask/test/support/binaries/tarball.tgz
 delete mode 100644 Library/Homebrew/cask/test/support/binaries/xarcontainer.xar

diff --git a/Library/Homebrew/cask/test/cask/installer_test.rb b/Library/Homebrew/cask/test/cask/installer_test.rb
index 6efd4affc2..14be16b1a6 100644
--- a/Library/Homebrew/cask/test/cask/installer_test.rb
+++ b/Library/Homebrew/cask/test/cask/installer_test.rb
@@ -16,45 +16,45 @@ describe Hbc::Installer do
     end
 
     it "works with dmg-based Casks" do
-      transmission = Hbc.load("local-transmission")
+      asset = Hbc.load("container-dmg")
 
       shutup do
-        Hbc::Installer.new(transmission).install
+        Hbc::Installer.new(asset).install
       end
 
-      dest_path = Hbc.caskroom.join("local-transmission", transmission.version)
+      dest_path = Hbc.caskroom.join("container-dmg", asset.version)
       dest_path.must_be :directory?
-      application = Hbc.appdir.join("Transmission.app")
-      application.must_be :directory?
+      file = Hbc.appdir.join("container")
+      file.must_be :file?
     end
 
-    it "works with tar-based Casks" do
-      tarball = Hbc.load("tarball")
+    it "works with tar-gz-based Casks" do
+      asset = Hbc.load("container-tar-gz")
 
       shutup do
-        Hbc::Installer.new(tarball).install
+        Hbc::Installer.new(asset).install
       end
 
-      dest_path = Hbc.caskroom.join("tarball", tarball.version)
+      dest_path = Hbc.caskroom.join("container-tar-gz", asset.version)
       dest_path.must_be :directory?
-      application = Hbc.appdir.join("Tarball.app")
-      application.must_be :directory?
+      application = Hbc.appdir.join("container")
+      application.must_be :file?
     end
 
     it "works with cab-based Casks" do
       skip("cabextract not installed") unless Hbc.homebrew_prefix.join("bin", "cabextract").exist?
-      cab_container = Hbc.load("cab-container")
+      asset = Hbc.load("cab-container")
       empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
-      cab_container.stubs(:depends_on).returns(empty)
+      asset.stubs(:depends_on).returns(empty)
 
       shutup do
-        Hbc::Installer.new(cab_container).install
+        Hbc::Installer.new(asset).install
       end
 
-      dest_path = Hbc.caskroom.join("cab-container", cab_container.version)
+      dest_path = Hbc.caskroom.join("cab-container", asset.version)
       dest_path.must_be :directory?
-      application = Hbc.appdir.join("Application.app")
-      application.must_be :directory?
+      application = Hbc.appdir.join("container")
+      application.must_be :file?
     end
 
     it "works with Adobe AIR-based Casks" do
@@ -73,94 +73,7 @@ describe Hbc::Installer do
 
     it "works with 7z-based Casks" do
       skip("unar not installed") unless Hbc.homebrew_prefix.join("bin", "unar").exist?
-      sevenzip_container = Hbc.load("sevenzip-container")
-      empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
-      sevenzip_container.stubs(:depends_on).returns(empty)
-
-      shutup do
-        Hbc::Installer.new(sevenzip_container).install
-      end
-
-      dest_path = Hbc.caskroom.join("sevenzip-container", sevenzip_container.version)
-      dest_path.must_be :directory?
-      application = Hbc.appdir.join("Application.app")
-      application.must_be :directory?
-    end
-
-    it "works with xar-based Casks" do
-      xar_container = Hbc.load("xar-container")
-
-      shutup do
-        Hbc::Installer.new(xar_container).install
-      end
-
-      dest_path = Hbc.caskroom.join("xar-container", xar_container.version)
-      dest_path.must_be :directory?
-      application = Hbc.appdir.join("Application.app")
-      application.must_be :directory?
-    end
-
-    it "works with Stuffit-based Casks" do
-      skip("unar not installed") unless Hbc.homebrew_prefix.join("bin", "unar").exist?
-      stuffit_container = Hbc.load("stuffit-container")
-      empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
-      stuffit_container.stubs(:depends_on).returns(empty)
-
-      shutup do
-        Hbc::Installer.new(stuffit_container).install
-      end
-
-      dest_path = Hbc.caskroom.join("stuffit-container", stuffit_container.version)
-      dest_path.must_be :directory?
-      application = Hbc.appdir.join("sheldonmac", "v1.0")
-      application.must_be :directory?
-    end
-
-    it "works with RAR-based Casks" do
-      skip("unar not installed") unless Hbc.homebrew_prefix.join("bin", "unar").exist?
-      rar_container = Hbc.load("rar-container")
-      empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
-      rar_container.stubs(:depends_on).returns(empty)
-
-      shutup do
-        Hbc::Installer.new(rar_container).install
-      end
-
-      dest_path = Hbc.caskroom.join("rar-container", rar_container.version)
-      dest_path.must_be :directory?
-      application = Hbc.appdir.join("Application.app")
-      application.must_be :directory?
-    end
-
-    it "works with bz2-based Casks" do
-      asset = Hbc.load("bzipped-asset")
-
-      shutup do
-        Hbc::Installer.new(asset).install
-      end
-
-      dest_path = Hbc.caskroom.join("bzipped-asset", asset.version)
-      dest_path.must_be :directory?
-      file = Hbc.appdir.join("bzipped-asset--#{asset.version}")
-      file.must_be :file?
-    end
-
-    it "works with pure gz-based Casks" do
-      asset = Hbc.load("gzipped-asset")
-
-      shutup do
-        Hbc::Installer.new(asset).install
-      end
-
-      dest_path = Hbc.caskroom.join("gzipped-asset", asset.version)
-      dest_path.must_be :directory?
-      file = Hbc.appdir.join("gzipped-asset--#{asset.version}")
-      file.must_be :file?
-    end
-
-    it "works with xz-based Casks" do
-      skip("unxz not installed") unless Hbc.homebrew_prefix.join("bin", "unxz").exist?
-      asset = Hbc.load("xzipped-asset")
+      asset = Hbc.load("container-7z")
       empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
       asset.stubs(:depends_on).returns(empty)
 
@@ -168,15 +81,102 @@ describe Hbc::Installer do
         Hbc::Installer.new(asset).install
       end
 
-      dest_path = Hbc.caskroom.join("xzipped-asset", asset.version)
+      dest_path = Hbc.caskroom.join("container-7z", asset.version)
       dest_path.must_be :directory?
-      file = Hbc.appdir.join("xzipped-asset--#{asset.version}")
+      file = Hbc.appdir.join("container")
+      file.must_be :file?
+    end
+
+    it "works with xar-based Casks" do
+      asset = Hbc.load("container-xar")
+
+      shutup do
+        Hbc::Installer.new(asset).install
+      end
+
+      dest_path = Hbc.caskroom.join("container-xar", asset.version)
+      dest_path.must_be :directory?
+      file = Hbc.appdir.join("container")
+      file.must_be :file?
+    end
+
+    it "works with Stuffit-based Casks" do
+      skip("unar not installed") unless Hbc.homebrew_prefix.join("bin", "unar").exist?
+      asset = Hbc.load("container-sit")
+      empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
+      asset.stubs(:depends_on).returns(empty)
+
+      shutup do
+        Hbc::Installer.new(asset).install
+      end
+
+      dest_path = Hbc.caskroom.join("container-sit", asset.version)
+      dest_path.must_be :directory?
+      application = Hbc.appdir.join("container")
+      application.must_be :file?
+    end
+
+    it "works with RAR-based Casks" do
+      skip("unar not installed") unless Hbc.homebrew_prefix.join("bin", "unar").exist?
+      asset = Hbc.load("container-rar")
+      empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
+      asset.stubs(:depends_on).returns(empty)
+
+      shutup do
+        Hbc::Installer.new(asset).install
+      end
+
+      dest_path = Hbc.caskroom.join("container-rar", asset.version)
+      dest_path.must_be :directory?
+      application = Hbc.appdir.join("container")
+      application.must_be :file?
+    end
+
+    it "works with pure bzip2-based Casks" do
+      asset = Hbc.load("container-bzip2")
+
+      shutup do
+        Hbc::Installer.new(asset).install
+      end
+
+      dest_path = Hbc.caskroom.join("container-bzip2", asset.version)
+      dest_path.must_be :directory?
+      file = Hbc.appdir.join("container-bzip2--#{asset.version}")
+      file.must_be :file?
+    end
+
+    it "works with pure gzip-based Casks" do
+      asset = Hbc.load("container-gzip")
+
+      shutup do
+        Hbc::Installer.new(asset).install
+      end
+
+      dest_path = Hbc.caskroom.join("container-gzip", asset.version)
+      dest_path.must_be :directory?
+      file = Hbc.appdir.join("container-gzip--#{asset.version}")
+      file.must_be :file?
+    end
+
+    it "works with pure xz-based Casks" do
+      skip("unxz not installed") unless Hbc.homebrew_prefix.join("bin", "unxz").exist?
+      asset = Hbc.load("container-xz")
+      empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
+      asset.stubs(:depends_on).returns(empty)
+
+      shutup do
+        Hbc::Installer.new(asset).install
+      end
+
+      dest_path = Hbc.caskroom.join("container-xz", asset.version)
+      dest_path.must_be :directory?
+      file = Hbc.appdir.join("container-xz--#{asset.version}")
       file.must_be :file?
     end
 
     it "works with lzma-based Casks" do
       skip("unlzma not installed") unless Hbc.homebrew_prefix.join("bin", "unlzma").exist?
-      asset = Hbc.load("lzma-asset")
+      asset = Hbc.load("container-lzma")
       empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
       asset.stubs(:depends_on).returns(empty)
 
@@ -184,9 +184,9 @@ describe Hbc::Installer do
         Hbc::Installer.new(asset).install
       end
 
-      dest_path = Hbc.caskroom.join("lzma-asset", asset.version)
+      dest_path = Hbc.caskroom.join("container-lzma", asset.version)
       dest_path.must_be :directory?
-      file = Hbc.appdir.join("lzma-asset--#{asset.version}")
+      file = Hbc.appdir.join("container-lzma--#{asset.version}")
       file.must_be :file?
     end
 
@@ -316,15 +316,15 @@ describe Hbc::Installer do
       end # wont_raise
     end
 
-    it "works properly with a direct URL to a pkg" do
-      naked_pkg = Hbc.load("naked-pkg")
+    it "works naked-pkg-based Casks" do
+      naked_pkg = Hbc.load("container-pkg")
 
       shutup do
         Hbc::Installer.new(naked_pkg).install
       end
 
-      dest_path = Hbc.caskroom.join("naked-pkg", naked_pkg.version)
-      pkg = dest_path.join("Naked.pkg")
+      dest_path = Hbc.caskroom.join("container-pkg", naked_pkg.version)
+      pkg = dest_path.join("container.pkg")
       pkg.must_be :file?
     end
 
diff --git a/Library/Homebrew/cask/test/support/Casks/bzipped-asset.rb b/Library/Homebrew/cask/test/support/Casks/bzipped-asset.rb
deleted file mode 100644
index 69c31b43c4..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/bzipped-asset.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'bzipped-asset' do
-  version '1.2.3'
-  sha256 'eaf67b3a62cb9275f96e45d05c70b94bef9ef1dae344083e93eda6b0b388a61c'
-
-  url TestHelper.local_binary_url('bzipped_asset.bz2')
-  homepage 'http://example.com/bzipped-asset'
-
-  app 'bzipped-asset--1.2.3'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/cab-container.rb b/Library/Homebrew/cask/test/support/Casks/cab-container.rb
deleted file mode 100644
index 59e25af4e3..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/cab-container.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'cab-container' do
-  version '1.2.3'
-  sha256 '192d0cf6b727473f9ba0f55cec793ee2a8f7113c5cfe9d49e05a087436c5efe2'
-
-  url TestHelper.local_binary_url('cabcontainer.cab')
-  homepage 'http://example.com/cab-container'
-
-  depends_on formula: 'cabextract'
-
-  app 'cabcontainer/Application.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-7z.rb b/Library/Homebrew/cask/test/support/Casks/container-7z.rb
new file mode 100644
index 0000000000..0526bf7fe6
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-7z.rb
@@ -0,0 +1,11 @@
+test_cask 'container-7z' do
+  version '1.2.3'
+  sha256 '3f9542ace85ed5f88549e2d0ea82210f8ddc87e0defbb78469d3aed719b3c964'
+
+  url TestHelper.local_binary_url('container.7z')
+  homepage 'https://example.com/container-7z'
+
+  depends_on formula: 'unar'
+
+  app 'container'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-bzip2.rb b/Library/Homebrew/cask/test/support/Casks/container-bzip2.rb
new file mode 100644
index 0000000000..b11b032f38
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-bzip2.rb
@@ -0,0 +1,9 @@
+test_cask 'container-bzip2' do
+  version '1.2.3'
+  sha256 'eaf67b3a62cb9275f96e45d05c70b94bef9ef1dae344083e93eda6b0b388a61c'
+
+  url TestHelper.local_binary_url('container.bz2')
+  homepage 'https://example.com/container-bzip2'
+
+  app 'container-bzip2--1.2.3'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-cab.rb b/Library/Homebrew/cask/test/support/Casks/container-cab.rb
new file mode 100644
index 0000000000..5a2c462eb4
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-cab.rb
@@ -0,0 +1,11 @@
+test_cask 'container-cab' do
+  version '1.2.3'
+  sha256 'c267f5cebb14814c8e612a8b7d2bda02aec913f869509b6f1d3883427c0f552b'
+
+  url TestHelper.local_binary_url('container.cab')
+  homepage 'https://example.com/container-cab'
+
+  depends_on formula: 'cabextract'
+
+  app 'cabcontainer/Application.app'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-dmg.rb b/Library/Homebrew/cask/test/support/Casks/container-dmg.rb
new file mode 100644
index 0000000000..6eb8ac013f
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-dmg.rb
@@ -0,0 +1,9 @@
+test_cask 'container-dmg' do
+  version '1.2.3'
+  sha256 '74d89d4fa5cef175cf43666ce11fefa3741aa1522114042ac75e656be37141a1'
+
+  url TestHelper.local_binary_url('container.dmg')
+  homepage 'https://example.com/container-dmg'
+
+  app 'container'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-gzip.rb b/Library/Homebrew/cask/test/support/Casks/container-gzip.rb
new file mode 100644
index 0000000000..0a5c64ba93
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-gzip.rb
@@ -0,0 +1,9 @@
+test_cask 'container-gzip' do
+  version '1.2.3'
+  sha256 'fa4ebb5246583c4b6e62e1df4e3b71b4e38a1d7d91c025665827195d36214b20'
+
+  url TestHelper.local_binary_url('container.gz')
+  homepage 'https://example.com/container-gzip'
+
+  app 'container-gzip--1.2.3'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-lzma.rb b/Library/Homebrew/cask/test/support/Casks/container-lzma.rb
new file mode 100644
index 0000000000..faa37c3baa
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-lzma.rb
@@ -0,0 +1,11 @@
+test_cask 'container-lzma' do
+  version '1.2.3'
+  sha256 '9d7edb32d02ab9bd9749a5bde8756595ea4cfcb1da02ca11c30fb591d4c1ed85'
+
+  url TestHelper.local_binary_url('container.lzma')
+  homepage 'https://example.com/container-lzma'
+
+  depends_on formula: 'lzma'
+
+  app 'container-lzma--1.2.3'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-pkg.rb b/Library/Homebrew/cask/test/support/Casks/container-pkg.rb
new file mode 100644
index 0000000000..4f4cd99fa9
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-pkg.rb
@@ -0,0 +1,7 @@
+test_cask 'container-pkg' do
+  version '1.2.3'
+  sha256 '611c50c8a2a2098951d2cd0fd54787ed81b92cd97b4b08bd7cba17f1e1d8e40b'
+
+  url TestHelper.local_binary_url('container.pkg')
+  homepage 'https://example.com/container-pkg'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-rar.rb b/Library/Homebrew/cask/test/support/Casks/container-rar.rb
new file mode 100644
index 0000000000..2105b738df
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-rar.rb
@@ -0,0 +1,11 @@
+test_cask 'container-rar' do
+  version '1.2.3'
+  sha256 '419af7864c0e1f125515c49b08bd22e0f7de39f5285897c440fe03c714871763'
+
+  url TestHelper.local_binary_url('container.rar')
+  homepage 'https://example.com/container-rar'
+
+  depends_on formula: 'unar'
+
+  app 'container'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-sit.rb b/Library/Homebrew/cask/test/support/Casks/container-sit.rb
new file mode 100644
index 0000000000..282e229404
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-sit.rb
@@ -0,0 +1,11 @@
+test_cask 'container-sit' do
+  version '1.2.3'
+  sha256 '0d21a64dce625044345c8ecca888e5439feaf254dac7f884917028a744f93cf3'
+
+  url TestHelper.local_binary_url('container.sit')
+  homepage 'https://example.com/container-sit'
+
+  depends_on formula: 'unar'
+
+  app 'container'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-tar-gz.rb b/Library/Homebrew/cask/test/support/Casks/container-tar-gz.rb
new file mode 100644
index 0000000000..1e6c12959d
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-tar-gz.rb
@@ -0,0 +1,9 @@
+test_cask 'container-tar-gz' do
+  version '1.2.3'
+  sha256 'fab685fabf73d5a9382581ce8698fce9408f5feaa49fa10d9bc6c510493300f5'
+
+  url TestHelper.local_binary_url('container.tar.gz')
+  homepage 'https://example.com/container-tar-gz'
+
+  app 'container'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-xar.rb b/Library/Homebrew/cask/test/support/Casks/container-xar.rb
new file mode 100644
index 0000000000..96a81dc644
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-xar.rb
@@ -0,0 +1,9 @@
+test_cask 'container-xar' do
+  version '1.2.3'
+  sha256 '5bb8e09a6fc630ebeaf266b1fd2d15e2ae7d32d7e4da6668a8093426fa1ba509'
+
+  url TestHelper.local_binary_url('container.xar')
+  homepage 'https://example.com/container-xar'
+
+  app 'container'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-xz.rb b/Library/Homebrew/cask/test/support/Casks/container-xz.rb
new file mode 100644
index 0000000000..8fd42c73f6
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-xz.rb
@@ -0,0 +1,11 @@
+test_cask 'container-xz' do
+  version '1.2.3'
+  sha256 '839263f474edde1d54a9101606e6f0dc9d963acc93f6dcc5af8d10ebc3187c02'
+
+  url TestHelper.local_binary_url('container.xz')
+  homepage 'https://example.com/container-xz'
+
+  depends_on formula: 'xz'
+
+  app 'container-xz--1.2.3'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/gzipped-asset.rb b/Library/Homebrew/cask/test/support/Casks/gzipped-asset.rb
deleted file mode 100644
index 20872922c3..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/gzipped-asset.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'gzipped-asset' do
-  version '1.2.3'
-  sha256 '832506ade94b3e41ecdf2162654eb75891a0749803229e82b2e0420fd1b9e8d2'
-
-  url TestHelper.local_binary_url('gzipped_asset.gz')
-  homepage 'http://example.com/gzipped-asset'
-
-  app 'gzipped-asset--1.2.3'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/lzma-asset.rb b/Library/Homebrew/cask/test/support/Casks/lzma-asset.rb
deleted file mode 100644
index f69bc7974e..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/lzma-asset.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'lzma-asset' do
-  version '1.2.3'
-  sha256 '9d7edb32d02ab9bd9749a5bde8756595ea4cfcb1da02ca11c30fb591d4c1ed85'
-
-  url TestHelper.local_binary_url('lzma-asset.lzma')
-  homepage 'http://example.com/xzipped-asset'
-
-  depends_on formula: 'lzma'
-
-  app 'lzma-asset--1.2.3'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/naked-pkg.rb b/Library/Homebrew/cask/test/support/Casks/naked-pkg.rb
deleted file mode 100644
index 4650ce55df..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/naked-pkg.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-test_cask 'naked-pkg' do
-  version '1.2.3'
-  sha256 '611c50c8a2a2098951d2cd0fd54787ed81b92cd97b4b08bd7cba17f1e1d8e40b'
-
-  url TestHelper.local_binary_url('Naked.pkg')
-  homepage 'http://example.com/naked-pkg'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/rar-container.rb b/Library/Homebrew/cask/test/support/Casks/rar-container.rb
deleted file mode 100644
index 60c525b601..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/rar-container.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'rar-container' do
-  version '1.2.3'
-  sha256 '35fb13fb13e6aefc38b60486627eff6b6b55b2f99f64bf47938530c6cf9e0a0f'
-
-  url TestHelper.local_binary_url('rarcontainer.rar')
-  homepage 'http://example.com/rar-container'
-
-  depends_on formula: 'unar'
-
-  app 'rarcontainer/Application.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/sevenzip-container.rb b/Library/Homebrew/cask/test/support/Casks/sevenzip-container.rb
deleted file mode 100644
index 7f8cfdb4e8..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/sevenzip-container.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'sevenzip-container' do
-  version '1.2.3'
-  sha256 '1550701e7848fcb94f5b0085cca527083a8662ddeb8c0a7bc5af6bd145797cc1'
-
-  url TestHelper.local_binary_url('sevenzipcontainer.7z')
-  homepage 'http://example.com/sevenzip-container'
-
-  depends_on formula: 'unar'
-
-  app 'sevenzipcontainer/Application.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/stuffit-container.rb b/Library/Homebrew/cask/test/support/Casks/stuffit-container.rb
deleted file mode 100644
index a42971ff50..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/stuffit-container.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'stuffit-container' do
-  version '1.2.3'
-  sha256 '892b6d49a98c546381d41dec9b0bbc04267ac008d72b99755968d357099993b7'
-
-  url TestHelper.local_binary_url('sheldonmac.sit')
-  homepage 'http://www.tobias-jung.de/seekingprofont/'
-
-  depends_on formula: 'unar'
-
-  artifact 'sheldonmac/v1.0', target: "#{Hbc.appdir}/sheldonmac/v1.0"
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/tarball.rb b/Library/Homebrew/cask/test/support/Casks/tarball.rb
deleted file mode 100644
index 3134a2f943..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/tarball.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'tarball' do
-  version '1.2.3'
-  sha256 :no_check
-
-  url TestHelper.local_binary_url('tarball.tgz')
-  homepage 'http://example.com/tarball'
-
-  app 'Tarball.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/xar-container.rb b/Library/Homebrew/cask/test/support/Casks/xar-container.rb
deleted file mode 100644
index 158c4f7172..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/xar-container.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'xar-container' do
-  version '1.2.3'
-  sha256 '1418752ac49e859f88590db245015cb2f8b459f619e0c50fd6ff87b902c72ee1'
-
-  url TestHelper.local_binary_url('xarcontainer.xar')
-  homepage 'http://example.com/xar-container'
-
-  app 'xarcontainer/Application.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/xzipped-asset.rb b/Library/Homebrew/cask/test/support/Casks/xzipped-asset.rb
deleted file mode 100644
index badb252eef..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/xzipped-asset.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'xzipped-asset' do
-  version '1.2.3'
-  sha256 '839263f474edde1d54a9101606e6f0dc9d963acc93f6dcc5af8d10ebc3187c02'
-
-  url TestHelper.local_binary_url('xzipped-asset.xz')
-  homepage 'http://example.com/xzipped-asset'
-
-  depends_on formula: 'xz'
-
-  app 'xzipped-asset--1.2.3'
-end
diff --git a/Library/Homebrew/cask/test/support/binaries/cabcontainer.cab b/Library/Homebrew/cask/test/support/binaries/cabcontainer.cab
deleted file mode 100644
index f1dec52dccfacc2ae83f2e1c8ee39d4eb5ef5204..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 139
zcmeYbc6MU`f^HB21Ue9kftit!ff35i1=1j%5R}ir;ONp4r@)Y$n3SBKSCW{Sms+In
zSWu9YnVeXXnV+YZSWuwv43tUDD=F6Z%uCDH1IiVbFmO+JvRe#jjI;OW&-{TLMWtUp
Qc7_yu2`=E_c)-K}0CYbhfB*mh

diff --git a/Library/Homebrew/cask/test/support/binaries/container.7z b/Library/Homebrew/cask/test/support/binaries/container.7z
new file mode 100644
index 0000000000000000000000000000000000000000..30dbe24f71b076362b4487e41b3c79c45000ddf9
GIT binary patch
literal 143
zcmXr7+Ou9=hJmHxWqP(K0|Z1t>3nJ707eD@Wkvm@%sl<#46f9Q%n}6yE(S&xHU>sc
zQ3iHyMg~SjMMef5K?V*k#z$?ghZz`H86|n327oC+QHErOe1<%R5{5*EOdy@gPz00^
a;bLT9__=vw@vn=FqHK%|3Jq@?85jVyav1Ue

literal 0
HcmV?d00001

diff --git a/Library/Homebrew/cask/test/support/binaries/bzipped_asset.bz2 b/Library/Homebrew/cask/test/support/binaries/container.bz2
old mode 100644
new mode 100755
similarity index 100%
rename from Library/Homebrew/cask/test/support/binaries/bzipped_asset.bz2
rename to Library/Homebrew/cask/test/support/binaries/container.bz2
diff --git a/Library/Homebrew/cask/test/support/binaries/container.cab b/Library/Homebrew/cask/test/support/binaries/container.cab
new file mode 100644
index 0000000000000000000000000000000000000000..edc741aa12a28e5abb05785504c763b27e3179e5
GIT binary patch
literal 95
zcmeYbc6MU`f_M-C1Ue9kftit!ff2~Q#KOP;QUGELLgg43L_9x;DljDH=anR8=A{-f
c1Q>=y3IgSo74?%c^Yn`|xKb-JOB4*a0Nz9nQUCw|

literal 0
HcmV?d00001

diff --git a/Library/Homebrew/cask/test/support/binaries/container.dmg b/Library/Homebrew/cask/test/support/binaries/container.dmg
new file mode 100644
index 0000000000000000000000000000000000000000..3b3cbf51c25d25b71046b1d51438347b88f16aab
GIT binary patch
literal 25337
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
T#*F+2b)a-T>s!7@^m_asn~#{q

literal 0
HcmV?d00001

diff --git a/Library/Homebrew/cask/test/support/binaries/container.gz b/Library/Homebrew/cask/test/support/binaries/container.gz
new file mode 100755
index 0000000000000000000000000000000000000000..67ede6b965d71ef64f5aa7cf1785b8b00dcc80eb
GIT binary patch
literal 47
zcmb2|=HNIwV|zFQb8>!ONn&PRY7s+l*cJa%XD;iXd*HS9gifHr115$?ZLWs}85kG<
D#={cL

literal 0
HcmV?d00001

diff --git a/Library/Homebrew/cask/test/support/binaries/lzma-asset.lzma b/Library/Homebrew/cask/test/support/binaries/container.lzma
old mode 100644
new mode 100755
similarity index 100%
rename from Library/Homebrew/cask/test/support/binaries/lzma-asset.lzma
rename to Library/Homebrew/cask/test/support/binaries/container.lzma
diff --git a/Library/Homebrew/cask/test/support/binaries/Naked.pkg b/Library/Homebrew/cask/test/support/binaries/container.pkg
similarity index 100%
rename from Library/Homebrew/cask/test/support/binaries/Naked.pkg
rename to Library/Homebrew/cask/test/support/binaries/container.pkg
diff --git a/Library/Homebrew/cask/test/support/binaries/container.rar b/Library/Homebrew/cask/test/support/binaries/container.rar
new file mode 100644
index 0000000000000000000000000000000000000000..7477c3bb4e1110bcbf42c62bb019110009b364e0
GIT binary patch
literal 87
zcmWGaEK-zWXE;Bhn1O+p0Rp1umncloW)KAOK$!Vao9p2Zq9UHM2Am9U8yOgq^Ycm)
jGxJi57!D{a>L+F9=@(~krB-B?C>U@Zv8`rsU}pdTh0PXa

literal 0
HcmV?d00001

diff --git a/Library/Homebrew/cask/test/support/binaries/container.sit b/Library/Homebrew/cask/test/support/binaries/container.sit
new file mode 100755
index 0000000000000000000000000000000000000000..3e29d21dce700e9c5aff07c3db69fe11d8ff2788
GIT binary patch
literal 236
zcmWG8DNRfBEK$%%)-<%VG}kpUFfdYZ%t=g1$;?v-t}HG|%`MhZ@XSlr(^1GMDJihh
z*Do(G*Gq(`D6TBlOU}>L4~Cec&&wsnz$(DN!0-l$ix?O|WK|LG(xpME#i>PQsVPgB
zGAsoGpoAp@!{xh?svrzhg#esq-U2y-Kr9Oq<Y!3E&nrpH%u6i-aR~vZgI6X*>umno
a8~=Wq`l5N?jCOW!E?#kK|KlPJ(FOoPGC%YH

literal 0
HcmV?d00001

diff --git a/Library/Homebrew/cask/test/support/binaries/container.tar.gz b/Library/Homebrew/cask/test/support/binaries/container.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..c464fb413eb627482c30b044f6ab02742e2502c4
GIT binary patch
literal 154
zcmb2|=3rQNbbB}h^V{=|T!#!qS{|;e?&@HF;hi%(xS~U=kxkWU(xT($8eDoJ;%w&s
zx6eHLVa9g*R-2y>l7jm?ZX^b5mw6v)v&kSTGgxbz`QnXUUzUkyP6@g5Wy=zqqeiLL
zM-NZB_x;@F;^X|~ar1-r&x<@=b@gq{i%WNQb)WaTRnO1FfDCG$a(%X{-p`=HzyJV1
CR74~I

literal 0
HcmV?d00001

diff --git a/Library/Homebrew/cask/test/support/binaries/container.xar b/Library/Homebrew/cask/test/support/binaries/container.xar
new file mode 100644
index 0000000000000000000000000000000000000000..563a5ba1e68caf71c47928e6e73accb6237acf03
GIT binary patch
literal 4679
zcmeHIYf#iy6b1`EP;6xsMG?1Kp|!fbN%oC*V--Ye$D;DE#rg=z-AxLcU6Mr?)N!Vc
z)X|QpAjQ`RR%;zm&}lm=KC1Omb-}eL)<=~AD}NYmOHry-n+K~n+Wzj3&17=#d41>H
z@0=uFN_agaHY7Aexq1v%*RUDV8tT2eD1B=2HO*^>TW5ZFq;^r~SnZ9Z?T0(c<`lkx
zt-6r-GcmI6PBoafu!L<`x7yb3ZSPqgdQY%*TnJD2vghHIXI_n+RB=+Xj=a-+^Wo)f
zE9P#9to>u>m1JN4<Bzln2~CX?M`muWs4O4YXHV3OyWGLL-^v>M*=9_b)~mU0Q|g+%
zcWrIi4S7)y*DsHB=6r7|uRIy?_4E;QHdW5^_W9<Mu<8t3@|1%J5Nl_}RW0wRDE=;o
zt@mfwcWzA`k)}H^x!~NdH65D9@b<j6b-imRT)x#=d1}b+i@P@OuhEpW*81|wO0v>p
zY^4L!Hnf!9^4|_WIWcm5$fxnuImi4nx5tNXN#60!le*Q>JIC~$Gwr>zOWpepz0EeR
zC3<~?M!u<AQ*bS_-{JvTQOn2A@;CbU6Q$ygydL+R{_z}>Saj#uGRMtH?C0ed*_ep>
zs?XxWVjfiWUzm|~{Lh93z1zOH=dQV3h&659#!W6dXNb?=kU8jsQAzhp^fp8E&i6OX
zYd#g%;vB*c*p-l!nuh;=$b~;{$y~gWT%0ua7xwRALyulq)!>fXcy#!?=lyNI{cDf3
zKLVYOmil{xx7?^Ns%-MrY&?(W`KQ3hsG%R<-gA1X^=9b)w?Yfq$<xc?x33@DIq0en
zbzHBS-@2l2+vo=|!&bDqF3lc3JL7uKMWYV<g#9&P%>9^xua*p&=8YZ_QG8;YG!IXn
zyb@AVol?<!Wp8ZJ<LJ^^XJgMq%mt^H>`VF9do?ZdV(M961E_DBvirv|)3K%=A)|i?
zyTtJhn>HgoMQ72DBO{=f637S*^tfng(Lh>2l!tTiIuGYWB!S^39cIzt)^tLjXuuK)
zD+JHGC_yZubHse7M)VZqBAZrZDO@YVX`st)7m<g=An4jDT9GT1!68sKG6bNzFqA6n
zTrSdZj7=MWVJHu!0BT?^;vF8AB#aPrZDq)(nPk*%sWebYft#P@l6(<QyBLXxK*5yT
zoy*b6!GTxjDCFE)(3K8(Jpx605TgrJ7zk2NX~Yah+)7&vM7Ej02*QZzaU-%DO$27L
zA_I+ZjG?Sn8iE&*x>8UA&2sbqHG|%yXUrzbL@>BHo0ecHi-|DUakCLI76Wd??Koq!
z+bs~h0MwO$cJUs>dqh>#Ku!_`w}7N439>mJh%5x%l?tQMP!zZkDbfPx_CTNrD%IdQ
zKnR|82c~d5gM=h`h)}vbL23X`@h%ZbQH)692F$G2<5s=iV!`wT1l^6QyE1#Y)r{#d
zT)NXSEK#|oA_ABYyfhW0Up}`OmL-kYvuNjkxT!X|5-3f?%iaP7O|>a*4#Ac0CKs>>
z<wBqes-9!y$#+PLBIk<|;ZrFgCtrj>5mdEgH)6P?3OG7l3?ebJQJQgOtGF>}K1U<o
zMdBv2*-Q`yiTHp@ao~74%wUyx#Y|FORaQ(&^W?XxTOT1$Nr#hLNpU<9<VL6sgFyC_
rN|v1E&jJL>M?(D(1)o6%f(!&12r>|4Ajm+Ffgl4x27(Oy{}}iOI?!Qr

literal 0
HcmV?d00001

diff --git a/Library/Homebrew/cask/test/support/binaries/xzipped-asset.xz b/Library/Homebrew/cask/test/support/binaries/container.xz
old mode 100644
new mode 100755
similarity index 100%
rename from Library/Homebrew/cask/test/support/binaries/xzipped-asset.xz
rename to Library/Homebrew/cask/test/support/binaries/container.xz
diff --git a/Library/Homebrew/cask/test/support/binaries/gzipped_asset.gz b/Library/Homebrew/cask/test/support/binaries/gzipped_asset.gz
deleted file mode 100644
index 1ff300b4b65191d58acd147c498380942abc1473..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 51
zcmb2|=HR%-b|sjJIlU^gpdd9RKC!qswS*x!?27-XGne(xJ@8t4LMPDR0TaWcHrK;~
H3=9ka1FRGl

diff --git a/Library/Homebrew/cask/test/support/binaries/rarcontainer.rar b/Library/Homebrew/cask/test/support/binaries/rarcontainer.rar
deleted file mode 100644
index 9886993069b522e2207462b7bbaf20a19909c2bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 308
zcmWGaEK-zWXE;Bhn1O+p0RjRimnbv@FvtLTLO{&?^rL8%Nxz4Stg!*Zl12uGqQs))
z{JfIH%)Hd17{`KwoXq6JlFa-(y~Kio7-yhNYF<fkjAve2z8+AnxP*t{^qbBn8eJXY
z-|Y-0{TCFA|7O}>%#eNXr`nU&T_q11T%i^N?E<ktc8M6MGQ4#p(k@38pdmKc43Qyd
XNOlKMuMRf7JQ#Y9*j6(*urmMvgA85)

diff --git a/Library/Homebrew/cask/test/support/binaries/sevenzipcontainer.7z b/Library/Homebrew/cask/test/support/binaries/sevenzipcontainer.7z
deleted file mode 100644
index 226f620cd1c3fd78b08aca86ca68f33addb7018d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 247
zcmXr7+Ou9=hJo4TD)a5F3=p6MrPqF(VZop-eC)K&NhddvNb|nyiQQ#QO0SJT@{Pvq
z>-f*-z3X8=;oQ*N82x`ugKU80Kc;Evk2J(>_lilmu97qjY+935FOjb!t@cqRhehtA
zboS&kT-O>uD1K4w`B3~_j)mz*#?7pESLXBF&v@DK@5bNfcBevFFDNK2`E-9iYxozo
z2`x-wg|k;aQ+YqZ$L9Ceg<|XyUE*C~{8gNvM4#T_cd^mBlT#ckyv|gT@uHvlw)CTW
qb%1UYXA@`SY?#Nu&dtccsLagB$QsKaz`(%MIDv~%KD~Y}0|NlkhFVAf

diff --git a/Library/Homebrew/cask/test/support/binaries/sheldonmac.sit b/Library/Homebrew/cask/test/support/binaries/sheldonmac.sit
deleted file mode 100644
index 8814fc31ee1f7b084cf609cc8474ccd8e8475f19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5633
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
ZII;NuNFo2Uzk6KV3F0Hv5bK}z{{dwa0<Zu8

diff --git a/Library/Homebrew/cask/test/support/binaries/tarball.tgz b/Library/Homebrew/cask/test/support/binaries/tarball.tgz
deleted file mode 100644
index 0a9fb56957654bfec1144653e80495a7a016579f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 188
zcmb2|=3r>sUKzx|{PyBOt|kMS<AvvKkIp-=toSo8lYZ&PE4hse4RTfpe)-}l6fvbe
z!0OB2n14LSzTK|dnag)==Y^{Md}2yVeYT2y&uqI{eI`-x=td(i&D<#yCK_4sw!~>&
zxUutX&Sm$HsiE=R=YQ*^2JYxAo+q#RtZ(O(nk)5T^8O3ULvNq0cK<K0=DF;bx&Gg5
m;nfZ&DwFqofBrZ9_SwAsze>3nkiq>Oj7x87x-e)kFaQ9>u~!5D

diff --git a/Library/Homebrew/cask/test/support/binaries/xarcontainer.xar b/Library/Homebrew/cask/test/support/binaries/xarcontainer.xar
deleted file mode 100644
index bd37cd4d6606a5960509dcae0c12e85326cdb35b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 790
zcmV+x1L^#DVR9h=8~_0T0000000PVa00000016`j0004a+LV?{Z=)~}$M5|Vh&#m(
z3^a17R+TF4J$u=kW1Ga<#2|31w4Z*Bd2b*~B_!<ec>MUypMkzyFK6#VR<$bhvkxDE
z?@7%Iq4e?D|FwS$QvW4;pjTF94<0oIw=a+KN-|?-1V&wCh5(ELkOlzlVY-X(4ig&A
zUEHLT<bUe-i&vY^vwZgJ6N7#;;?W|{YiTk-!>;A5wfbs;)6g}V5Mdv~^>THVo)UK3
zU6?neg{)qimF2!$)|xfbMJ;)uMV-M2Bq&Xv(g=YB$26P{w(f4j@F@WSfcDt~uyYR$
z`=i*6EG|X)(tSXCAHVI^$Jv*O8*1Ead<=FZwQiTujopdHMz>>Cyq8&RSf10c?X-3!
z-0d}QXLzq=l~u)=X+cBRY0Y+=0BlXY<E0QX0|~JhUDFwb{7_u#B7<>~BnTrK4kqWI
zbmI#F!35c8ZP$&M&r)VWRg#;c`n31h^dDL@_7pa`?EM?2w5%E+{lNyl$nVfB1D+EG
z3rsgbU8A}c>sGE?!LE|MMZ3m!0q!#0|KpwWji!9>0PYC?D9f|r?tAda%5nmELK*u#
ztQE}PRq{sctK2t(-%Nfp`gQgT@K@<C;a}muApzzYKxP?mF9o_Bc(oFj+SF6{6Z(-q
zKoiWczT?re)JJp5kR{wThoP=mpn2W!hS~wsv39iPzP9x>h>eLEUW4P8D*bTuw%?_b
z`j8@6E?o&YBvKL)bDVR)o+KuiF%f|n$_S(UfC(djSbjHwCOf*CigB~L2*@EpLLO`m
zGfoJ`2;qZ3oD&>#5hoJE6!IoXZX*ph8cwftRbJoM*G7S@D{Q;OZZrn>Fy0Zg1OIAl
zyU6aSY)NM8I$IQ4ue3OdW=h*4wYk>fxz;+dHPV^stP|Q#ofnTbt!p!vTG&kJE8Wl@
zn?uV6ZT|CU=>Gct0ssL2{{sNf9N9_VG6c+|Y^gme-s<$NP|qa%sTIX|+Vk@dQ3!H%
U^zn&QaP(7f3<%%?04^*9m2(|`8~^|S