diff --git a/GildedRose/Java/Main.java b/GildedRose/Java/Main.java index 87d79509..b227b7ed 100755 --- a/GildedRose/Java/Main.java +++ b/GildedRose/Java/Main.java @@ -7,7 +7,11 @@ public class Main { new Item("Aged Brie", 2, 0), new Item("Elixir of the Mongoose", 5, 7), new Item("Sulfuras, Hand of Ragnaros", 0, 80), + new Item("Sulfuras, Hand of Ragnaros", -1, 80), new Item("Backstage passes to a TAFKAL80ETC concert", 15, 20), + new Item("Backstage passes to a TAFKAL80ETC concert", 10, 49), + new Item("Backstage passes to a TAFKAL80ETC concert", 5, 49), + // this conjured item does not work properly yet new Item("Conjured Mana Cake", 3, 6) }; GildedRose app = new GildedRose(items); diff --git a/GildedRose/cpp/GildedRoseTextTests.cc b/GildedRose/cpp/GildedRoseTextTests.cc index 6a1366ed..182412a6 100644 --- a/GildedRose/cpp/GildedRoseTextTests.cc +++ b/GildedRose/cpp/GildedRoseTextTests.cc @@ -17,7 +17,11 @@ int main() items.push_back(Item("Aged Brie", 2, 0)); items.push_back(Item("Elixir of the Mongoose", 5, 7)); items.push_back(Item("Sulfuras, Hand of Ragnaros", 0, 80)); + items.push_back(Item("Sulfuras, Hand of Ragnaros", -1, 80)); items.push_back(Item("Backstage passes to a TAFKAL80ETC concert", 15, 20)); + items.push_back(Item("Backstage passes to a TAFKAL80ETC concert", 10, 49)); + items.push_back(Item("Backstage passes to a TAFKAL80ETC concert", 5, 49)); + // this Conjured item doesn't yet work properly items.push_back(Item("Conjured Mana Cake", 3, 6)); GildedRose app(items); diff --git a/GildedRose/texttests/ThirtyDays/stderr.gr b/GildedRose/texttests/ThirtyDays/stderr.gr old mode 100644 new mode 100755 diff --git a/GildedRose/texttests/ThirtyDays/stdout.gr b/GildedRose/texttests/ThirtyDays/stdout.gr index 9bfb34d9..a04e48ac 100644 --- a/GildedRose/texttests/ThirtyDays/stdout.gr +++ b/GildedRose/texttests/ThirtyDays/stdout.gr @@ -5,7 +5,10 @@ name, sellIn, quality Aged Brie, 2, 0 Elixir of the Mongoose, 5, 7 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 15, 20 +Backstage passes to a TAFKAL80ETC concert, 10, 49 +Backstage passes to a TAFKAL80ETC concert, 5, 49 Conjured Mana Cake, 3, 6 -------- day 1 -------- @@ -14,7 +17,10 @@ name, sellIn, quality Aged Brie, 1, 1 Elixir of the Mongoose, 4, 6 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 14, 21 +Backstage passes to a TAFKAL80ETC concert, 9, 50 +Backstage passes to a TAFKAL80ETC concert, 4, 50 Conjured Mana Cake, 2, 5 -------- day 2 -------- @@ -23,7 +29,10 @@ name, sellIn, quality Aged Brie, 0, 2 Elixir of the Mongoose, 3, 5 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 13, 22 +Backstage passes to a TAFKAL80ETC concert, 8, 50 +Backstage passes to a TAFKAL80ETC concert, 3, 50 Conjured Mana Cake, 1, 4 -------- day 3 -------- @@ -32,7 +41,10 @@ name, sellIn, quality Aged Brie, -1, 4 Elixir of the Mongoose, 2, 4 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 12, 23 +Backstage passes to a TAFKAL80ETC concert, 7, 50 +Backstage passes to a TAFKAL80ETC concert, 2, 50 Conjured Mana Cake, 0, 3 -------- day 4 -------- @@ -41,7 +53,10 @@ name, sellIn, quality Aged Brie, -2, 6 Elixir of the Mongoose, 1, 3 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 11, 24 +Backstage passes to a TAFKAL80ETC concert, 6, 50 +Backstage passes to a TAFKAL80ETC concert, 1, 50 Conjured Mana Cake, -1, 1 -------- day 5 -------- @@ -50,7 +65,10 @@ name, sellIn, quality Aged Brie, -3, 8 Elixir of the Mongoose, 0, 2 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 10, 25 +Backstage passes to a TAFKAL80ETC concert, 5, 50 +Backstage passes to a TAFKAL80ETC concert, 0, 50 Conjured Mana Cake, -2, 0 -------- day 6 -------- @@ -59,7 +77,10 @@ name, sellIn, quality Aged Brie, -4, 10 Elixir of the Mongoose, -1, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 9, 27 +Backstage passes to a TAFKAL80ETC concert, 4, 50 +Backstage passes to a TAFKAL80ETC concert, -1, 0 Conjured Mana Cake, -3, 0 -------- day 7 -------- @@ -68,7 +89,10 @@ name, sellIn, quality Aged Brie, -5, 12 Elixir of the Mongoose, -2, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 8, 29 +Backstage passes to a TAFKAL80ETC concert, 3, 50 +Backstage passes to a TAFKAL80ETC concert, -2, 0 Conjured Mana Cake, -4, 0 -------- day 8 -------- @@ -77,7 +101,10 @@ name, sellIn, quality Aged Brie, -6, 14 Elixir of the Mongoose, -3, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 7, 31 +Backstage passes to a TAFKAL80ETC concert, 2, 50 +Backstage passes to a TAFKAL80ETC concert, -3, 0 Conjured Mana Cake, -5, 0 -------- day 9 -------- @@ -86,7 +113,10 @@ name, sellIn, quality Aged Brie, -7, 16 Elixir of the Mongoose, -4, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 6, 33 +Backstage passes to a TAFKAL80ETC concert, 1, 50 +Backstage passes to a TAFKAL80ETC concert, -4, 0 Conjured Mana Cake, -6, 0 -------- day 10 -------- @@ -95,7 +125,10 @@ name, sellIn, quality Aged Brie, -8, 18 Elixir of the Mongoose, -5, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 5, 35 +Backstage passes to a TAFKAL80ETC concert, 0, 50 +Backstage passes to a TAFKAL80ETC concert, -5, 0 Conjured Mana Cake, -7, 0 -------- day 11 -------- @@ -104,7 +137,10 @@ name, sellIn, quality Aged Brie, -9, 20 Elixir of the Mongoose, -6, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 4, 38 +Backstage passes to a TAFKAL80ETC concert, -1, 0 +Backstage passes to a TAFKAL80ETC concert, -6, 0 Conjured Mana Cake, -8, 0 -------- day 12 -------- @@ -113,7 +149,10 @@ name, sellIn, quality Aged Brie, -10, 22 Elixir of the Mongoose, -7, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 3, 41 +Backstage passes to a TAFKAL80ETC concert, -2, 0 +Backstage passes to a TAFKAL80ETC concert, -7, 0 Conjured Mana Cake, -9, 0 -------- day 13 -------- @@ -122,7 +161,10 @@ name, sellIn, quality Aged Brie, -11, 24 Elixir of the Mongoose, -8, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 2, 44 +Backstage passes to a TAFKAL80ETC concert, -3, 0 +Backstage passes to a TAFKAL80ETC concert, -8, 0 Conjured Mana Cake, -10, 0 -------- day 14 -------- @@ -131,7 +173,10 @@ name, sellIn, quality Aged Brie, -12, 26 Elixir of the Mongoose, -9, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 1, 47 +Backstage passes to a TAFKAL80ETC concert, -4, 0 +Backstage passes to a TAFKAL80ETC concert, -9, 0 Conjured Mana Cake, -11, 0 -------- day 15 -------- @@ -140,7 +185,10 @@ name, sellIn, quality Aged Brie, -13, 28 Elixir of the Mongoose, -10, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, 0, 50 +Backstage passes to a TAFKAL80ETC concert, -5, 0 +Backstage passes to a TAFKAL80ETC concert, -10, 0 Conjured Mana Cake, -12, 0 -------- day 16 -------- @@ -149,7 +197,10 @@ name, sellIn, quality Aged Brie, -14, 30 Elixir of the Mongoose, -11, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, -1, 0 +Backstage passes to a TAFKAL80ETC concert, -6, 0 +Backstage passes to a TAFKAL80ETC concert, -11, 0 Conjured Mana Cake, -13, 0 -------- day 17 -------- @@ -158,7 +209,10 @@ name, sellIn, quality Aged Brie, -15, 32 Elixir of the Mongoose, -12, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, -2, 0 +Backstage passes to a TAFKAL80ETC concert, -7, 0 +Backstage passes to a TAFKAL80ETC concert, -12, 0 Conjured Mana Cake, -14, 0 -------- day 18 -------- @@ -167,7 +221,10 @@ name, sellIn, quality Aged Brie, -16, 34 Elixir of the Mongoose, -13, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, -3, 0 +Backstage passes to a TAFKAL80ETC concert, -8, 0 +Backstage passes to a TAFKAL80ETC concert, -13, 0 Conjured Mana Cake, -15, 0 -------- day 19 -------- @@ -176,7 +233,10 @@ name, sellIn, quality Aged Brie, -17, 36 Elixir of the Mongoose, -14, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, -4, 0 +Backstage passes to a TAFKAL80ETC concert, -9, 0 +Backstage passes to a TAFKAL80ETC concert, -14, 0 Conjured Mana Cake, -16, 0 -------- day 20 -------- @@ -185,7 +245,10 @@ name, sellIn, quality Aged Brie, -18, 38 Elixir of the Mongoose, -15, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, -5, 0 +Backstage passes to a TAFKAL80ETC concert, -10, 0 +Backstage passes to a TAFKAL80ETC concert, -15, 0 Conjured Mana Cake, -17, 0 -------- day 21 -------- @@ -194,7 +257,10 @@ name, sellIn, quality Aged Brie, -19, 40 Elixir of the Mongoose, -16, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, -6, 0 +Backstage passes to a TAFKAL80ETC concert, -11, 0 +Backstage passes to a TAFKAL80ETC concert, -16, 0 Conjured Mana Cake, -18, 0 -------- day 22 -------- @@ -203,7 +269,10 @@ name, sellIn, quality Aged Brie, -20, 42 Elixir of the Mongoose, -17, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, -7, 0 +Backstage passes to a TAFKAL80ETC concert, -12, 0 +Backstage passes to a TAFKAL80ETC concert, -17, 0 Conjured Mana Cake, -19, 0 -------- day 23 -------- @@ -212,7 +281,10 @@ name, sellIn, quality Aged Brie, -21, 44 Elixir of the Mongoose, -18, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, -8, 0 +Backstage passes to a TAFKAL80ETC concert, -13, 0 +Backstage passes to a TAFKAL80ETC concert, -18, 0 Conjured Mana Cake, -20, 0 -------- day 24 -------- @@ -221,7 +293,10 @@ name, sellIn, quality Aged Brie, -22, 46 Elixir of the Mongoose, -19, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, -9, 0 +Backstage passes to a TAFKAL80ETC concert, -14, 0 +Backstage passes to a TAFKAL80ETC concert, -19, 0 Conjured Mana Cake, -21, 0 -------- day 25 -------- @@ -230,7 +305,10 @@ name, sellIn, quality Aged Brie, -23, 48 Elixir of the Mongoose, -20, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, -10, 0 +Backstage passes to a TAFKAL80ETC concert, -15, 0 +Backstage passes to a TAFKAL80ETC concert, -20, 0 Conjured Mana Cake, -22, 0 -------- day 26 -------- @@ -239,7 +317,10 @@ name, sellIn, quality Aged Brie, -24, 50 Elixir of the Mongoose, -21, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, -11, 0 +Backstage passes to a TAFKAL80ETC concert, -16, 0 +Backstage passes to a TAFKAL80ETC concert, -21, 0 Conjured Mana Cake, -23, 0 -------- day 27 -------- @@ -248,7 +329,10 @@ name, sellIn, quality Aged Brie, -25, 50 Elixir of the Mongoose, -22, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, -12, 0 +Backstage passes to a TAFKAL80ETC concert, -17, 0 +Backstage passes to a TAFKAL80ETC concert, -22, 0 Conjured Mana Cake, -24, 0 -------- day 28 -------- @@ -257,7 +341,10 @@ name, sellIn, quality Aged Brie, -26, 50 Elixir of the Mongoose, -23, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, -13, 0 +Backstage passes to a TAFKAL80ETC concert, -18, 0 +Backstage passes to a TAFKAL80ETC concert, -23, 0 Conjured Mana Cake, -25, 0 -------- day 29 -------- @@ -266,7 +353,10 @@ name, sellIn, quality Aged Brie, -27, 50 Elixir of the Mongoose, -24, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, -14, 0 +Backstage passes to a TAFKAL80ETC concert, -19, 0 +Backstage passes to a TAFKAL80ETC concert, -24, 0 Conjured Mana Cake, -26, 0 -------- day 30 -------- @@ -275,6 +365,9 @@ name, sellIn, quality Aged Brie, -28, 50 Elixir of the Mongoose, -25, 0 Sulfuras, Hand of Ragnaros, 0, 80 +Sulfuras, Hand of Ragnaros, -1, 80 Backstage passes to a TAFKAL80ETC concert, -15, 0 +Backstage passes to a TAFKAL80ETC concert, -20, 0 +Backstage passes to a TAFKAL80ETC concert, -25, 0 Conjured Mana Cake, -27, 0 diff --git a/GildedRose/texttests/config.gr b/GildedRose/texttests/config.gr index 52958b3d..733e5ab4 100755 --- a/GildedRose/texttests/config.gr +++ b/GildedRose/texttests/config.gr @@ -12,10 +12,13 @@ interpreter:java #executable:${TEXTTEST_CHECKOUT}/python/gilded_rose.py #interpreter:python +# Settings for the C++ version +#executable:${TEXTTEST_CHECKOUT}/cpp/GildedRoseTextTests + # turn on one of these if you prefer them to notepad or emacs. [view_program] #*:mate -#*:gedit +*:gedit [end] filename_convention_scheme:standard