OpenSource/GildedRose-Refactoring-Kata
1
0
Fork 0
mirror of https://github.com/emilybache/GildedRose-Refactoring-Kata.git synced 2025-12-12 04:12:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactoring c# projects (#544)

Browse Source 
Small Refactoring c# projects, e.g.
* add days
* remove StartupObject
* Fix Approval tests for NUnit
* Use Environment.NewLine in Xunit tests
* Added + fixed README.md
* Removed global.json
This commit is contained in:
Stef Heyenrath 2024-06-06 14:13:44 +02:00 committed by GitHub
parent a348b20789
commit 99f2fcbf18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 263 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
csharp.NUnit/GildedRose.sln
View File

@ -1,11 +1,16 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 17
VisualStudioVersion = 16.0.31424.327 VisualStudioVersion = 17.10.34916.146
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GildedRose", "GildedRose\GildedRose.csproj", "{D781C52B-92C0-48BF-8414-177495DF4174}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GildedRose", "GildedRose\GildedRose.csproj", "{D781C52B-92C0-48BF-8414-177495DF4174}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GildedRoseTests", "GildedRoseTests\GildedRoseTests.csproj", "{CB6715CE-A283-4C70-9C1B-F58822077731}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GildedRoseTests", "GildedRoseTests\GildedRoseTests.csproj", "{CB6715CE-A283-4C70-9C1B-F58822077731}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{848F53B4-A532-4386-9DC3-1A477E7D6FCF}"
ProjectSection(SolutionItems) = preProject
README.md = README.md
EndProjectSection
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

56
csharp.NUnit/GildedRose/GildedRose.cs
View File

@ -4,83 +4,83 @@ namespace GildedRoseKata;
public class GildedRose public class GildedRose
{ {
private readonly IList<Item> _items; IList<Item> Items;
public GildedRose(IList<Item> items) public GildedRose(IList<Item> Items)
{ {
_items = items; this.Items = Items;
} }
public void UpdateQuality() public void UpdateQuality()
{ {
for (var i = 0; i < _items.Count; i++) for (var i = 0; i < Items.Count; i++)
{ {
if (_items[i].Name != "Aged Brie" && _items[i].Name != "Backstage passes to a TAFKAL80ETC concert") if (Items[i].Name != "Aged Brie" && Items[i].Name != "Backstage passes to a TAFKAL80ETC concert")
{ {
if (_items[i].Quality > 0) if (Items[i].Quality > 0)
{ {
if (_items[i].Name != "Sulfuras, Hand of Ragnaros") if (Items[i].Name != "Sulfuras, Hand of Ragnaros")
{ {
_items[i].Quality = _items[i].Quality - 1; Items[i].Quality = Items[i].Quality - 1;
} }
} }
} }
else else
{ {
if (_items[i].Quality < 50) if (Items[i].Quality < 50)
{ {
_items[i].Quality = _items[i].Quality + 1; Items[i].Quality = Items[i].Quality + 1;
if (_items[i].Name == "Backstage passes to a TAFKAL80ETC concert") if (Items[i].Name == "Backstage passes to a TAFKAL80ETC concert")
{ {
if (_items[i].SellIn < 11) if (Items[i].SellIn < 11)
{ {
if (_items[i].Quality < 50) if (Items[i].Quality < 50)
{ {
_items[i].Quality = _items[i].Quality + 1; Items[i].Quality = Items[i].Quality + 1;
} }
} }
if (_items[i].SellIn < 6) if (Items[i].SellIn < 6)
{ {
if (_items[i].Quality < 50) if (Items[i].Quality < 50)
{ {
_items[i].Quality = _items[i].Quality + 1; Items[i].Quality = Items[i].Quality + 1;
} }
} }
} }
} }
} }
if (_items[i].Name != "Sulfuras, Hand of Ragnaros") if (Items[i].Name != "Sulfuras, Hand of Ragnaros")
{ {
_items[i].SellIn = _items[i].SellIn - 1; Items[i].SellIn = Items[i].SellIn - 1;
} }
if (_items[i].SellIn < 0) if (Items[i].SellIn < 0)
{ {
if (_items[i].Name != "Aged Brie") if (Items[i].Name != "Aged Brie")
{ {
if (_items[i].Name != "Backstage passes to a TAFKAL80ETC concert") if (Items[i].Name != "Backstage passes to a TAFKAL80ETC concert")
{ {
if (_items[i].Quality > 0) if (Items[i].Quality > 0)
{ {
if (_items[i].Name != "Sulfuras, Hand of Ragnaros") if (Items[i].Name != "Sulfuras, Hand of Ragnaros")
{ {
_items[i].Quality = _items[i].Quality - 1; Items[i].Quality = Items[i].Quality - 1;
} }
} }
} }
else else
{ {
_items[i].Quality = _items[i].Quality - _items[i].Quality; Items[i].Quality = Items[i].Quality - Items[i].Quality;
} }
} }
else else
{ {
if (_items[i].Quality < 50) if (Items[i].Quality < 50)
{ {
_items[i].Quality = _items[i].Quality + 1; Items[i].Quality = Items[i].Quality + 1;
} }
} }
} }

2
csharp.NUnit/GildedRose/GildedRose.csproj
View File

@ -1,6 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType>
<RootNamespace>GildedRoseKata</RootNamespace>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
</PropertyGroup> </PropertyGroup>

8
csharp.NUnit/GildedRoseTests/TextTestFixture.cs → csharp.NUnit/GildedRose/Program.cs
View File

@ -1,16 +1,16 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using GildedRoseKata;
namespace GildedRoseTests; namespace GildedRoseKata;
public static class TextTestFixture public class Program
{ {
public static void Main(string[] args) public static void Main(string[] args)
{ {
Console.WriteLine("OMGHAI!"); Console.WriteLine("OMGHAI!");
var items = new List<Item>{ IList<Item> items = new List<Item>
{
new Item {Name = "+5 Dexterity Vest", SellIn = 10, Quality = 20}, new Item {Name = "+5 Dexterity Vest", SellIn = 10, Quality = 20},
new Item {Name = "Aged Brie", SellIn = 2, Quality = 0}, new Item {Name = "Aged Brie", SellIn = 2, Quality = 0},
new Item {Name = "Elixir of the Mongoose", SellIn = 5, Quality = 7}, new Item {Name = "Elixir of the Mongoose", SellIn = 5, Quality = 7},

8
csharp.NUnit/GildedRoseTests/ApprovalTest.cs
View File

@ -1,10 +1,14 @@
using GildedRoseKata;
using System; using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using NUnit.Framework;
using VerifyNUnit; using VerifyNUnit;
using NUnit.Framework;
namespace GildedRoseTests; namespace GildedRoseTests;
public class ApprovalTest public class ApprovalTest
@ -16,7 +20,7 @@ public class ApprovalTest
Console.SetOut(new StringWriter(fakeOutput)); Console.SetOut(new StringWriter(fakeOutput));
Console.SetIn(new StringReader($"a{Environment.NewLine}")); Console.SetIn(new StringReader($"a{Environment.NewLine}"));
TextTestFixture.Main(new string[] { "30" }); Program.Main(new string[] { "30" });
var output = fakeOutput.ToString(); var output = fakeOutput.ToString();
return Verifier.Verify(output); return Verifier.Verify(output);

35
csharp.NUnit/GildedRoseTests/GildedRoseTests.csproj
View File

@ -1,24 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<StartupObject>GildedRoseTests.TextTestFixture</StartupObject> </PropertyGroup>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Verify.NUnit" Version="23.1.0" /> <PackageReference Include="Verify.NUnit" Version="23.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NUnit" Version="4.0.1" /> <PackageReference Include="NUnit" Version="4.0.1" />
<PackageReference Include="coverlet.collector" Version="6.0.0"> <PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" /> <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\GildedRose\GildedRose.csproj" /> <ProjectReference Include="..\GildedRose\GildedRose.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

27
csharp.NUnit/README.md
View File

@ -1,23 +1,24 @@
# Gilded Rose starting position in Csharp Core # Gilded Rose starting position in C# NUnit
## Build the project ## Build the project
Use your normal build tools. Use your normal build tools to build the projects in Debug mode.
For example, you can use the `dotnet` command line tool:
## Run the TextTest fixture from the Command-Line ``` cmd
dotnet build GildedRose.sln -c Debug
```
## Run the Gilded Rose Command-Line program
For e.g. 10 days: For e.g. 10 days:
``` ``` cmd
GildedRoseTests/bin/Debug/net8.0/GildedRoseTests 10 GildedRose/bin/Debug/net8.0/GildedRose 10
``` ```
You should make sure the command shown above works when you execute it in a terminal before trying to use TextTest (see below). If your tooling has placed the executable somewhere else, you will need to adjust the path above. ## Run all the unit tests
## Run the TextTest approval test that comes with this project
There are instructions in the [TextTest Readme](../texttests/README.md) for setting up TextTest. You will need to specify the GildedRoseTests executable and interpreter in [config.gr](../texttests/config.gr). Uncomment this line:
executable:${TEXTTEST_HOME}/csharpcore/GildedRoseTests/bin/Debug/net8.0/GildedRoseTests
``` cmd
dotnet test
```

7
csharp.NUnit/global.json
View File

@ -1,7 +0,0 @@
{
"sdk": {
"version": "7.0.0",
"rollForward": "latestMajor",
"allowPrerelease": true
}
}

11
csharp.xUnit/GildedRose.sln
View File

@ -1,11 +1,16 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 17
VisualStudioVersion = 16.0.31424.327 VisualStudioVersion = 17.10.34916.146
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GildedRose", "GildedRose\GildedRose.csproj", "{D781C52B-92C0-48BF-8414-177495DF4174}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GildedRose", "GildedRose\GildedRose.csproj", "{D781C52B-92C0-48BF-8414-177495DF4174}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GildedRoseTests", "GildedRoseTests\GildedRoseTests.csproj", "{CB6715CE-A283-4C70-9C1B-F58822077731}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GildedRoseTests", "GildedRoseTests\GildedRoseTests.csproj", "{CB6715CE-A283-4C70-9C1B-F58822077731}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C4DC2F6D-79E1-4AFB-8B3E-9305F18439CE}"
ProjectSection(SolutionItems) = preProject
README.md = README.md
EndProjectSection
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution

134
csharp.xUnit/GildedRose/GildedRose.cs
View File

@ -1,27 +1,79 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace GildedRoseKata namespace GildedRoseKata;
{
public class GildedRose
{
IList<Item> Items;
public GildedRose(IList<Item> Items)
{
this.Items = Items;
}
public void UpdateQuality() public class GildedRose
{
IList<Item> Items;
public GildedRose(IList<Item> Items)
{
this.Items = Items;
}
public void UpdateQuality()
{
for (var i = 0; i < Items.Count; i++)
{ {
for (var i = 0; i < Items.Count; i++) if (Items[i].Name != "Aged Brie" && Items[i].Name != "Backstage passes to a TAFKAL80ETC concert")
{ {
if (Items[i].Name != "Aged Brie" && Items[i].Name != "Backstage passes to a TAFKAL80ETC concert") if (Items[i].Quality > 0)
{ {
if (Items[i].Quality > 0) if (Items[i].Name != "Sulfuras, Hand of Ragnaros")
{ {
if (Items[i].Name != "Sulfuras, Hand of Ragnaros") Items[i].Quality = Items[i].Quality - 1;
}
}
}
else
{
if (Items[i].Quality < 50)
{
Items[i].Quality = Items[i].Quality + 1;
if (Items[i].Name == "Backstage passes to a TAFKAL80ETC concert")
{
if (Items[i].SellIn < 11)
{ {
Items[i].Quality = Items[i].Quality - 1; if (Items[i].Quality < 50)
{
Items[i].Quality = Items[i].Quality + 1;
}
} }
if (Items[i].SellIn < 6)
{
if (Items[i].Quality < 50)
{
Items[i].Quality = Items[i].Quality + 1;
}
}
}
}
}
if (Items[i].Name != "Sulfuras, Hand of Ragnaros")
{
Items[i].SellIn = Items[i].SellIn - 1;
}
if (Items[i].SellIn < 0)
{
if (Items[i].Name != "Aged Brie")
{
if (Items[i].Name != "Backstage passes to a TAFKAL80ETC concert")
{
if (Items[i].Quality > 0)
{
if (Items[i].Name != "Sulfuras, Hand of Ragnaros")
{
Items[i].Quality = Items[i].Quality - 1;
}
}
}
else
{
Items[i].Quality = Items[i].Quality - Items[i].Quality;
} }
} }
else else
@ -29,58 +81,6 @@ namespace GildedRoseKata
if (Items[i].Quality < 50) if (Items[i].Quality < 50)
{ {
Items[i].Quality = Items[i].Quality + 1; Items[i].Quality = Items[i].Quality + 1;
if (Items[i].Name == "Backstage passes to a TAFKAL80ETC concert")
{
if (Items[i].SellIn < 11)
{
if (Items[i].Quality < 50)
{
Items[i].Quality = Items[i].Quality + 1;
}
}
if (Items[i].SellIn < 6)
{
if (Items[i].Quality < 50)
{
Items[i].Quality = Items[i].Quality + 1;
}
}
}
}
}
if (Items[i].Name != "Sulfuras, Hand of Ragnaros")
{
Items[i].SellIn = Items[i].SellIn - 1;
}
if (Items[i].SellIn < 0)
{
if (Items[i].Name != "Aged Brie")
{
if (Items[i].Name != "Backstage passes to a TAFKAL80ETC concert")
{
if (Items[i].Quality > 0)
{
if (Items[i].Name != "Sulfuras, Hand of Ragnaros")
{
Items[i].Quality = Items[i].Quality - 1;
}
}
}
else
{
Items[i].Quality = Items[i].Quality - Items[i].Quality;
}
}
else
{
if (Items[i].Quality < 50)
{
Items[i].Quality = Items[i].Quality + 1;
}
} }
} }
} }

2
csharp.xUnit/GildedRose/GildedRose.csproj
View File

@ -2,8 +2,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>GildedRoseKata</RootNamespace>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<StartupObject>GildedRoseKata.Program</StartupObject>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

13
csharp.xUnit/GildedRose/Item.cs
View File

@ -1,9 +1,8 @@
namespace GildedRoseKata namespace GildedRoseKata;
public class Item
{ {
public class Item public string Name { get; set; }
{ public int SellIn { get; set; }
public string Name { get; set; } public int Quality { get; set; }
public int SellIn { get; set; }
public int Quality { get; set; }
}
} }

95
csharp.xUnit/GildedRose/Program.cs
View File

@ -1,56 +1,61 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace GildedRoseKata namespace GildedRoseKata;
public class Program
{ {
public class Program public static void Main(string[] args)
{ {
public static void Main(string[] args) Console.WriteLine("OMGHAI!");
IList<Item> items = new List<Item>
{ {
Console.WriteLine("OMGHAI!"); new Item {Name = "+5 Dexterity Vest", SellIn = 10, Quality = 20},
new Item {Name = "Aged Brie", SellIn = 2, Quality = 0},
IList<Item> Items = new List<Item>{ new Item {Name = "Elixir of the Mongoose", SellIn = 5, Quality = 7},
new Item {Name = "+5 Dexterity Vest", SellIn = 10, Quality = 20}, new Item {Name = "Sulfuras, Hand of Ragnaros", SellIn = 0, Quality = 80},
new Item {Name = "Aged Brie", SellIn = 2, Quality = 0}, new Item {Name = "Sulfuras, Hand of Ragnaros", SellIn = -1, Quality = 80},
new Item {Name = "Elixir of the Mongoose", SellIn = 5, Quality = 7}, new Item
new Item {Name = "Sulfuras, Hand of Ragnaros", SellIn = 0, Quality = 80},
new Item {Name = "Sulfuras, Hand of Ragnaros", SellIn = -1, Quality = 80},
new Item
{
Name = "Backstage passes to a TAFKAL80ETC concert",
SellIn = 15,
Quality = 20
},
new Item
{
Name = "Backstage passes to a TAFKAL80ETC concert",
SellIn = 10,
Quality = 49
},
new Item
{
Name = "Backstage passes to a TAFKAL80ETC concert",
SellIn = 5,
Quality = 49
},
// this conjured item does not work properly yet
new Item {Name = "Conjured Mana Cake", SellIn = 3, Quality = 6}
};
var app = new GildedRose(Items);
for (var i = 0; i < 31; i++)
{ {
Console.WriteLine("-------- day " + i + " --------"); Name = "Backstage passes to a TAFKAL80ETC concert",
Console.WriteLine("name, sellIn, quality"); SellIn = 15,
for (var j = 0; j < Items.Count; j++) Quality = 20
{ },
System.Console.WriteLine(Items[j].Name + ", " + Items[j].SellIn + ", " + Items[j].Quality); new Item
} {
Console.WriteLine(""); Name = "Backstage passes to a TAFKAL80ETC concert",
app.UpdateQuality(); SellIn = 10,
Quality = 49
},
new Item
{
Name = "Backstage passes to a TAFKAL80ETC concert",
SellIn = 5,
Quality = 49
},
// this conjured item does not work properly yet
new Item {Name = "Conjured Mana Cake", SellIn = 3, Quality = 6}
};
var app = new GildedRose(items);
int days = 2;
if (args.Length > 0)
{
days = int.Parse(args[0]) + 1;
}
for (var i = 0; i < days; i++)
{
Console.WriteLine("-------- day " + i + " --------");
Console.WriteLine("name, sellIn, quality");
for (var j = 0; j < items.Count; j++)
{
Console.WriteLine(items[j].Name + ", " + items[j].SellIn + ", " + items[j].Quality);
} }
Console.WriteLine("");
app.UpdateQuality();
} }
} }
} }

26
csharp.xUnit/GildedRoseTests/ApprovalTest.cs
View File

@ -1,5 +1,4 @@
 using GildedRoseKata;
using GildedRoseKata;
using System; using System;
using System.IO; using System.IO;
@ -10,21 +9,20 @@ using VerifyXunit;
using Xunit; using Xunit;
namespace GildedRoseTests namespace GildedRoseTests;
public class ApprovalTest
{ {
public class ApprovalTest [Fact]
public Task ThirtyDays()
{ {
[Fact] var fakeoutput = new StringBuilder();
public Task ThirtyDays() Console.SetOut(new StringWriter(fakeoutput));
{ Console.SetIn(new StringReader($"a{Environment.NewLine}"));
var fakeoutput = new StringBuilder();
Console.SetOut(new StringWriter(fakeoutput));
Console.SetIn(new StringReader("a\n"));
Program.Main(new string[] { "30" }); Program.Main(new string[] { "30" });
var output = fakeoutput.ToString(); var output = fakeoutput.ToString();
return Verifier.Verify(output); return Verifier.Verify(output);
}
} }
} }

19
csharp.xUnit/GildedRoseTests/GildedRoseTest.cs
View File

@ -2,17 +2,16 @@
using System.Collections.Generic; using System.Collections.Generic;
using GildedRoseKata; using GildedRoseKata;
namespace GildedRoseTests namespace GildedRoseTests;
public class GildedRoseTest
{ {
public class GildedRoseTest [Fact]
public void foo()
{ {
[Fact] IList<Item> Items = new List<Item> { new Item { Name = "foo", SellIn = 0, Quality = 0 } };
public void foo() GildedRose app = new GildedRose(Items);
{ app.UpdateQuality();
IList<Item> Items = new List<Item> { new Item { Name = "foo", SellIn = 0, Quality = 0 } }; Assert.Equal("fixme", Items[0].Name);
GildedRose app = new GildedRose(Items);
app.UpdateQuality();
Assert.Equal("fixme", Items[0].Name);
}
} }
} }

24
csharp.xUnit/README.md Normal file
View File

@ -0,0 +1,24 @@
# Gilded Rose starting position in C# xUnit
## Build the project
Use your normal build tools to build the projects in Debug mode.
For example, you can use the `dotnet` command line tool:
``` cmd
dotnet build GildedRose.sln -c Debug
```
## Run the Gilded Rose Command-Line program
For e.g. 10 days:
``` cmd
GildedRose/bin/Debug/net8.0/GildedRose 10
```
## Run all the unit tests
``` cmd
dotnet test
```

7
csharp.xUnit/global.json
View File

@ -1,7 +0,0 @@
{
"sdk": {
"version": "7.0.0",
"rollForward": "latestMajor",
"allowPrerelease": true
}
}