Update of /cvsroot/mockobjects/nmock/sample/random
In directory usw-pr-cvs1:/tmp/cvs-serv6524/sample/random
Modified Files:
Weather.cs WeatherTest.cs
Log Message:
Fixed skewy formatting and made code more .NETish
Index: Weather.cs
===================================================================
RCS file: /cvsroot/mockobjects/nmock/sample/random/Weather.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Weather.cs 6 Oct 2002 21:37:45 -0000 1.1
+++ Weather.cs 6 Oct 2002 23:14:27 -0000 1.2
@@ -12,14 +12,14 @@
this.random = random;
}
- public bool IsRaining()
+ public bool IsRaining
{
- return isRaining;
+ get { return isRaining; }
}
- public double GetTemperature()
+ public double Temperature
{
- return temperature;
+ get { return temperature; }
}
public void Randomize()
Index: WeatherTest.cs
===================================================================
RCS file: /cvsroot/mockobjects/nmock/sample/random/WeatherTest.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WeatherTest.cs 6 Oct 2002 21:37:45 -0000 1.1
+++ WeatherTest.cs 6 Oct 2002 23:14:27 -0000 1.2
@@ -10,46 +10,51 @@
private IMock random;
private Weather weather;
-
- [SetUp]
- public void SetUp() {
+
+ [SetUp]
+ public void SetUp()
+ {
random = new DynamicMock(typeof(WeatherRandom));
- weather = new Weather((WeatherRandom)random.Object);
- }
-
- [Test]
- public void RandomRaining() {
+ weather = new Weather((WeatherRandom)random.Object);
+ }
+
+ [Test]
+ public void RandomRaining()
+ {
random.ExpectAndReturn("NextTemperature", 1.0);
random.ExpectAndReturn("NextIsRaining", true);
weather.Randomize();
- Assertion.Assert("is raining", weather.IsRaining());
+ Assertion.Assert("is raining", weather.IsRaining);
}
-
- [Test]
- public void RandomNotRaining() {
+
+ [Test]
+ public void RandomNotRaining()
+ {
random.ExpectAndReturn("NextTemperature", 1.0);
random.ExpectAndReturn("NextIsRaining", false);
weather.Randomize();
- Assertion.Assert("is not raining", !weather.IsRaining());
+ Assertion.Assert("is not raining", !weather.IsRaining);
}
-
- [Test]
- public void RandomTemperatureSunny() {
+
+ [Test]
+ public void RandomTemperatureSunny()
+ {
double TEMPERATURE = 20.0;
random.ExpectAndReturn("NextTemperature", TEMPERATURE);
random.ExpectAndReturn("NextIsRaining", false);
weather.Randomize();
- Assertion.AssertEquals("temperature", TEMPERATURE, weather.GetTemperature());
- }
+ Assertion.AssertEquals("temperature", TEMPERATURE, weather.Temperature);
+ }
- [Test]
- public void RandomTemperatureRaining() {
+ [Test]
+ public void RandomTemperatureRaining()
+ {
double TEMPERATURE = 20.0;
random.ExpectAndReturn("NextTemperature", TEMPERATURE);
random.ExpectAndReturn("NextIsRaining", true);
weather.Randomize();
- Assertion.AssertEquals("temperature", TEMPERATURE / 2.0, weather.GetTemperature());
- }
+ Assertion.AssertEquals("temperature", TEMPERATURE / 2.0, weather.Temperature);
+ }
}
|
