ZenTest 3.1.0 → 3.2.0

data/lib/test/zentest_assertions.rb

@@ -0,0 +1,46 @@
+##
+# Extra assertions for Test::Unit
+
+module Test::Unit::Assertions
+
+  ##
+  # Asserts that +boolean+ is not false or nil.
+
+  def deny(boolean, message = nil)
+    _wrap_assertion do
+      assert_block(build_message(message, "<?> is not false or nil.", boolean)) { not boolean }
+    end
+  end
+
+  ##
+  # Alias for assert_not_equal
+
+  alias deny_equal assert_not_equal
+
+  ##
+  # Asserts that +obj+ responds to #empty? and #empty? returns false.
+
+  def deny_empty(obj)
+    assert_respond_to obj, :empty?
+    assert_equal false, obj.empty?
+  end
+
+  ##
+  # Asserts that +obj+ responds to #include? and that obj includes +item+.
+
+  def assert_includes(obj, item, message = nil)
+    assert_respond_to obj, :include?
+    assert_equal true, obj.include?(item), message
+  end
+
+  ##
+  # Asserts that +obj+ responds to #include? and that obj does not include
+  # +item+.
+
+  def deny_includes(obj, item, message = nil)
+    assert_respond_to obj, :include?
+    assert_equal false, obj.include?(item), message
+  end
+
+end
+

data/lib/zentest.rb

@@ -23,9 +23,55 @@ class Module
 
 end
 
+##
+# ZenTest scans your target and unit-test code and writes your missing
+# code based on simple naming rules, enabling XP at a much quicker
+# pace. ZenTest only works with Ruby and Test::Unit.
+#
+# == RULES
+#
+# ZenTest uses the following rules to figure out what code should be
+# generated:
+#
+# * Definition:
+#   * CUT = Class Under Test
+#   * TC = Test Class (for CUT)
+# * TC's name is the same as CUT w/ "Test" prepended at every scope level.
+#   * Example: TestA::TestB vs A::B.
+# * CUT method names are used in CT, with "test_" prependend and optional "_ext" extensions for differentiating test case edge boundaries.
+#   * Example:
+#     * A::B#blah
+#     * TestA::TestB#test_blah_normal
+#     * TestA::TestB#test_blah_missing_file
+# * All naming conventions are bidirectional with the exception of test extensions.
+#
+# == METHOD MAPPING
+#
+# Method names are mapped bidirectionally in the following way:
+#
+#   method	test_method
+#   method?	test_method_eh		(too much exposure to Canadians :)
+#   method!	test_method_bang
+#   method=	test_method_equals
+#   []		test_index
+#   *		test_times
+#   ==		test_equals2
+#   ===		test_equals3
+#
+# Further, any of the test methods should be able to have arbitrary
+# extensions put on the name to distinguish edge cases:
+#
+#   method	test_method
+#   method	test_method_simple
+#   method	test_method_no_network
+#
+# To allow for unmapped test methods (ie, non-unit tests), name them:
+#
+#   test_integration_.*
+
 class ZenTest
 
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 
   if $TESTING then
     attr_reader :missing_methods
@@ -51,7 +97,7 @@ class ZenTest
 
     unless file == $0 then
       begin
-	require "#{file}"
+	require file
       rescue LoadError => err
 	puts "Could not load #{file}: #{err}"
       end

data/test/test_autotest.rb

@@ -62,8 +62,8 @@ class TestAutotest < Test::Unit::TestCase
     ]
 
     expected = [
-      ["'/^(test_a|test_b|test_c)/'", /one/],
-      ["'/^(test_d)/'", /two/],
+      ["'/^(test_a|test_b|test_c)$/'", /one/],
+      ["'/^(test_d)$/'", /two/],
     ]
 
     assert_equal expected,
@@ -185,7 +185,7 @@ class TestAutotest < Test::Unit::TestCase
 
       assert_equal "# Waiting for changes", out.shift
       assert_equal "# Rerunning failures: #{@photo_test_file}", out.shift
-      assert_equal "+ ruby -Ilib:test #{@photo_test_file} -n test_route | unit_diff -u", out.shift
+      assert_equal "+ #{@at.ruby} -Ilib:test #{@photo_test_file} -n test_route | unit_diff -u", out.shift
 
       assert_equal true, @at.backtick_responses.empty?
     end
@@ -205,6 +205,12 @@ class TestAutotest < Test::Unit::TestCase
     end
   end
 
+  def test_ruby
+    this_ruby = File.join(Config::CONFIG['bindir'],
+                          Config::CONFIG['ruby_install_name'])
+    assert_equal this_ruby, @at.ruby
+  end
+
   def test_updated_eh
     Dir.chdir @normal_tests_dir do
       assert_equal true,  @at.updated?(@photo_test_file), 'Not in @files'
@@ -230,8 +236,6 @@ class TestAutotest < Test::Unit::TestCase
   end
 
   def util_add_map(file, *tests)
-    tests = [[],[]] if tests.empty?
-    
     @file_map[file] = tests
   end
 

data/test/test_rails_autotest.rb

@@ -10,93 +10,186 @@ class TestRailsAutotest < TestAutotest
 
     @rails_tests_dir = 'test/data/rails'
 
-    @rails_photo_file = 'app/models/photo.rb'
-    @rails_unit_tests = [
-                         'test/unit/flickr_photo_test.rb',
-                         'test/unit/photo_test.rb',
-                         'test/unit/route_test.rb',
+    @rails_unit_tests = ['test/unit/route_test.rb']
+
+    @rails_controller_tests = [
+                               'test/controllers/admin/themes_controller_test.rb',
+                               'test/controllers/articles_controller_test.rb',
+                               'test/controllers/dummy_controller_test.rb',
+                               'test/controllers/route_controller_test.rb',
+                              ]
+
+    @rails_view_tests = [
+                         'test/views/admin/themes_view_test.rb',
+                         'test/views/articles_view_test.rb',
+                         'test/views/layouts_view_test.rb',
+                         'test/views/route_view_test.rb',
                         ]
 
     @rails_functional_tests = [
                                'test/functional/admin/themes_controller_test.rb',
+                               'test/functional/articles_controller_test.rb',
                                'test/functional/dummy_controller_test.rb',
                                'test/functional/route_controller_test.rb',
                               ]
 
-    @rails_all_tests = [@rails_unit_tests, @rails_functional_tests]
+    # These files aren't put in @file_map, so add them to it
+    @extra_files = [
+                    'test/controllers/admin/themes_controller_test.rb',
+                    'test/controllers/articles_controller_test.rb',
+                    'test/controllers/dummy_controller_test.rb',
+                    'test/views/admin/themes_view_test.rb',
+                    'test/views/articles_view_test.rb',
+                    'test/views/layouts_view_test.rb',
+                    'test/functional/articles_controller_test.rb',
+                    'test/functional/dummy_controller_test.rb',
+                   ]
   end
 
-  (instance_methods.sort - Object.instance_methods).each do |meth|
+  # Remove test_failed_test_files tests from RailsAutoTest because these
+  # tests are regular-mode dependent.
+  superclass.instance_methods.each do |meth|
     undef_method meth if meth =~ /^test_failed_test_files/
   end
 
   def test_map_file_names
+    # util_add_map(sourcefile, unit_tests, controller_tests,
+    #                          view_tests, functional_tsets)
+
     # controllers
-    util_add_map("./app/controllers/admin/themes_controller.rb",
+    util_add_map("app/controllers/admin/themes_controller.rb",
+                 [], ["test/controllers/admin/themes_controller_test.rb"],
                  [], ["test/functional/admin/themes_controller_test.rb"])
-    util_add_map("./app/controllers/application.rb",
+
+    util_add_map("app/controllers/application.rb",
+                 [], ["test/controllers/dummy_controller_test.rb"],
                  [], ["test/functional/dummy_controller_test.rb"])
-    util_add_map("./app/controllers/route_controller.rb",
+
+    util_add_map("app/controllers/route_controller.rb",
+                 [], ["test/controllers/route_controller_test.rb"],
                  [], ["test/functional/route_controller_test.rb"])
-    util_add_map("./app/controllers/notest_controller.rb")
+
+    util_add_map("app/controllers/notest_controller.rb")
 
     # helpers
-    util_add_map("./app/helpers/application_helper.rb",
-                 [], ["test/functional/dummy_controller_test.rb",
-                      "test/functional/route_controller_test.rb"])
-    util_add_map("./app/helpers/route_helper.rb",
-                 [], ["test/functional/route_controller_test.rb"])
+    util_add_map("app/helpers/application_helper.rb",
+                 [], [], @rails_view_tests, @rails_functional_tests)
+
+    util_add_map("app/helpers/route_helper.rb",
+                 [], [], ["test/views/route_view_test.rb"],
+                 ["test/functional/route_controller_test.rb"])
 
     # model
-    util_add_map("./app/models/route.rb",
-                 ["test/unit/route_test.rb"], [])
-    util_add_map("./app/models/notest.rb")
+    util_add_map("app/models/route.rb",
+                 ["test/unit/route_test.rb"], [], [], [])
+
+    util_add_map("app/models/notest.rb")
 
     # views
-    util_add_map("./app/views/layouts/default.rhtml")
-    util_add_map("./app/views/route/index.rhtml",
-                 [], ["test/functional/route_controller_test.rb"])
-    util_add_map("./app/views/route/xml.rxml",
-                 [], ["test/functional/route_controller_test.rb"])
-    util_add_map("./app/views/shared/notest.rhtml")
+    util_add_map("app/views/layouts/default.rhtml", [], [],
+                 ["test/views/layouts_view_test.rb"], [])
+
+    util_add_map("app/views/route/index.rhtml",
+                 [], [], ["test/views/route_view_test.rb"],
+                 ["test/functional/route_controller_test.rb"])
+
+    util_add_map("app/views/route/xml.rxml",
+                 [], [], ["test/views/route_view_test.rb"],
+                 ["test/functional/route_controller_test.rb"])
+
+    util_add_map("app/views/shared/notest.rhtml")
+
+    util_add_map("app/views/articles/flag.rhtml",
+                 [], [], ["test/views/articles_view_test.rb"],
+                 ["test/functional/articles_controller_test.rb"])
 
     # tests
-    util_add_map("./test/fixtures/routes.yml",
+    util_add_map("test/fixtures/routes.yml",
                  ["test/unit/route_test.rb"],
+                 ["test/controllers/route_controller_test.rb"],
+                 ["test/views/route_view_test.rb"],
                  ["test/functional/route_controller_test.rb"])
-    util_add_map("./test/functional/admin/themes_controller_test.rb",
-                 [], ["test/functional/admin/themes_controller_test.rb"])
-    util_add_map("./test/functional/route_controller_test.rb",
-                 [], ["test/functional/route_controller_test.rb"])
 
-    util_add_map("./test/unit/photo_test.rb",
-                 ["test/unit/photo_test.rb"], [])
+    util_add_map("test/test_helper.rb",
+                 @rails_unit_tests, @rails_controller_tests,
+                 @rails_view_tests, @rails_functional_tests)
+
+    util_add_map("test/unit/route_test.rb",
+                 ["test/unit/route_test.rb"], [], [], [])
+
+    util_add_map("test/controllers/route_controller_test.rb",
+                 [], ["test/controllers/route_controller_test.rb"], [], [])
+
+    util_add_map("test/views/route_view_test.rb",
+                 [], [], ["test/views/route_view_test.rb"], [])
 
-    util_add_map("./test/test_helper.rb",
-                 @rails_unit_tests, @rails_functional_tests )
+    util_add_map("test/functional/route_controller_test.rb",
+                 [], [], [], ["test/functional/route_controller_test.rb"])
+
+    util_add_map("test/functional/admin/themes_controller_test.rb",
+                 [], [], [], ["test/functional/admin/themes_controller_test.rb"])
 
     # global conf thingies
-    util_add_map("./config/boot.rb",
-                 @rails_unit_tests, @rails_functional_tests )
-    util_add_map("./config/database.yml",
-                 @rails_unit_tests, @rails_functional_tests )
-    util_add_map("./config/environment.rb",
-                 @rails_unit_tests, @rails_functional_tests )
-    util_add_map("./config/environments/test.rb",
-                 @rails_unit_tests, @rails_functional_tests )
-    util_add_map("./config/routes.rb",
-                 [], @rails_functional_tests)
+    util_add_map("config/boot.rb",
+                 @rails_unit_tests, @rails_controller_tests,
+                 @rails_view_tests, @rails_functional_tests)
+
+    util_add_map("config/database.yml",
+                 @rails_unit_tests, @rails_controller_tests,
+                 @rails_view_tests, @rails_functional_tests)
+
+    util_add_map("config/environment.rb",
+                 @rails_unit_tests, @rails_controller_tests,
+                 @rails_view_tests, @rails_functional_tests)
+
+    util_add_map("config/environments/test.rb",
+                 @rails_unit_tests, @rails_controller_tests,
+                 @rails_view_tests, @rails_functional_tests)
+
+    util_add_map("config/routes.rb",
+                 [], @rails_controller_tests, @rails_view_tests,
+                 @rails_functional_tests)
 
     # ignored crap
-    util_add_map("./vendor/plugins/cartographer/lib/keys.rb")
-    util_add_map("./Rakefile")
+    util_add_map("vendor/plugins/cartographer/lib/keys.rb")
 
-    @rails_all_tests.flatten.each do |t|
-      @at.files[t] = Time.at(0)
-    end
+    util_add_map("Rakefile")
+
+    (@file_map.keys + @extra_files).each { |file| @at.files[file] = Time.at 0 }
 
     util_test_map_file_names @rails_tests_dir
   end
 
+  def test_updated_files_rails
+    expected = [
+      "app/controllers/admin/theme_controller.rb",
+      "app/controllers/route_controller.rb",
+      "app/models/flickr_photo.rb",
+      "app/models/route.rb",
+      "app/views/route/index.rhtml",
+      "config/environment.rb",
+      "config/routes.rb",
+      "test/controllers/route_controller_test.rb",
+      "test/fixtures/routes.yml",
+      "test/functional/admin/themes_controller_test.rb",
+      "test/functional/dummy_controller_test.rb",
+      "test/functional/route_controller_test.rb",
+      "test/unit/flickr_photo_test.rb",
+      "test/unit/photo_test.rb",
+      "test/unit/route_test.rb",
+      "test/views/route_view_test.rb",
+    ]
+
+    Dir.chdir @rails_tests_dir do
+      assert_equal expected, @at.updated_files.sort
+    end
+  end
+
+  def util_add_map(file, *tests)
+    tests = [[], [], [], []] if tests.empty?
+
+    super(file, *tests)
+  end
+
 end
 

metadata

@@ -3,16 +3,20 @@ rubygems_version: 0.8.11.6
 specification_version: 1
 name: ZenTest
 version: !ruby/object:Gem::Version 
-  version: 3.1.0
-date: 2006-03-29 00:00:00 -08:00
-summary: == FEATURES/PROBLEMS
+  version: 3.2.0
+date: 2006-04-10 00:00:00 -07:00
+summary: |-
+  ZenTest can also be used to evaluate generated code and execute your
+  tests, allowing for very rapid development of both tests and
+  implementation.
 require_paths: 
 - lib
 email: ryand-ruby@zenspider.com
 homepage: http://www.zenspider.com/ZSS/Products/ZenTest/
 rubyforge_project: zentest
 description: |-
-  ZenTest provides 3 different tools: zentest, unit_diff, and autotest.
+  ZenTest provides 4 different tools and 1 library: zentest, unit_diff,
+  autotest, multiruby, and Test::Rails.
   
   ZenTest scans your target and unit-test code and writes your missing
   code based on simple naming rules, enabling XP at a much quicker
@@ -28,17 +32,16 @@ description: |-
   multiruby runs anything you want on multiple versions of ruby. Great
   for compatibility checking!
   
-  There are two strategies intended for ZenTest: test conformance
-  auditing and rapid XP.
+  Test::Rails helps you build industrial-strength Rails code.
+  
+  == STRATEGERY
   
-  For auditing, ZenTest provides an excellent means of finding methods
-  that have slipped through the testing process. I've run it against my
-  own software and found I missed a lot in a well tested
-  package. Writing those tests found 4 bugs I had no idea existed.
+  There are two strategeries intended for ZenTest: test conformance
+  auditing and rapid XP.
 autorequire: 
 default_executable: 
 bindir: bin
-has_rdoc: false
+has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
   - - ">"
@@ -60,6 +63,7 @@ files:
 - Rakefile
 - bin/autotest
 - bin/multiruby
+- bin/rails_test_audit
 - bin/unit_diff
 - bin/zentest
 - example.txt
@@ -67,11 +71,20 @@ files:
 - example2.rb
 - lib/autotest.rb
 - lib/rails_autotest.rb
+- lib/test/rails.rb
+- lib/test/rails/controller_test_case.rb
+- lib/test/rails/functional_test_case.rb
+- lib/test/rails/ivar_proxy.rb
+- lib/test/rails/rake_tasks.rb
+- lib/test/rails/test_case.rb
+- lib/test/rails/view_test_case.rb
+- lib/test/zentest_assertions.rb
 - lib/unit_diff.rb
 - lib/zentest.rb
 - test/data/normal/lib/.#photo.rb
 - test/data/normal/lib/blah.rb
 - test/data/normal/lib/photo.rb
+- test/data/normal/test/#test_photo.rb#
 - test/data/normal/test/test_camelcase.rb
 - test/data/normal/test/test_photo.rb
 - test/data/normal/test/test_route.rb
@@ -80,8 +93,10 @@ files:
 - test/data/rails/app/controllers/route_controller.rb
 - test/data/rails/app/models/flickr_photo.rb
 - test/data/rails/app/models/route.rb
+- test/data/rails/app/views/route/index.rhtml
 - test/data/rails/config/environment.rb
 - test/data/rails/config/routes.rb
+- test/data/rails/test/controllers/route_controller_test.rb
 - test/data/rails/test/fixtures/routes.yml
 - test/data/rails/test/functional/admin/themes_controller_test.rb
 - test/data/rails/test/functional/dummy_controller_test.rb
@@ -89,6 +104,7 @@ files:
 - test/data/rails/test/unit/flickr_photo_test.rb
 - test/data/rails/test/unit/photo_test.rb
 - test/data/rails/test/unit/route_test.rb
+- test/data/rails/test/views/route_view_test.rb
 - test/test_autotest.rb
 - test/test_rails_autotest.rb
 - test/test_unit_diff.rb
@@ -100,10 +116,11 @@ rdoc_options: []
 extra_rdoc_files: []
 
 executables: 
-- ZenTest
-- unit_diff
 - autotest
 - multiruby
+- rails_test_audit
+- unit_diff
+- zentest
 extensions: []
 
 requirements: []