Refactoring c# projects (#544)

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 authored and GitHub committed 2024-06-06 14:13:44 +02:00
1 parent a348b20789
commit 99f2fcbf18
17 files changed
+263 -236

No files matched your search

+8 -3
View File
@@ -1,11 +1,16 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31424.327
# Visual Studio Version 17
VisualStudioVersion = 17.10.34916.146
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GildedRose", "GildedRose\GildedRose.csproj", "{D781C52B-92C0-48BF-8414-177495DF4174}"
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
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+68 -68
View File
@@ -1,27 +1,79 @@
using System.Collections.Generic;
namespace GildedRoseKata
{
public class GildedRose
{
IList<Item> Items;
public GildedRose(IList<Item> Items)
{
this.Items = Items;
}
namespace GildedRoseKata;
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
@@ -29,61 +81,9 @@ namespace GildedRoseKata
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)
{
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 -2
View File
@@ -2,8 +2,8 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<RootNamespace>GildedRoseKata</RootNamespace>
<TargetFramework>net8.0</TargetFramework>
<StartupObject>GildedRoseKata.Program</StartupObject>
</PropertyGroup>
</Project>
</Project>
+7 -8
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 int Quality { get; set; }
}
}
public string Name { get; set; }
public int SellIn { get; set; }
public int Quality { get; set; }
}
+51 -46
View File
@@ -1,56 +1,61 @@
using System;
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!");
IList<Item> Items = new List<Item>{
new Item {Name = "+5 Dexterity Vest", SellIn = 10, Quality = 20},
new Item {Name = "Aged Brie", SellIn = 2, Quality = 0},
new Item {Name = "Elixir of the Mongoose", SellIn = 5, Quality = 7},
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++)
new Item {Name = "+5 Dexterity Vest", SellIn = 10, Quality = 20},
new Item {Name = "Aged Brie", SellIn = 2, Quality = 0},
new Item {Name = "Elixir of the Mongoose", SellIn = 5, Quality = 7},
new Item {Name = "Sulfuras, Hand of Ragnaros", SellIn = 0, Quality = 80},
new Item {Name = "Sulfuras, Hand of Ragnaros", SellIn = -1, Quality = 80},
new Item
{
Console.WriteLine("-------- day " + i + " --------");
Console.WriteLine("name, sellIn, quality");
for (var j = 0; j < Items.Count; j++)
{
System.Console.WriteLine(Items[j].Name + ", " + Items[j].SellIn + ", " + Items[j].Quality);
}
Console.WriteLine("");
app.UpdateQuality();
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);
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();
}
}
}
}
+13 -15
View File
@@ -1,5 +1,4 @@
using GildedRoseKata;
using GildedRoseKata;
using System;
using System.IO;
@@ -10,21 +9,20 @@ using VerifyXunit;
using Xunit;
namespace GildedRoseTests
namespace GildedRoseTests;
public class ApprovalTest
{
public class ApprovalTest
[Fact]
public Task ThirtyDays()
{
[Fact]
public Task ThirtyDays()
{
var fakeoutput = new StringBuilder();
Console.SetOut(new StringWriter(fakeoutput));
Console.SetIn(new StringReader("a\n"));
var fakeoutput = new StringBuilder();
Console.SetOut(new StringWriter(fakeoutput));
Console.SetIn(new StringReader($"a{Environment.NewLine}"));
Program.Main(new string[] { "30" });
var output = fakeoutput.ToString();
Program.Main(new string[] { "30" });
var output = fakeoutput.ToString();
return Verifier.Verify(output);
}
return Verifier.Verify(output);
}
}
}
+10 -11
View File
@@ -2,17 +2,16 @@
using System.Collections.Generic;
using GildedRoseKata;
namespace GildedRoseTests
namespace GildedRoseTests;
public class GildedRoseTest
{
public class GildedRoseTest
[Fact]
public void foo()
{
[Fact]
public void foo()
{
IList<Item> Items = new List<Item> { new Item { Name = "foo", SellIn = 0, Quality = 0 } };
GildedRose app = new GildedRose(Items);
app.UpdateQuality();
Assert.Equal("fixme", Items[0].Name);
}
IList<Item> Items = new List<Item> { new Item { Name = "foo", SellIn = 0, Quality = 0 } };
GildedRose app = new GildedRose(Items);
app.UpdateQuality();
Assert.Equal("fixme", Items[0].Name);
}
}
}
+24
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
View File
@@ -1,7 +0,0 @@
{
"sdk": {
"version": "7.0.0",
"rollForward": "latestMajor",
"allowPrerelease": true
}
}