Cleanup old bottle syntax.

3 files changed, 0 insertions, 68 deletions

diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb
index 456c81937..a2c6940ff 100644
--- a/Library/Homebrew/test/test_formula.rb
+++ b/Library/Homebrew/test/test_formula.rb
@@ -163,38 +163,6 @@ class FormulaTests < Test::Unit::TestCase
     assert !f.devel.version.detected_from_url?
   end
 
-  def test_old_bottle_specs
-    f = OldBottleSpecTestBall.new
-
-    case MacOS.cat
-    when :lion
-      assert_instance_of Bottle, f.bottle
-      assert_equal CurlBottleDownloadStrategy, f.bottle.download_strategy
-      assert_nil f.bottle.specs
-      assert f.bottle.mirrors.empty?
-
-      assert_equal 'file:///foo.com/testball-0.1-bottle.tar.gz', f.bottle.url
-
-      assert_instance_of Checksum, f.bottle.checksum
-      assert_equal :sha1, f.bottle.checksum.hash_type
-      assert !f.bottle.checksum.empty?
-      assert_equal 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef', f.bottle.sha1.hexdigest
-      assert_nil f.bottle.md5
-      assert_nil f.bottle.sha256
-
-      assert f.bottle.version.detected_from_url?
-      assert_equal 0, f.bottle.revision
-      assert_version_equal '0.1', f.bottle.version
-    else
-      assert_nil f.bottle
-    end
-  end
-
-  def test_ancient_bottle_specs
-    f = AncientBottleSpecTestBall.new
-    assert_nil f.bottle
-  end
-
   def test_head_only_specs
     f = HeadOnlySpecTestBall.new
 
diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb
index b3c709fd5..663e7c78d 100644
--- a/Library/Homebrew/test/test_versions.rb
+++ b/Library/Homebrew/test/test_versions.rb
@@ -219,14 +219,6 @@ class VersionParsingTests < Test::Unit::TestCase
     assert_version_detected 'R15B03-1', 'https://downloads.sf.net/project/machomebrew/Bottles/erlang-R15B03-1.mountainlion.bottle.tar.gz'
   end
 
-  def test_old_bottle_style
-    assert_version_detected '4.7.3', 'https://downloads.sf.net/project/machomebrew/Bottles/qt-4.7.3-bottle.tar.gz'
-  end
-
-  def test_old_erlang_bottle_style
-    assert_version_detected 'R15B', 'https://downloads.sf.net/project/machomebrew/Bottles/erlang-R15B-bottle.tar.gz'
-  end
-
   def test_imagemagick_style
     assert_version_detected '6.7.5-7', 'http://downloads.sf.net/project/machomebrew/mirror/ImageMagick-6.7.5-7.tar.bz2'
   end
diff --git a/Library/Homebrew/test/testball.rb b/Library/Homebrew/test/testball.rb
index f7438b21d..4ea4027e8 100644
--- a/Library/Homebrew/test/testball.rb
+++ b/Library/Homebrew/test/testball.rb
@@ -140,34 +140,6 @@ class ExplicitVersionSpecTestBall < Formula
   end
 end
 
-class OldBottleSpecTestBall < Formula
-  homepage 'http://example.com'
-  url 'file:///foo.com/testball-0.1.tbz'
-  sha1 '482e737739d946b7c8cbaf127d9ee9c148b999f5'
-
-  bottle do
-    url 'file:///foo.com/testball-0.1-bottle.tar.gz'
-    sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef'
-  end
-
-  def initialize name=nil
-    super "oldbottlespectestball"
-  end
-end
-
-class AncientBottleSpecTestBall < Formula
-  homepage 'http://example.com'
-  url 'file:///foo.com/testball-0.1.tbz'
-  sha1 '482e737739d946b7c8cbaf127d9ee9c148b999f5'
-
-  bottle 'file:///foo.com/testball-0.1-bottle.tar.gz'
-  bottle_sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef'
-
-  def initialize name=nil
-    super "ancientbottlespectestball"
-  end
-end
-
 class HeadOnlySpecTestBall < Formula
   homepage 'http://example.com'
   head 'https://github.com/mxcl/homebrew.git'