TirePressureMonitoringSystem/C#: Fixed typo.

TirePressureMonitoringSystem/JavaScript: Fixed typo and synchronised the proposed solution with previous changes in the original exercise.
Neppord · Sep 12, 2013 · 26a0c96 · 26a0c96
1 parent 26390dc
commit 26a0c96
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 22 deletions.
diff --git a/TDDMicroExercises.ProposedSolution/CSharp/TirePressureMonitoringSystem.Tests/AlarmTest.cs b/TDDMicroExercises.ProposedSolution/CSharp/TirePressureMonitoringSystem.Tests/AlarmTest.cs
@@ -9,7 +9,7 @@ public class AlarmTest
         public void a_normal_pressure_value_should_not_raise_the_alarm()
         {
             var stubSensor = new StubSensor();
-            stubSensor.StubCallToPopNextPressurePsiValue(Alarm.LowPressureTreshold);
+            stubSensor.StubCallToPopNextPressurePsiValue(Alarm.LowPressureThreshold);
             var target = new Alarm(stubSensor);
 
             target.Check();
@@ -21,7 +21,7 @@ public void a_normal_pressure_value_should_not_raise_the_alarm()
         public void a_pressure_value_out_of_range_should_raise_the_alarm()
         {
             var stubSensor = new StubSensor();
-            stubSensor.StubCallToPopNextPressurePsiValue(Alarm.LowPressureTreshold -1);
+            stubSensor.StubCallToPopNextPressurePsiValue(Alarm.LowPressureThreshold -1);
             var target = new Alarm(stubSensor);
 
             target.Check();
@@ -33,7 +33,7 @@ public void a_pressure_value_out_of_range_should_raise_the_alarm()
         public void a_normal_pressure_value_after_an_out_of_range_pressure_value_should_keep_the_alarm_on()
         {
             var stubSensor = new StubSensor();
-            stubSensor.StubCallToPopNextPressurePsiValues(new[] { Alarm.LowPressureTreshold, Alarm.LowPressureTreshold - 1, Alarm.LowPressureTreshold });
+            stubSensor.StubCallToPopNextPressurePsiValues(new[] { Alarm.LowPressureThreshold, Alarm.LowPressureThreshold - 1, Alarm.LowPressureThreshold });
             var target = new Alarm(stubSensor);
 
             target.Check();

diff --git a/TDDMicroExercises.ProposedSolution/CSharp/TirePressureMonitoringSystem/Alarm.cs b/TDDMicroExercises.ProposedSolution/CSharp/TirePressureMonitoringSystem/Alarm.cs
@@ -2,8 +2,8 @@ namespace TDDMicroExercises.OneSolution.TirePressureMonitoringSystem
 {
     public class Alarm
     {
-        public const double LowPressureTreshold = 17;
-        public const double HighPressureTreshold = 21;
+        public const double LowPressureThreshold = 17;
+        public const double HighPressureThreshold = 21;
 
         readonly ISensor _sensor;
 
@@ -22,7 +22,7 @@ public void Check()
         {
             double psiPressureValue = _sensor.PopNextPressurePsiValue();
 
-            if (psiPressureValue < LowPressureTreshold || HighPressureTreshold < psiPressureValue)
+            if (psiPressureValue < LowPressureThreshold || HighPressureThreshold < psiPressureValue)
             {
                 _alarmOn = true;
             }

diff --git a/...Exercises.ProposedSolution/Javascript/tire-pressure-monitoring-system-tests/alarm-test.js b/...Exercises.ProposedSolution/Javascript/tire-pressure-monitoring-system-tests/alarm-test.js
@@ -11,15 +11,15 @@ describe('Tyre Pressure Monitoring System', function () {
 		});
 
 		it('a normal pressure value should not raise the alarm', function () {
-			spyOn(stubSensor, 'popNextPressurePsiValue').andCallFake(function () { return 19; });
+			spyOn(stubSensor, 'popNextPressurePsiValue').andCallFake(function () { return Alarm.LowPressureThreshold() +2; });
 
 			target.check();
 
 			expect(target.alarmOn()).toBeFalsy();
 		});
 
 		it('a pressure value out of range should raise the alarm', function () {
-			spyOn(stubSensor, 'popNextPressurePsiValue').andCallFake(function () { return 22; });
+			spyOn(stubSensor, 'popNextPressurePsiValue').andCallFake(function () { return Alarm.HighPressureThreshold() +1; });
 
 			target.check();
 
@@ -28,7 +28,7 @@ describe('Tyre Pressure Monitoring System', function () {
 
 
 		it('a normal pressure value after an out of range pressure value should keep the alarm on', function () {
-			var sensorValueStream = [22, 19];
+			var sensorValueStream = [Alarm.HighPressureThreshold() +1, Alarm.LowPressureThreshold() +2];
 			spyOn(stubSensor, 'popNextPressurePsiValue').andCallFake(function () { return sensorValueStream.pop(); });
 
 			target.check();

diff --git a/TDDMicroExercises.ProposedSolution/Javascript/tire-pressure-monitoring-system/alarm.js b/TDDMicroExercises.ProposedSolution/Javascript/tire-pressure-monitoring-system/alarm.js
@@ -1,8 +1,6 @@
 
 Alarm = function(sensor) {
 
-	this._lowPressureTreshold = 17;
-	this._highPressureTreshold = 21;
 	this._sensor = sensor;
 	this._alarmOn = false;
 };
@@ -11,13 +9,21 @@ Alarm.Create = function() {
 	return new Alarm(new Sensor());
 };
 
+Alarm.LowPressureThreshold = function() {
+    return 17;
+};
+
+Alarm.HighPressureThreshold = function() {
+    return 21;
+};
+
 Alarm.prototype = {
 
 	check: function () {
 
 		var psiPressureValue = this._sensor.popNextPressurePsiValue();
 
-		if (psiPressureValue < this._lowPressureTreshold || this._highPressureTreshold < psiPressureValue)
+		if (psiPressureValue < Alarm.LowPressureThreshold() || Alarm.HighPressureThreshold()  < psiPressureValue)
 		{
 			this._alarmOn = true;
 		}

diff --git a/TDDMicroExercises/CSharp/TirePressureMonitoringSystem/Alarm.cs b/TDDMicroExercises/CSharp/TirePressureMonitoringSystem/Alarm.cs
@@ -2,8 +2,8 @@ namespace TDDMicroExercises.TirePressureMonitoringSystem
 {
     public class Alarm
     {
-        private const double LowPressureTreshold = 17;
-        private const double HighPressureTreshold = 21;
+        private const double LowPressureThreshold = 17;
+        private const double HighPressureThreshold = 21;
 
         readonly Sensor _sensor = new Sensor();
 
@@ -13,7 +13,7 @@ public void Check()
         {
             double psiPressureValue = _sensor.PopNextPressurePsiValue();
 
-            if (psiPressureValue < LowPressureTreshold || HighPressureTreshold < psiPressureValue)
+            if (psiPressureValue < LowPressureThreshold || HighPressureThreshold < psiPressureValue)
             {
                 _alarmOn = true;
             }

diff --git a/...eMonitoringSystem/src/main/java/tddmicroexercises/tirepressuremonitoringsystem/Alarm.java b/...eMonitoringSystem/src/main/java/tddmicroexercises/tirepressuremonitoringsystem/Alarm.java
@@ -1,9 +1,9 @@
 package tddmicroexercises.tirepressuremonitoringsystem;
 
-public class Alarm implements IAlarm
+public class Alarm
 {
-    private final double LowPressureTreshold = 17;
-    private final double HighPressureTreshold = 21;
+    private final double LowPressureThreshold = 17;
+    private final double HighPressureThreshold = 21;
 
     Sensor sensor = new Sensor();
 
@@ -14,7 +14,7 @@ public void check()
     {
         double psiPressureValue = sensor.popNextPressurePsiValue();
 
-        if (psiPressureValue < LowPressureTreshold || HighPressureTreshold < psiPressureValue)
+        if (psiPressureValue < LowPressureThreshold || HighPressureThreshold < psiPressureValue)
         {
             alarmOn = true;
             alarmCount += 1;

diff --git a/TDDMicroExercises/Javascript/tire-pressure-monitoring-system/alarm.js b/TDDMicroExercises/Javascript/tire-pressure-monitoring-system/alarm.js
@@ -1,8 +1,8 @@
 
 Alarm = function() {
 
-	this._lowPressureTreshold = 17;
-	this._highPressureTreshold = 21;
+	this._lowPressureThreshold = 17;
+	this._highPressureThreshold = 21;
 	this._sensor = new Sensor();
 	this._alarmOn = false;
 };
@@ -13,7 +13,7 @@ Alarm.prototype = {
 
 		var psiPressureValue = this._sensor.popNextPressurePsiValue();
 
-		if (psiPressureValue < this._lowPressureTreshold || this._highPressureTreshold < psiPressureValue)
+		if (psiPressureValue < this._lowPressureThreshold || this._highPressureThreshold < psiPressureValue)
 		{
 			this._alarmOn = true;
 		}