zombie-chaser 0.0.2 → 0.0.3

data/bin/zombie-chaser

@@ -1,7 +1,9 @@
 #!/usr/local/bin/ruby
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. ui])
 require 'zombie_test_chaser'
+require 'ui'
 require 'optparse'
 
 force = false
@@ -38,6 +40,18 @@ opts = OptionParser.new do |opts|
     puts "Setting timeout at #{timeout} seconds."
   end
 
+  opts.on("--width PIXELS", "Width of screen in pixels") do |width|
+    Window.width = Integer(width)
+  end
+
+  opts.on("--height PIXELS", "Height of screen in pixels") do |height|
+    Window.height = Integer(height)
+  end
+
+  opts.on("--console", "Use nethack-style text interface") do |opt|
+    World.interface_type = :console_interface
+  end
+
   opts.on("-r", "--random-seed SEED", "Random seed number (under development)") do |seed|
     srand(seed.to_i)
   end

data/lib/human.rb

@@ -88,6 +88,11 @@ class Human < Actor
   def get_eaten
     @health = :dying unless dead?
   end
+
+  def test_suite_size
+    @test_handler.test_suite_size
+  end
+
 end
 
 class MockHuman < Human
@@ -116,6 +121,10 @@ class MockHuman < Human
     end
     notify_world
   end
+
+  def test_suite_size
+    @results.size
+  end
 end
 
 class MockZombieList

data/lib/interface.rb

@@ -1,5 +1,8 @@
 class Interface
   attr_writer :human, :current_zombie
+end
+
+class ConsoleInterface < Interface
 
   def initialize
     @representations = []
@@ -8,47 +11,53 @@ class Interface
 
   def current_representation
     if @current_zombie.nil?
-      "." * human_successful_step_count + @human.current_symbol
-    elsif human_successful_step_count > @current_zombie.successful_step_count
-      "." * @current_zombie.successful_step_count + @current_zombie.current_symbol + "." * (@human.successful_step_count - @current_zombie.successful_step_count - 1) + @human.current_symbol
+      "." * human_position + @human.current_symbol
+    elsif human_position > zombie_position
+      "." * zombie_position + @current_zombie.current_symbol + "." * (human_position - zombie_position - 1) + @human.current_symbol
     else
-      "." * @current_zombie.successful_step_count + @current_zombie.current_symbol
+      "." * zombie_position + @current_zombie.current_symbol
     end
   end
 
-  def human_successful_step_count
-    @human.successful_step_count
-  end
-
   def something_happened
     @representations << current_representation
     display_representation(@representations.last)
   end
 
-end
-
-class NoInterface < Interface
-  attr_reader :representations
-
   def display_representation(representation)
-    #Do nothing
+    print "\r", representation
+    STDOUT.flush
+    sleep 0.2
   end
 
   def finish
-    #Do nothing
+    puts
   end
+
+  def human_position
+    adjust_for_screen_width(@human.successful_step_count)
+  end
+
+  def zombie_position
+    adjust_for_screen_width(@current_zombie.successful_step_count)
+  end
+
+  def adjust_for_screen_width(step_count)
+    max_position = 78.0
+    (step_count * max_position / [@human.test_suite_size, max_position].max).round
+  end
+
 end
 
-class ConsoleInterface < Interface
+class NoInterface < ConsoleInterface
+  attr_reader :representations
 
   def display_representation(representation)
-    print "\r", representation
-    STDOUT.flush
-    sleep 0.2
+    #Do nothing
   end
 
   def finish
-    puts
+    #Do nothing
   end
 end
 

data/lib/test_unit_handler.rb

@@ -2,7 +2,7 @@ require "test/unit/collector/objectspace"
 require "test/unit/ui/testrunnermediator"
 
 class TestUnitHandler
-  attr_reader :results
+  attr_reader :results, :test_suite_size
 
   def initialize(test_pattern, actor)
     @actor = actor
@@ -14,6 +14,7 @@ class TestUnitHandler
     obj_sp = Test::Unit::Collector::ObjectSpace.new
     test_suite = Test::Unit::TestSuite.new("Mutation slayer test suite")
     test_suite << obj_sp.collect
+    @test_suite_size = test_suite.size
     @test_runner_mediator =  Test::Unit::UI::TestRunnerMediator.new(test_suite)
     @test_runner_mediator.add_listener(Test::Unit::TestResult::FAULT) {test_failed}
     @test_runner_mediator.add_listener(Test::Unit::TestCase::FINISHED) {test_finished}

data/lib/world.rb

@@ -2,7 +2,12 @@ require "human"
 require "interface"
 
 class World
-  attr_reader :representations, :interface
+  @interface_type = :gui_interface
+
+  def self.interface_type=(interface_type); @interface_type = interface_type end
+  def self.interface_type; @interface_type end
+
+  attr_reader :interface
 
   def self.new_using_results(human_results, zombies_results)
     world = new(:no_interface)
@@ -14,7 +19,7 @@ class World
   end
 
   def self.new_using_test_unit_handler(test_pattern)
-    world = new(:gui_interface) #FIXME make this a choice between console and gui
+    world = new(self.interface_type)
     human = Human.new_using_test_unit_handler(test_pattern, world)
     zombie_list = MockZombieList.new_using_results([], world) #Fixme
     world.set_human(human)

data/lib/zombie_test_chaser.rb

@@ -15,7 +15,7 @@ end
 
 class ZombieTestChaser < Chaser
 
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   @@test_pattern = 'test/test_*.rb'
   @@tests_loaded = false

data/test/test_zombie.rb

@@ -6,15 +6,15 @@ require "world"
 module TestHumanHelper
   def assert_that_representations_include(expected_representation, human_results, failure_message)
     world = create_world(human_results)
-    interface = world.interface
-    assert interface.representations.include?(expected_representation), failure_message + "Expected #{expected_representation}, got #{world.representations.inspect}"
+    actual_representations = world.interface.representations
+    assert actual_representations.include?(expected_representation), failure_message + "Expected #{expected_representation}, got #{actual_representations.inspect}"
   end
 
   def assert_that_representations_include_these_representations(expected_representations, human_results, zombies_results, failure_message)
     world = create_world(human_results, zombies_results)
-    interface = world.interface
+    actual_representations = world.interface.representations
     expected_representations.each do |expected_representation|
-      assert interface.representations.include?(expected_representation), failure_message + ": Expected #{expected_representation}, got #{world.representations.inspect}"
+      assert actual_representations.include?(expected_representation), failure_message + ": Expected #{expected_representation}, got #{actual_representations.inspect}"
     end
   end
 
@@ -93,3 +93,16 @@ class TestZombie < Test::Unit::TestCase
   end
 
 end
+
+class TestConsoleInterface < Test::Unit::TestCase
+  include TestHumanHelper
+
+  def test_excessive_tests_dont_make_it_run_off_the_page
+    human_results = [:pass] * 500
+    zombies_results = [[:pass, :failure]]
+    expected_representations = ["Z" + "." * 77 + "@"] #Having 80 characters in a line doesn't work
+    failure_message = "Doesn't handle large number of tests properly"
+    assert_that_representations_include_these_representations(expected_representations, human_results, zombies_results, failure_message)
+  end
+
+end

data/ui/ui.rb

@@ -34,7 +34,9 @@ class Actor
   end
 
   def x
-    @successful_step_count * 10 + 10
+    max_position = Window.width - 10
+    left_offset = 10
+    left_offset + ((@successful_step_count * 10) * (max_position - left_offset) / [test_suite_size * 10 + 10, (max_position - left_offset)].max).round
   end
 
   def y
@@ -52,12 +54,20 @@ class Actor
 end
 
 class Window < Gosu::Window
+  @width = 400
+  @height = 300
+
+  def self.width=(width); @width = width end
+  def self.width; @width end
+
+  def self.height=(height); @height = height end
+  def self.height; @height end
 
   attr_accessor :grid
   attr_writer :human, :current_zombie
 
   def initialize
-    super(400, 300, false)
+    super(self.class.width, self.class.height, false)
 
     self.caption = 'Zombie-chaser'
     self.grid = 1

data/zombie-chaser.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zombie-chaser}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Grimm", "Ryan Davis", "Eric Hodel", "Kevin Clark"]
-  s.date = %q{2009-12-08}
+  s.date = %q{2009-12-13}
   s.default_executable = %q{zombie-chaser}
   s.description = %q{A zombie-themed graphic(al) user interface for mutation testing}
   s.email = %q{andrew.j.grimm@gmail.com}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zombie-chaser
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Andrew Grimm
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 +11:00
+date: 2009-12-13 00:00:00 +11:00
 default_executable: zombie-chaser
 dependencies: 
 - !ruby/object:Gem::Dependency