spec/measurements/measurement_spec.rb in barometer-0.6.1 vs spec/measurements/measurement_spec.rb in barometer-0.6.2

- old
+ new

@@ -97,27 +97,27 @@ valid_data = Time.now.utc valid_data.class.should == Time lambda { @measurement.utc_time_stamp = valid_data }.should_not raise_error(ArgumentError) end - it "only accepts Data::CurrentMeasurement for current" do + it "only accepts Measurement::Result for current" do invalid_data = "invalid" - invalid_data.class.should_not == Measurement::Current + invalid_data.class.should_not == Measurement::Result lambda { @measurement.current = invalid_data }.should raise_error(ArgumentError) - valid_data = Measurement::Current.new - valid_data.class.should == Measurement::Current + valid_data = Measurement::Result.new + valid_data.class.should == Measurement::Result lambda { @measurement.current = valid_data }.should_not raise_error(ArgumentError) end - it "only accepts Data::ForecastArray for forecast" do + it "only accepts Data::ResultArray for forecast" do invalid_data = 1 - invalid_data.class.should_not == Measurement::ForecastArray + invalid_data.class.should_not == Measurement::ResultArray lambda { @measurement.forecast = invalid_data }.should raise_error(ArgumentError) - valid_data = Measurement::ForecastArray.new - valid_data.class.should == Measurement::ForecastArray + valid_data = Measurement::ResultArray.new + valid_data.class.should == Measurement::ResultArray lambda { @measurement.forecast = valid_data }.should_not raise_error(ArgumentError) end it "only accepts Data::Zone for timezone" do invalid_data = 1 @@ -192,20 +192,20 @@ @measurement.success! @measurement.utc_time_stamp.should be_nil @measurement.current.should be_nil @measurement.success.should be_false - @measurement.current = Measurement::Current.new + @measurement.current = Measurement::Result.new @measurement.current.temperature = Data::Temperature.new @measurement.current.temperature.c = 10 @measurement.utc_time_stamp.should_not be_nil @measurement.success! @measurement.success.should be_true end it "returns successful state" do - @measurement.current = Measurement::Current.new + @measurement.current = Measurement::Result.new @measurement.current.temperature = Data::Temperature.new @measurement.current.temperature.c = 10 @measurement.success! @measurement.success.should be_true @measurement.success?.should be_true @@ -224,11 +224,11 @@ it "indicates if current" do @measurement.current.should be_nil @measurement.current?.should be_true - @measurement.current = Measurement::Current.new + @measurement.current = Measurement::Result.new @measurement.current.current_at.should be_nil @measurement.current?.should be_true @measurement.current.current_at = Data::LocalTime.new(9,0,0) @measurement.current?.should be_true @@ -286,25 +286,25 @@ describe "when searching forecasts using 'for'" do before(:each) do @measurement = Barometer::Measurement.new - # create a measurement object with a forecast array that includes + # create a measurement object with a result array that includes # dates for 4 consecutive days starting with tommorrow - @measurement.forecast = Measurement::ForecastArray.new + @measurement.forecast = Measurement::ResultArray.new 1.upto(4) do |i| - forecast_measurement = Measurement::Forecast.new + forecast_measurement = Measurement::Result.new forecast_measurement.date = Date.parse((Time.now + (i * 60 * 60 * 24)).to_s) @measurement.forecast << forecast_measurement end @measurement.forecast.size.should == 4 @tommorrow = (Time.now + (60 * 60 * 24)) end it "returns nil when there are no forecasts" do - @measurement.forecast = Measurement::ForecastArray.new + @measurement.forecast = Measurement::ResultArray.new @measurement.forecast.size.should == 0 @measurement.for.should be_nil end it "finds the date using a String" do @@ -346,11 +346,11 @@ describe "when answering the simple questions," do before(:each) do @measurement = Barometer::Measurement.new(:wunderground) - @measurement.current = Measurement::Current.new + @measurement.current = Measurement::Result.new @now = Data::LocalDateTime.parse("2009-05-01 2:05 pm") end # def windy?(time_string=nil, threshold=10) # local_time = Data::LocalTime.parse(time_string) @@ -364,91 +364,67 @@ # end describe "windy?" do it "returns true if a current_measurement returns true" do - module Barometer; class Measurement::Current < Measurement::Common - def windy?(a=nil); true; end - end; end + @measurement.current.stubs(:windy?).returns(true) @measurement.windy?.should be_true end - + it "returns false if a current_measurement returns false" do - module Barometer; class Measurement::Current < Measurement::Common - def windy?(a=nil); false; end - end; end + @measurement.current.stubs(:windy?).returns(false) @measurement.windy?.should be_false end end describe "wet?" do it "returns true if the current_measurement returns true" do - module Barometer; class Measurement::Current < Measurement::Common - def wet?(a=nil,b=nil,c=nil); true; end - end; end + @measurement.current.stubs(:wet?).returns(true) @measurement.wet?.should be_true end it "returns false if the current_measurement returns false" do - module Barometer; class Measurement::Current < Measurement::Common - def wet?(a=nil,b=nil,c=nil); false; end - end; end + @measurement.current.stubs(:wet?).returns(false) @measurement.wet?.should be_false end end describe "day?" do it "returns true if the current_measurement returns true" do - module Barometer; class Measurement::Current < Measurement::Common - def day?(a=nil); true; end - end; end + @measurement.current.stubs(:day?).returns(true) @measurement.day?.should be_true end it "returns false if the current_measurement returns false" do - module Barometer; class Measurement::Current < Measurement::Common - def day?(a=nil); false; end - end; end + @measurement.current.stubs(:day?).returns(false) @measurement.day?.should be_false end end describe "sunny?" do it "returns true if the current_measurement returns true and day" do - module Barometer; class Measurement::Current < Measurement::Common - def day?(a=nil); true; end - end; end - module Barometer; class Measurement::Current < Measurement::Common - def sunny?(a=nil,b=nil); true; end - end; end + @measurement.current.stubs(:day?).returns(true) + @measurement.current.stubs(:sunny?).returns(true) @measurement.day?.should be_true @measurement.sunny?.should be_true end it "returns false if the current_measurement returns false and day" do - module Barometer; class Measurement::Current < Measurement::Common - def day?(a=nil); true; end - end; end - module Barometer; class Measurement::Current < Measurement::Common - def sunny?(a=nil,b=nil); false; end - end; end + @measurement.current.stubs(:day?).returns(true) + @measurement.current.stubs(:sunny?).returns(false) @measurement.day?.should be_true @measurement.sunny?.should be_false end it "returns false if night time" do - module Barometer; class Measurement::Current < Measurement::Common - def day?(a=nil); false; end - end; end - module Barometer; class Measurement::Current < Measurement::Common - def sunny?(a=nil,b=nil); true; end - end; end + @measurement.current.stubs(:day?).returns(false) + @measurement.current.stubs(:sunny?).returns(true) @measurement.day?.should be_false @measurement.sunny?.should be_false end end