update cs/ch07 with README's and updated libraries

bgruenba · bgruenba · commit 89d49ac01de3 · 2025-09-19T22:13:24.000-07:00
diff --git a/cs/ch07/Money.Tests/DollarTest.cs b/cs/ch07/Money.Tests/DollarTest.cs
@@ -5,20 +5,20 @@ namespace TheSoftwareGorilla.TDD.Money.Tests;
 
 public class DollarTests
 {
+    
     [SetUp]
     public void Setup()
     {
+        // No setup required for these tests
     }
 
     [Test]
     public void TestConstruction()
     {
         var five = new Dollar(5);
-        Assert.IsNotNull(five);
-        Assert.That(five.Amount, Is.EqualTo(5));
-        var ten = new Dollar(10);
-        Assert.IsNotNull(ten);
-        Assert.That(ten.Amount, Is.EqualTo(10));
+        Assert.That(five, Is.Not.Null);
+        Assert.That(five, Is.InstanceOf<Dollar>());
+        Assert.That(five, Is.EqualTo(new Dollar(5)));
     }
 
     [Test]
diff --git a/cs/ch07/Money.Tests/FrancTest.cs b/cs/ch07/Money.Tests/FrancTest.cs
@@ -1,24 +1,22 @@
-using NUnit.Framework;
-using TheSoftwareGorilla.TDD.Money;
-
 namespace TheSoftwareGorilla.TDD.Money.Tests;
 
 public class FrancTests
 {
+    //TODO: 5 CHF * 2 = 10 CHF - DONE
+    
     [SetUp]
     public void Setup()
     {
+        // No setup required for these tests
     }
 
     [Test]
     public void TestConstruction()
     {
         var five = new Franc(5);
-        Assert.IsNotNull(five);
-        Assert.That(five.Amount, Is.EqualTo(5));
-        var ten = new Franc(10);
-        Assert.IsNotNull(ten);
-        Assert.That(ten.Amount, Is.EqualTo(10));
+        Assert.That(five, Is.Not.Null);
+        Assert.That(five, Is.InstanceOf<Franc>());
+        Assert.That(five, Is.EqualTo(new Franc(5)));
     }
 
     [Test]
diff --git a/cs/ch07/Money.Tests/Money.Tests.csproj b/cs/ch07/Money.Tests/Money.Tests.csproj
@@ -10,11 +10,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="coverlet.collector" Version="6.0.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NUnit" Version="4.4.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.10.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/cs/ch07/Money.Tests/MoneyTest.cs b/cs/ch07/Money.Tests/MoneyTest.cs
@@ -1,28 +1,48 @@
-using NUnit.Framework;
-using TheSoftwareGorilla.TDD.Money;
-
 namespace TheSoftwareGorilla.TDD.Money.Tests;
 
 public class MoneyTests
 {
+    //TODO: $5 + 10 CHF = $10 if rate is 2:1
+    //TODO: $5 * 2 = $10 - DONE 
+    //TODO: Make "amount" private - DONE
+    //TODO: Dollar side-effects? - DONE
+    //TODO: Money rounding?
+    //TODO: equals() -DONE
+    //TODO: hashCode()
+    //TODO: Equal null
+    //TODO: Equal object
+    //TODO: 5 CHF * 2 = 10 CHF - DONE
+    //TODO: Dollar/Franc duplication
+    //TODO: Common equals - DONE
+    //TODO: Common Times
+    //TODO: Compare Francs with Dollars - DONE
+    //TODO: Currency?
+
     [SetUp]
     public void Setup()
     {
+        // No setup required for these tests
     }
 
     [Test]
     public void TestEquality()
     {
-        Assert.That(new Dollar(5), Is.EqualTo(new Dollar(5)));
-        Assert.That(new Dollar(6), Is.Not.EqualTo(new Dollar(5)));
-        Assert.That(new Franc(5), Is.EqualTo(new Franc(5)));
-        Assert.That(new Franc(6), Is.Not.EqualTo(new Franc(5)));
-
+        Dollar fived = new Dollar(5);
+        Dollar sixd = new Dollar(6);
+        Franc fivef = new Franc(5);
+        Franc sixf = new Franc(6);
+        
+        Assert.That(fived, Is.EqualTo(new Dollar(5)));
+        Assert.That(sixd, Is.Not.EqualTo(new Dollar(5)));
+        Assert.That(fivef, Is.EqualTo(new Franc(5)));
+        Assert.That(sixf, Is.Not.EqualTo(new Franc(5)));		
+		
         // In NUnit, the following line will not compile because .EqualTo type-checks its argument.
-        // I'm commenting the line out to avoid compilation errors, and I added Assert.False below to
+        // I'm commenting the line out to avoid compilation errors, and I added Assert(Is.False) below to
         // be more consistent with the book.
         // Assert.That(new Franc(5), Is.Not.EqualTo(new Dollar(5)));
-        Assert.False(new Franc(5).Equals(new Dollar(5)));
+        Assert.That(new Franc(5).Equals(new Dollar(5)), Is.False);
+
    }
 
 }
diff --git a/cs/ch07/Money/Dollar.cs b/cs/ch07/Money/Dollar.cs
@@ -3,14 +3,14 @@
 public class Dollar : Money
 {
 
-    public Dollar(int amount)
+    public Dollar(int amount) 
     {
-        Amount = amount;
+        this.amount = amount;
     }
 
     public Dollar Times(int multiplier)
     {
-        return new Dollar(Amount * multiplier);
+        return new Dollar(amount * multiplier);
     }
 
 }
diff --git a/cs/ch07/Money/Franc.cs b/cs/ch07/Money/Franc.cs
@@ -5,12 +5,12 @@ public class Franc : Money
 
     public Franc(int amount)
     {
-        Amount = amount;
+        this.amount = amount;
     }
 
     public Franc Times(int multiplier)
     {
-        return new Franc(Amount * multiplier);
+        return new Franc(amount * multiplier);
     }
 
 }
diff --git a/cs/ch07/Money/Money.cs b/cs/ch07/Money/Money.cs
@@ -2,11 +2,11 @@ namespace TheSoftwareGorilla.TDD.Money;
 
 public class Money
 {
-    public int Amount { get; protected set; }
+    protected int amount;
 
     public override bool Equals(object? obj)
     {
-        return obj is Money money && GetType().Equals(obj.GetType()) && Amount == money.Amount;
+        return obj is Money money && GetType().Equals(obj.GetType()) && amount == money.amount;
     }
 
 
diff --git a/cs/ch07/README.md b/cs/ch07/README.md
@@ -0,0 +1,37 @@
+# Test-Driven Development - C# - Chapter 07
+
+This solution contains a code for Chapter 7 of the book ["Test-Driven Development By Example" by 
+Kent Beck](https://a.co/d/1sr05eT). The code is written in C# and uses the NUnit testing framework for the tests. 
+
+For information on how to set up the repository, please see the [README in the ch00](../ch00/README.md) folder.
+
+## Chapter 7 - Apples and Oranges
+This is another really small chapter. For this chapter the focus is making sure that the Equals does a type check for 
+the object being compared and that it is generalized for all Money objects.
+
+### TODO list at the end of the chapter
+By the end of the chapter, the TODO list looks like this:
+- [ ] \$5 + 10 CHF = $10 if rate is 2:1
+- [x] \$5 * 2 = $10
+- [x] Make "amount" private
+- [x] Dollar side-effects?
+- [ ] Money rounding?
+- [x] equals()
+- [ ] hashCode()
+- [ ] Equal null
+- [ ] Equal object
+- [x] 5 CHF * 2 = 10 CHF
+- [ ] Dollar/Franc duplication
+- [x] Common Equals
+- [ ] Common Times
+- [x] Compare Francs with Dollars
+- [ ] Currency?
+
+## Last Update
+I try and keep this code up to date with the latest versions. I generally wait until a new version of .NET SDK is 
+released and I only update it for Long Term Support (LTS) versions. .NET 8 is the latest LTS version as of this writing.
+
+This repository was last updated in September 2025.
+- .NET SDK version 8
+- NUnit version 4.4.0
+- JetBrains Rider version 2025.2.2

Original file line number	Diff line number	Diff line change
`@@ -5,20 +5,20 @@ namespace TheSoftwareGorilla.TDD.Money.Tests;`
`5`	`5`
`6`	`6`	`public class DollarTests`
`7`	`7`	`{`
	`8`	`+`
`8`	`9`	`[SetUp]`
`9`	`10`	`public void Setup()`
`10`	`11`	`{`
	`12`	`+ // No setup required for these tests`
`11`	`13`	`}`
`12`	`14`
`13`	`15`	`[Test]`
`14`	`16`	`public void TestConstruction()`
`15`	`17`	`{`
`16`	`18`	`var five = new Dollar(5);`
`17`		`- Assert.IsNotNull(five);`
`18`		`- Assert.That(five.Amount, Is.EqualTo(5));`
`19`		`- var ten = new Dollar(10);`
`20`		`- Assert.IsNotNull(ten);`
`21`		`- Assert.That(ten.Amount, Is.EqualTo(10));`
	`19`	`+ Assert.That(five, Is.Not.Null);`
	`20`	`+ Assert.That(five, Is.InstanceOf<Dollar>());`
	`21`	`+ Assert.That(five, Is.EqualTo(new Dollar(5)));`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -1,24 +1,22 @@`
`1`		`-using NUnit.Framework;`
`2`		`-using TheSoftwareGorilla.TDD.Money;`
`3`		`-`
`4`	`1`	`namespace TheSoftwareGorilla.TDD.Money.Tests;`
`5`	`2`
`6`	`3`	`public class FrancTests`
`7`	`4`	`{`
	`5`	`+ //TODO: 5 CHF * 2 = 10 CHF - DONE`
	`6`	`+`
`8`	`7`	`[SetUp]`
`9`	`8`	`public void Setup()`
`10`	`9`	`{`
	`10`	`+ // No setup required for these tests`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`[Test]`
`14`	`14`	`public void TestConstruction()`
`15`	`15`	`{`
`16`	`16`	`var five = new Franc(5);`
`17`		`- Assert.IsNotNull(five);`
`18`		`- Assert.That(five.Amount, Is.EqualTo(5));`
`19`		`- var ten = new Franc(10);`
`20`		`- Assert.IsNotNull(ten);`
`21`		`- Assert.That(ten.Amount, Is.EqualTo(10));`
	`17`	`+ Assert.That(five, Is.Not.Null);`
	`18`	`+ Assert.That(five, Is.InstanceOf<Franc>());`
	`19`	`+ Assert.That(five, Is.EqualTo(new Franc(5)));`
`22`	`20`	`}`
`23`	`21`
`24`	`22`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,14 @@`
`3`	`3`	`public class Dollar : Money`
`4`	`4`	`{`
`5`	`5`
`6`		`- public Dollar(int amount)`
	`6`	`+ public Dollar(int amount)`
`7`	`7`	`{`
`8`		`- Amount = amount;`
	`8`	`+ this.amount = amount;`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`public Dollar Times(int multiplier)`
`12`	`12`	`{`
`13`		`- return new Dollar(Amount * multiplier);`
	`13`	`+ return new Dollar(amount * multiplier);`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@ public class Franc : Money`
`5`	`5`
`6`	`6`	`public Franc(int amount)`
`7`	`7`	`{`
`8`		`- Amount = amount;`
	`8`	`+ this.amount = amount;`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`public Franc Times(int multiplier)`
`12`	`12`	`{`
`13`		`- return new Franc(Amount * multiplier);`
	`13`	`+ return new Franc(amount * multiplier);`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@ namespace TheSoftwareGorilla.TDD.Money;`
`2`	`2`
`3`	`3`	`public class Money`
`4`	`4`	`{`
`5`		`- public int Amount { get; protected set; }`
	`5`	`+ protected int amount;`
`6`	`6`
`7`	`7`	`public override bool Equals(object? obj)`
`8`	`8`	`{`
`9`		`- return obj is Money money && GetType().Equals(obj.GetType()) && Amount == money.Amount;`
	`9`	`+ return obj is Money money && GetType().Equals(obj.GetType()) && amount == money.amount;`
`10`	`10`	`}`
`11`	`11`
`12`	`12`