[Nmock-general] nmock/sample/random WeatherTest.cs,1.2,1.3

[Owen R. <exo...@us...>]

Update of /cvsroot/nmock/nmock/sample/random
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19470/sample/random

Modified Files:
	WeatherTest.cs 
Log Message:
upgraded to nunit 2.2
upgraded to new version of NAnt

Index: WeatherTest.cs
===================================================================
RCS file: /cvsroot/nmock/nmock/sample/random/WeatherTest.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WeatherTest.cs	15 Nov 2002 22:31:10 -0000	1.2
--- WeatherTest.cs	22 Oct 2004 11:46:26 -0000	1.3
***************
*** 1,58 ****
- using NUnit.Framework;
  using NMock;
  
! namespace NMockSample.Random 
  {
- 
  	[TestFixture]
  	public class WeatherTest
  	{
- 
  		private IMock random;
  		private Weather weather;
! 	
  		[SetUp]
! 		public void SetUp() 
  		{
! 			random = new DynamicMock(typeof(WeatherRandom));
! 			weather = new Weather((WeatherRandom)random.MockInstance);			
  		}
! 		
! 		[Test]	
! 		public void RandomRaining() 
  		{
  			random.SetupResult("NextTemperature", 1.0);
  			random.SetupResult("NextIsRaining", true);
  			weather.Randomize();
! 			Assertion.Assert("is raining", weather.IsRaining);
  		}
! 	
! 		[Test]	
! 		public void RandomNotRaining() 
  		{
  			random.SetupResult("NextTemperature", 1.0);
  			random.SetupResult("NextIsRaining", false);
  			weather.Randomize();
! 			Assertion.Assert("is not raining", !weather.IsRaining);
  		}
! 	
  		[Test]
!  		public void RandomTemperatureSunny() 
!  		{
  			double TEMPERATURE = 20.0;
  			random.SetupResult("NextTemperature", TEMPERATURE);
  			random.SetupResult("NextIsRaining", false);
  			weather.Randomize();
! 			Assertion.AssertEquals("temperature", TEMPERATURE, weather.Temperature);
  		}
  
  		[Test]
!  		public void RandomTemperatureRaining() 
!  		{
  			double TEMPERATURE = 20.0;
  			random.SetupResult("NextTemperature", TEMPERATURE);
  			random.SetupResult("NextIsRaining", true);
  			weather.Randomize();
! 			Assertion.AssertEquals("temperature", TEMPERATURE / 2.0, weather.Temperature);
  		}
  
--- 1,56 ----
  using NMock;
+ using NUnit.Framework;
  
! namespace NMockSample.Random
  {
  	[TestFixture]
  	public class WeatherTest
  	{
  		private IMock random;
  		private Weather weather;
! 
  		[SetUp]
! 		public void SetUp()
  		{
! 			random = new DynamicMock(typeof (WeatherRandom));
! 			weather = new Weather((WeatherRandom) random.MockInstance);
  		}
! 
! 		[Test]
! 		public void RandomRaining()
  		{
  			random.SetupResult("NextTemperature", 1.0);
  			random.SetupResult("NextIsRaining", true);
  			weather.Randomize();
! 			Assert.IsTrue(weather.IsRaining, "is raining");
  		}
! 
! 		[Test]
! 		public void RandomNotRaining()
  		{
  			random.SetupResult("NextTemperature", 1.0);
  			random.SetupResult("NextIsRaining", false);
  			weather.Randomize();
! 			Assert.IsTrue(!weather.IsRaining, "is not raining");
  		}
! 
  		[Test]
! 		public void RandomTemperatureSunny()
! 		{
  			double TEMPERATURE = 20.0;
  			random.SetupResult("NextTemperature", TEMPERATURE);
  			random.SetupResult("NextIsRaining", false);
  			weather.Randomize();
! 			Assert.AreEqual(TEMPERATURE, weather.Temperature, "temperature");
  		}
  
  		[Test]
! 		public void RandomTemperatureRaining()
! 		{
  			double TEMPERATURE = 20.0;
  			random.SetupResult("NextTemperature", TEMPERATURE);
  			random.SetupResult("NextIsRaining", true);
  			weather.Randomize();
! 			Assert.AreEqual(TEMPERATURE/2.0, weather.Temperature, "temperature");
  		}
  
***************
*** 62,107 ****
  	public class DefaultWeatherRandomTest
  	{
- 		
  		[Test]
  		public void NextIsRaining()
  		{
! 			IMock random = new DynamicMock(typeof(System.Random));
! 			WeatherRandom weather = new DefaultWeatherRandom((System.Random)random.MockInstance);
! 			
  			random.SetupResult("NextDouble", 0.0);
! 			Assertion.Assert("is raining", weather.NextIsRaining());
! 			
  			random.SetupResult("NextDouble", DefaultWeatherRandom.CHANCE_OF_RAIN);
! 			Assertion.Assert("is not raining", !weather.NextIsRaining());
! 			
  			random.SetupResult("NextDouble", 1.0);
! 			Assertion.Assert("is not raining", !weather.NextIsRaining());
  		}
! 	
  		[Test]
  		public void NextTemperature()
  		{
! 			IMock random = new DynamicMock(typeof(System.Random));
! 			WeatherRandom weather = new DefaultWeatherRandom((System.Random)random.MockInstance);
! 			
  			random.SetupResult("NextDouble", 0.0);
! 			Assertion.AssertEquals("should be min temperature", 
  				DefaultWeatherRandom.MIN_TEMPERATURE,
! 				weather.NextTemperature()
! 			);
! 			
  			random.SetupResult("NextDouble", 0.5);
! 			Assertion.AssertEquals("should be average temperature", 
! 				0.5 * (DefaultWeatherRandom.MIN_TEMPERATURE + DefaultWeatherRandom.MAX_TEMPERATURE),
! 				weather.NextTemperature()
! 			);
! 			
  			random.SetupResult("NextDouble", 1.0);
! 			Assertion.AssertEquals("should be max temperature", 
! 				DefaultWeatherRandom.MAX_TEMPERATURE,
! 				weather.NextTemperature()
! 			);
  		}
! 	
  	}
! }
--- 60,104 ----
  	public class DefaultWeatherRandomTest
  	{
  		[Test]
  		public void NextIsRaining()
  		{
! 			IMock random = new DynamicMock(typeof (System.Random));
! 			WeatherRandom weather = new DefaultWeatherRandom((System.Random) random.MockInstance);
! 
  			random.SetupResult("NextDouble", 0.0);
! 			Assert.IsTrue(weather.NextIsRaining(), "is raining");
! 
  			random.SetupResult("NextDouble", DefaultWeatherRandom.CHANCE_OF_RAIN);
! 			Assert.IsTrue(!weather.NextIsRaining(), "is not raining");
! 
  			random.SetupResult("NextDouble", 1.0);
! 			Assert.IsTrue(!weather.NextIsRaining(), "is not raining");
  		}
! 
  		[Test]
  		public void NextTemperature()
  		{
! 			IMock random = new DynamicMock(typeof (System.Random));
! 			WeatherRandom weather = new DefaultWeatherRandom((System.Random) random.MockInstance);
! 
  			random.SetupResult("NextDouble", 0.0);
! 			Assert.AreEqual(
  				DefaultWeatherRandom.MIN_TEMPERATURE,
! 				weather.NextTemperature(), "should be min temperature"
! 				);
! 
  			random.SetupResult("NextDouble", 0.5);
! 			Assert.AreEqual(
! 			                0.5*(DefaultWeatherRandom.MIN_TEMPERATURE + DefaultWeatherRandom.MAX_TEMPERATURE),
! 			                weather.NextTemperature(), "should be average temperature"
! 				);
! 
  			random.SetupResult("NextDouble", 1.0);
! 			Assert.AreEqual(
! 			                DefaultWeatherRandom.MAX_TEMPERATURE,
! 			                weather.NextTemperature(), "should be max temperature"
! 				);
  		}
! 
  	}
! }
\ No newline at end of file