From ed8c73bf091741e6b1a192ee9c22fcc0c33a36f1 Mon Sep 17 00:00:00 2001 From: Jeremie Magnette Date: Sat, 19 Dec 2020 16:44:27 +0100 Subject: [PATCH] Refactoring for code style consistancy --- csharpcore/GildedRose.cs | 38 +++++++++++++++++++++++++----------- csharpcore/GildedRoseTest.cs | 24 +++-------------------- 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/csharpcore/GildedRose.cs b/csharpcore/GildedRose.cs index 9fbebeeb..a5120404 100644 --- a/csharpcore/GildedRose.cs +++ b/csharpcore/GildedRose.cs @@ -25,8 +25,9 @@ namespace csharpcore { var lowerCaseItemName = item.Name.ToLower(); if (lowerCaseItemName.Contains(SULFURA_ITEM)) + { HandleSulfuraItem(item); - + } else { item.SellIn -= 1; @@ -46,7 +47,6 @@ namespace csharpcore { HandleMiscelaniousItem(item); } - } } } @@ -59,54 +59,70 @@ namespace csharpcore private void HandleAgedBrieItem(Item item) { if (item.SellIn > 0) + { UpdateItemQualityValue(item, 1); - + } else + { UpdateItemQualityValue(item, 2); // Is it correct ? This is to reflect old code but seems to not be in the spec - + } } private void HandleBackstagePassItem(Item item) { if (item.SellIn >= 10) + { UpdateItemQualityValue(item, 1); - + } else if (item.SellIn >= 5) + { UpdateItemQualityValue(item, 2); - + } else if (item.SellIn > 0) + { UpdateItemQualityValue(item, 3); - + } else + { item.Quality = MIN_QUALITY; + } } private void HandleConjuredItem(Item item) { if (item.SellIn > 0) + { UpdateItemQualityValue(item, -2); - + } else + { UpdateItemQualityValue(item, -4); + } } private void HandleMiscelaniousItem(Item item) { if (item.SellIn > 0) + { UpdateItemQualityValue(item, -1); - + } else + { UpdateItemQualityValue(item, -2); + } } private void UpdateItemQualityValue(Item item, int qualityStep) { item.Quality += qualityStep; if (item.Quality < MIN_QUALITY) + { item.Quality = MIN_QUALITY; - - if (item.Quality > MAX_QUALITY) + } + else if (item.Quality > MAX_QUALITY) + { item.Quality = MAX_QUALITY; + } } } } diff --git a/csharpcore/GildedRoseTest.cs b/csharpcore/GildedRoseTest.cs index 44a294d8..9cb702fc 100644 --- a/csharpcore/GildedRoseTest.cs +++ b/csharpcore/GildedRoseTest.cs @@ -60,13 +60,7 @@ namespace csharpcore [InlineData(5, 7, 10)] public void UpdateQuality_BackStagePass_QualityIncreases(int beforeSellIn, int beforeQuality, int afterQuality) { - IList items = new List { - new Item { - Name = "Backstage passes to a TAFKAL80ETC concert", - SellIn = beforeSellIn, - Quality = beforeQuality - } - }; + IList items = new List { new Item { Name = "Backstage passes to a TAFKAL80ETC concert", SellIn = beforeSellIn, Quality = beforeQuality } }; GildedRose app = new GildedRose(items); app.UpdateQuality(); @@ -80,13 +74,7 @@ namespace csharpcore [InlineData(0, 50, 0)] public void UpdateQuality_BackStagePassAfterConcert_QualityZeroed(int beforeSellIn, int beforeQuality, int afterQuality) { - IList items = new List { - new Item { - Name = "Backstage passes to a TAFKAL80ETC concert", - SellIn = beforeSellIn, - Quality = beforeQuality - } - }; + IList items = new List { new Item { Name = "Backstage passes to a TAFKAL80ETC concert", SellIn = beforeSellIn, Quality = beforeQuality } }; GildedRose app = new GildedRose(items); app.UpdateQuality(); @@ -101,13 +89,7 @@ namespace csharpcore [InlineData(5, 50, 50)] public void UpdateQuality_BackStagePassMaxQuality_QualityToppedAtFifty(int beforeSellIn, int beforeQuality, int afterQuality) { - IList items = new List { - new Item { - Name = "Backstage passes to a TAFKAL80ETC concert", - SellIn = beforeSellIn, - Quality = beforeQuality - } - }; + IList items = new List { new Item { Name = "Backstage passes to a TAFKAL80ETC concert", SellIn = beforeSellIn, Quality = beforeQuality } }; GildedRose app = new GildedRose(items); app.UpdateQuality();