Merge pull request #466 from majstomphorst/feature/cleanup

cleanup
This commit is contained in:
Emily Bache 2023-09-05 13:54:56 +02:00 committed by GitHub
commit ee8917dc92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 144 additions and 152 deletions

View File

@ -1,86 +1,86 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace GildedRoseKata namespace GildedRoseKata;
{
public class GildedRose public class GildedRose
{ {
IList<Item> Items; private readonly IList<Item> _items;
public GildedRose(IList<Item> Items)
public GildedRose(IList<Item> items)
{ {
this.Items = Items; _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;
}
} }
} }
} }

View File

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

View File

@ -3,11 +3,10 @@ using System.IO;
using System.Text; using System.Text;
using ApprovalTests; using ApprovalTests;
using ApprovalTests.Reporters; using ApprovalTests.Reporters;
using GildedRoseTests;
using NUnit.Framework; using NUnit.Framework;
namespace csharp namespace GildedRoseTests;
{
[UseReporter(typeof(DiffReporter))] [UseReporter(typeof(DiffReporter))]
[TestFixture] [TestFixture]
public class ApprovalTest public class ApprovalTest
@ -15,15 +14,13 @@ namespace csharp
[Test] [Test]
public void ThirtyDays() public void ThirtyDays()
{ {
StringBuilder fakeOutput = new StringBuilder();
Console.SetOut(new StringWriter(fakeOutput));
Console.SetIn(new StringReader($"a{Environment.NewLine}"));
StringBuilder fakeoutput = new StringBuilder(); TextTestFixture.Main(new string[] { });
Console.SetOut(new StringWriter(fakeoutput)); var output = fakeOutput.ToString();
Console.SetIn(new StringReader("a\n"));
TexttestFixture.Main(new string[] { });
var output = fakeoutput.ToString();
Approvals.Verify(output); Approvals.Verify(output);
} }
} }
}

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] [Fact]
public void foo() public void Foo()
{ {
IList<Item> Items = new List<Item> { new Item { Name = "foo", SellIn = 0, Quality = 0 } }; IList<Item> items = new List<Item> { new Item { Name = "foo", SellIn = 0, Quality = 0 } };
GildedRose app = new GildedRose(Items); GildedRose app = new GildedRose(items);
app.UpdateQuality(); app.UpdateQuality();
Assert.Equal("fixme", Items[0].Name); Assert.Equal("fixme", items[0].Name);
}
} }
} }

View File

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<StartupObject>GildedRoseTests.TexttestFixture</StartupObject> <StartupObject>GildedRoseTests.TextTestFixture</StartupObject>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@ -0,0 +1,61 @@
using System;
using System.Collections.Generic;
using GildedRoseKata;
namespace GildedRoseTests;
public static class TextTestFixture
{
public static void Main(string[] args)
{
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);
int days = 31;
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();
}
}
}

View File

@ -1,64 +0,0 @@

using GildedRoseKata;
using System;
using System.Collections.Generic;
namespace GildedRoseTests
{
public static class TexttestFixture
{
public static void Main(string[] args)
{
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);
int days = 31;
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++)
{
System.Console.WriteLine(Items[j].Name + ", " + Items[j].SellIn + ", " + Items[j].Quality);
}
Console.WriteLine("");
app.UpdateQuality();
}
}
}
}