From 1e867302891f04ba7857d86ea641315d2e1c8e4d Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 15 Jun 2015 09:56:04 +0100 Subject: Rename requirements named *Dependency. Dependency is another similar, related class and it's super confusing to have some Requirements that are named *Dependency. Closes Homebrew/homebrew#38891. Signed-off-by: Mike McQuaid --- Library/Homebrew/test/test_dependencies.rb | 10 +-- Library/Homebrew/test/test_dependency_collector.rb | 16 ++--- .../test/test_language_module_dependency.rb | 83 ---------------------- .../test/test_language_module_requirement.rb | 83 ++++++++++++++++++++++ Library/Homebrew/test/test_mpi_dependency.rb | 12 ---- Library/Homebrew/test/test_mpi_requirement.rb | 12 ++++ Library/Homebrew/test/test_x11_dependency.rb | 40 ----------- Library/Homebrew/test/test_x11_requirement.rb | 40 +++++++++++ 8 files changed, 148 insertions(+), 148 deletions(-) delete mode 100644 Library/Homebrew/test/test_language_module_dependency.rb create mode 100644 Library/Homebrew/test/test_language_module_requirement.rb delete mode 100644 Library/Homebrew/test/test_mpi_dependency.rb create mode 100644 Library/Homebrew/test/test_mpi_requirement.rb delete mode 100644 Library/Homebrew/test/test_x11_dependency.rb create mode 100644 Library/Homebrew/test/test_x11_requirement.rb (limited to 'Library/Homebrew/test') diff --git a/Library/Homebrew/test/test_dependencies.rb b/Library/Homebrew/test/test_dependencies.rb index 1c64e26e8..b587cd12a 100644 --- a/Library/Homebrew/test/test_dependencies.rb +++ b/Library/Homebrew/test/test_dependencies.rb @@ -83,19 +83,19 @@ class RequirementsTests < Homebrew::TestCase end def test_merging_multiple_dependencies - @reqs << X11Dependency.new << X11Dependency.new + @reqs << X11Requirement.new << X11Requirement.new assert_equal 1, @reqs.count @reqs << Requirement.new assert_equal 2, @reqs.count end def test_comparison_prefers_larger - @reqs << X11Dependency.new << X11Dependency.new("x11", %w[2.6]) - assert_equal [X11Dependency.new("x11", %w[2.6])], @reqs.to_a + @reqs << X11Requirement.new << X11Requirement.new("x11", %w[2.6]) + assert_equal [X11Requirement.new("x11", %w[2.6])], @reqs.to_a end def test_comparison_does_not_merge_smaller - @reqs << X11Dependency.new("x11", %w{2.6}) << X11Dependency.new - assert_equal [X11Dependency.new("x11", %w[2.6])], @reqs.to_a + @reqs << X11Requirement.new("x11", %w{2.6}) << X11Requirement.new + assert_equal [X11Requirement.new("x11", %w[2.6])], @reqs.to_a end end diff --git a/Library/Homebrew/test/test_dependency_collector.rb b/Library/Homebrew/test/test_dependency_collector.rb index 6700a97c8..1f4ffc784 100644 --- a/Library/Homebrew/test/test_dependency_collector.rb +++ b/Library/Homebrew/test/test_dependency_collector.rb @@ -39,7 +39,7 @@ class DependencyCollectorTests < Homebrew::TestCase def test_requirement_creation @d.add :x11 - assert_instance_of X11Dependency, find_requirement(X11Dependency) + assert_instance_of X11Requirement, find_requirement(X11Requirement) end def test_no_duplicate_requirements @@ -50,28 +50,28 @@ class DependencyCollectorTests < Homebrew::TestCase def test_requirement_tags @d.add :x11 => '2.5.1' @d.add :xcode => :build - assert_empty find_requirement(X11Dependency).tags - assert_predicate find_requirement(XcodeDependency), :build? + assert_empty find_requirement(X11Requirement).tags + assert_predicate find_requirement(XcodeRequirement), :build? end def test_x11_no_tag @d.add :x11 - assert_empty find_requirement(X11Dependency).tags + assert_empty find_requirement(X11Requirement).tags end def test_x11_min_version @d.add :x11 => '2.5.1' - assert_equal "2.5.1", find_requirement(X11Dependency).min_version.to_s + assert_equal "2.5.1", find_requirement(X11Requirement).min_version.to_s end def test_x11_tag @d.add :x11 => :optional - assert_predicate find_requirement(X11Dependency), :optional? + assert_predicate find_requirement(X11Requirement), :optional? end def test_x11_min_version_and_tag @d.add :x11 => ['2.5.1', :optional] - dep = find_requirement(X11Dependency) + dep = find_requirement(X11Requirement) assert_equal '2.5.1', dep.min_version.to_s assert_predicate dep, :optional? end @@ -104,7 +104,7 @@ class DependencyCollectorTests < Homebrew::TestCase def test_resource_dep_git_url resource = Resource.new resource.url("git://example.com/foo/bar.git") - assert_instance_of GitDependency, @d.add(resource) + assert_instance_of GitRequirement, @d.add(resource) end def test_resource_dep_gzip_url diff --git a/Library/Homebrew/test/test_language_module_dependency.rb b/Library/Homebrew/test/test_language_module_dependency.rb deleted file mode 100644 index a06765c29..000000000 --- a/Library/Homebrew/test/test_language_module_dependency.rb +++ /dev/null @@ -1,83 +0,0 @@ -require 'testing_env' -require 'requirements/language_module_dependency' - -class LanguageModuleDependencyTests < Homebrew::TestCase - parallelize_me! - - def assert_deps_fail(spec) - refute_predicate LanguageModuleDependency.new(*spec.shift.reverse), :satisfied? - end - - def assert_deps_pass(spec) - assert_predicate LanguageModuleDependency.new(*spec.shift.reverse), :satisfied? - end - - def test_unique_deps_are_not_eql - x = LanguageModuleDependency.new(:node, "less") - y = LanguageModuleDependency.new(:node, "coffee-script") - refute_eql x, y - refute_equal x.hash, y.hash - end - - def test_differing_module_and_import_name - mod_name = "foo" - import_name = "bar" - l = LanguageModuleDependency.new(:python, mod_name, import_name) - assert_includes l.message, mod_name - assert_includes l.the_test, "import #{import_name}" - end - - def test_bad_perl_deps - assert_deps_fail "notapackage" => :perl - end - - def test_good_perl_deps - assert_deps_pass "ENV" => :perl - end - - def test_bad_python_deps - assert_deps_fail "notapackage" => :python - end - - def test_good_python_deps - assert_deps_pass "datetime" => :python - end - - def test_bad_ruby_deps - assert_deps_fail "notapackage" => :ruby - end - - def test_good_ruby_deps - assert_deps_pass "date" => :ruby - end - - if which("rbx") - def test_bad_rubinius_deps - assert_deps_fail "notapackage" => :rbx - end - - def test_good_rubinius_deps - assert_deps_pass "date" => :rbx - end - end - - if which("csc") - def test_bad_chicken_deps - assert_deps_fail "notapackage" => :chicken - end - - def test_good_chicken_deps - assert_deps_pass "extras" => :chicken - end - end - - if which("node") - def test_bad_node_deps - assert_deps_fail "notapackage" => :node - end - - def test_good_node_deps - assert_deps_pass "util" => :node - end - end -end diff --git a/Library/Homebrew/test/test_language_module_requirement.rb b/Library/Homebrew/test/test_language_module_requirement.rb new file mode 100644 index 000000000..4a64e5ba7 --- /dev/null +++ b/Library/Homebrew/test/test_language_module_requirement.rb @@ -0,0 +1,83 @@ +require 'testing_env' +require 'requirements/language_module_requirement' + +class LanguageModuleRequirementTests < Homebrew::TestCase + parallelize_me! + + def assert_deps_fail(spec) + refute_predicate LanguageModuleRequirement.new(*spec.shift.reverse), :satisfied? + end + + def assert_deps_pass(spec) + assert_predicate LanguageModuleRequirement.new(*spec.shift.reverse), :satisfied? + end + + def test_unique_deps_are_not_eql + x = LanguageModuleRequirement.new(:node, "less") + y = LanguageModuleRequirement.new(:node, "coffee-script") + refute_eql x, y + refute_equal x.hash, y.hash + end + + def test_differing_module_and_import_name + mod_name = "foo" + import_name = "bar" + l = LanguageModuleRequirement.new(:python, mod_name, import_name) + assert_includes l.message, mod_name + assert_includes l.the_test, "import #{import_name}" + end + + def test_bad_perl_deps + assert_deps_fail "notapackage" => :perl + end + + def test_good_perl_deps + assert_deps_pass "ENV" => :perl + end + + def test_bad_python_deps + assert_deps_fail "notapackage" => :python + end + + def test_good_python_deps + assert_deps_pass "datetime" => :python + end + + def test_bad_ruby_deps + assert_deps_fail "notapackage" => :ruby + end + + def test_good_ruby_deps + assert_deps_pass "date" => :ruby + end + + if which("rbx") + def test_bad_rubinius_deps + assert_deps_fail "notapackage" => :rbx + end + + def test_good_rubinius_deps + assert_deps_pass "date" => :rbx + end + end + + if which("csc") + def test_bad_chicken_deps + assert_deps_fail "notapackage" => :chicken + end + + def test_good_chicken_deps + assert_deps_pass "extras" => :chicken + end + end + + if which("node") + def test_bad_node_deps + assert_deps_fail "notapackage" => :node + end + + def test_good_node_deps + assert_deps_pass "util" => :node + end + end +end diff --git a/Library/Homebrew/test/test_mpi_dependency.rb b/Library/Homebrew/test/test_mpi_dependency.rb deleted file mode 100644 index c90c767e7..000000000 --- a/Library/Homebrew/test/test_mpi_dependency.rb +++ /dev/null @@ -1,12 +0,0 @@ -require 'testing_env' -require 'requirements/mpi_dependency' - -class MPIDependencyTests < Homebrew::TestCase - def test_initialize_untangles_tags_and_wrapper_symbols - wrappers = [:cc, :cxx, :f77] - tags = [:optional, 'some-other-tag'] - dep = MPIDependency.new(*wrappers + tags) - assert_equal wrappers, dep.lang_list - assert_equal tags, dep.tags - end -end diff --git a/Library/Homebrew/test/test_mpi_requirement.rb b/Library/Homebrew/test/test_mpi_requirement.rb new file mode 100644 index 000000000..0b8555cd4 --- /dev/null +++ b/Library/Homebrew/test/test_mpi_requirement.rb @@ -0,0 +1,12 @@ +require 'testing_env' +require 'requirements/mpi_requirement' + +class MPIRequirementTests < Homebrew::TestCase + def test_initialize_untangles_tags_and_wrapper_symbols + wrappers = [:cc, :cxx, :f77] + tags = [:optional, 'some-other-tag'] + dep = MPIRequirement.new(*wrappers + tags) + assert_equal wrappers, dep.lang_list + assert_equal tags, dep.tags + end +end diff --git a/Library/Homebrew/test/test_x11_dependency.rb b/Library/Homebrew/test/test_x11_dependency.rb deleted file mode 100644 index bc4d72761..000000000 --- a/Library/Homebrew/test/test_x11_dependency.rb +++ /dev/null @@ -1,40 +0,0 @@ -require 'testing_env' -require 'requirements/x11_dependency' - -class X11DependencyTests < Homebrew::TestCase - def test_eql_instances_are_eql - x = X11Dependency.new - y = X11Dependency.new - assert_eql x, y - assert_equal x.hash, y.hash - end - - def test_not_eql_when_hashes_differ - x = X11Dependency.new("foo") - y = X11Dependency.new - refute_eql x, y - refute_equal x.hash, y.hash - end - - def test_different_min_version - x = X11Dependency.new - y = X11Dependency.new("x11", %w[2.5]) - refute_eql x, y - end - - def test_x_env - x = X11Dependency.new - x.stubs(:satisfied?).returns(true) - ENV.expects(:x11) - x.modify_build_environment - end - - def test_satisfied - MacOS::XQuartz.stubs(:version).returns("2.7.5") - MacOS::XQuartz.stubs(:installed?).returns(true) - assert_predicate X11Dependency.new, :satisfied? - - MacOS::XQuartz.stubs(:installed?).returns(false) - refute_predicate X11Dependency.new, :satisfied? - end -end diff --git a/Library/Homebrew/test/test_x11_requirement.rb b/Library/Homebrew/test/test_x11_requirement.rb new file mode 100644 index 000000000..0f7ffe004 --- /dev/null +++ b/Library/Homebrew/test/test_x11_requirement.rb @@ -0,0 +1,40 @@ +require 'testing_env' +require 'requirements/x11_requirement' + +class X11RequirementTests < Homebrew::TestCase + def test_eql_instances_are_eql + x = X11Requirement.new + y = X11Requirement.new + assert_eql x, y + assert_equal x.hash, y.hash + end + + def test_not_eql_when_hashes_differ + x = X11Requirement.new("foo") + y = X11Requirement.new + refute_eql x, y + refute_equal x.hash, y.hash + end + + def test_different_min_version + x = X11Requirement.new + y = X11Requirement.new("x11", %w[2.5]) + refute_eql x, y + end + + def test_x_env + x = X11Requirement.new + x.stubs(:satisfied?).returns(true) + ENV.expects(:x11) + x.modify_build_environment + end + + def test_satisfied + MacOS::XQuartz.stubs(:version).returns("2.7.5") + MacOS::XQuartz.stubs(:installed?).returns(true) + assert_predicate X11Requirement.new, :satisfied? + + MacOS::XQuartz.stubs(:installed?).returns(false) + refute_predicate X11Requirement.new, :satisfied? + end +end -- cgit v1.2.3