From 79c93df9d3c209cc0c408d84ef5ab7d07af52af2 Mon Sep 17 00:00:00 2001 From: pasilack Date: Thu, 8 Sep 2016 16:15:30 +0300 Subject: [PATCH 1/2] Assignment Finished --- bin/.gitignore | 1 + bin/fi/oulu/tol/sqat/GildedRose.class | Bin 2380 -> 2131 bytes bin/fi/oulu/tol/sqat/Item.class | Bin 1034 -> 1034 bytes .../oulu/tol/sqat/tests/GildedRoseTest.class | Bin 504 -> 5186 bytes .../oulu/tol/sqat/tests/GildedRoseTest.java | 224 +++++++++++++++++- 5 files changed, 223 insertions(+), 2 deletions(-) create mode 100644 bin/.gitignore diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..76b3e7b --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1 @@ +/fi/ diff --git a/bin/fi/oulu/tol/sqat/GildedRose.class b/bin/fi/oulu/tol/sqat/GildedRose.class index f244eba73874c91f18244a292b7f88cc3b4b5f80..b904cd2a2f60ff47b023e9e0b84ddbe56eddc526 100644 GIT binary patch literal 2131 zcmbVMOK%%h6#nkmi60qa*C}amn|9Jbu$vHv7D7{p7RPxuu0!g`sD(vu?6Es#Vkh$e zr9wgic3q&h3q*w~5fUv69~hLv6^Zw z!ISZ;q=)9k*i~4gBU|X#spp`g$N?cH>hie zpEkfj$ytV0DJO$8k8k?$M$@>}d@?45I^F7)&2`g{vou&UyzrrE@v^FHa??~z#i}Y? zSxe0?r!r?J=GM|mp;{@Z25of==VT-?%@8CCtAwFh+s=?J`9aeb&Dna%Hn=&aEb>ZG zsg{(>oJQEFnj-lf87a(Avgu0pk`j60os}^spaTS*Q+0i*BCHEC7DY~ga%xr~=0zFH zBGzkaH%SJj(X&M3owH~&m-uFVeuKHHZ4}gbO-y*GF=gYTkr<)_;i1z@gv6}1L{Kl*T({M3E))4wR2CM=2GJ(N4Tha(c+YZMPUt}t;tLkNGv~>qNor&CX7jmx~-MQ{IyVn%b@>y%=bLssBSd`HAKzG2me}62FiN`sk zH|Y?7?u#x&=~6sK7tC>d00p057@uMUcM-!wx|jFqrg?&K{DBD;p__9Alk6Pbj#qJk zZ6U>OW0rk~dG;8K>{nc5zazu`L{^GoRT{*aw2Zuz#T98C?@OOyK)Q`<|D7I5`Vtvj iA|6?K`VshxZju9RAK=ab7A6mHYvPPJm@DL!@b16uzSTPb literal 2380 zcmbVNOK%fb6#nkm@r!{N=K&3cPD%qdq?kuT00*cO@-R3F!NF+)6mIMrGhyNhGvk(^ zN|oB~SX6qLxWS8s_~`Vk$TZGOB}Lr7-9rUq2(z}r-}St4#) zD#5xLKTnYk#S1={2w)e3e{^_oD4A*xLBqR#v@;NyMfCI7;eB7DQg_wR91{F`~NP&~NFMX3l8N zb)gNL#ezw)3*ZDpTc%{plq_y{YD2u3mp&IbNy{?r0D4GVy*zirc6dQ(^W3(DtvRN~ zwejS@xn%m-!T#|+EoT;U!g2y2QAPU9;w-5$uMP7e*ZTMk5h8JYs3IvPvbi*$=Z+XF zaf1jUEpV$ql4+_V1xZ4`iUAB#!v!IaJesOX-8Cf%NoY#NS)8N8B)<_pN1APpx?QX4 z3Sk(devH&=tE@Z~=Owc~ag$23WzGvKG8ktFQO?zRX=YN=m{l=>kH~1dj9#iQE3H#1 zF3Hd!g=U0dq>2)~qT*v26Qr05DqFm!f=geot>31)nNClNh{`y``!Jucj$0^WmaLo@ z(B(ijuFcZ{DG;<1#U8qBs31AS^!C%2f&jeq1PNu>L`Vm{-zGY%X7r#1W7NnDw&63nlNQm2Z|DM&990^=k6!eZ8zyO28up}#aAHfj z>q$IRzKnEHKW$HOM!|20E@NmJ=?9pJB>7pDE9*Plt96|WZ(2fkEjA|8?{;JE_3QMt*ksuEhI#6e@_*Y; zN>VPb+x~m}QU7$ltw+NHY&ab()i30Zdn5OH?R2iYVfUI`)_qov^Nsla3apK?J;haq zAOHDOs@+qb_S@J+>vp;*cGJI;4)kL$E+a-N@5JYb;~oy-F3&89eH|M5&WC(q!lcz;O+_rkFMa(!6OPyk|3*sng0M*izc}M diff --git a/bin/fi/oulu/tol/sqat/Item.class b/bin/fi/oulu/tol/sqat/Item.class index 478a73984862181a0a6b22a57fca5a1788d6a3f6..86c608e1a130d3506ba1bc783f500e2d34d0181d 100644 GIT binary patch delta 30 gcmeC;=;GLLiBXV&ft7)c0R-3?I6&0q$BgPs08#Y>lK=n! delta 30 jcmeC;=;GLLiBXV|ft7)cfq{XMft`T^L~nk~sLlicQXd4C diff --git a/bin/fi/oulu/tol/sqat/tests/GildedRoseTest.class b/bin/fi/oulu/tol/sqat/tests/GildedRoseTest.class index e44e81ce2b232358b6069c215dc740c0984c2b8c..0f25d8dbe161a8b44171d73cee2c31d8cc1d9a5b 100644 GIT binary patch literal 5186 zcmb`LS!^3c7{|YfZIwF^w?h1Ia(i08i$m&ZhEG2-k43D-PF6T zs5o8#A#uEbgv9Xz5=YAml~B_|f=WnS4&qEdD!*t z%zX3xzW;w_NBQ*M>+ccK4w`aN9iuH1azM>xasge<1hjLa9?&IC*8+#+OiD@(tC}>5 zXBX8o@=c28#Xv?>(t*M8Nhzr_TC_`6WPLXyhrex%QGLIfl04*~1}`~j5u>GXS&;^E zQ{z&0R2hA=h|mEv;kZ5>qK2hEa=uZZ&vIUtxgYr478ocjPLnz+-Ll(q`Ji$eosSJ_4Lg z{Tkp#|wBVNT{<1 z1B}w={SfoOWZf?6LYYfdj%u2e)xETndKh`d{L_JRPz+f*{YQ>)8#y&y&B7~d=T@L3 z1YF>h3v|BOY+&b2TmY1PZj^i-8Lg=F;)Q9`kF$%l%O=EbBoVqTD~1!HuEdCx$;6bP zS-m^3`l<~sbni_>%mHp*?n7QW%*)+?au<3q>a7;W&}2kcr?r@p%u1pL=S3%UDcfDl zCCun(wID|7=GyA&HGf%$Wz=I4ZJ(GttLb7|8iMXdHA3BHq(nHF2#4G>h~-`EDNJ*V zXo9W^qA(ggcr+T11P_e%3rST;!boOmupS%pl9x|WLl(h`EW&2k6^wS?CP*d64l@FF zgL#w!_3aMUFtU`sF|zioje!vh+He19R z$z>*TSy3}OMS^acz}9TO?i3D-N=i^CgkdqQh*?!LX@{`6aayw{qm5O<8>-qz#ZbAuXB&d{=W#|>&e*|fsx^UTnyE7W?G)^}W? zjmJ72*XYhVx=GCg&D6Q=3T=PlDuwyfj{MZ?^5I&@O|7(w*5SH=1lmX)vOW_q0qJmZH)HTgy8Ubs~|+}5ZZvy4uow$ z2x9sWk_rQ1$ATdATOwRCREW${!Pih#hW%hTXeC1g4861(rCdXMAjDqkq$u^!zA}bL zQHG!)!-k>^opWR;v=wBC)yfdAqQen89S(uvFc^-4VE_z+U>E|!@daUsTQb1!AhrLr8BTn0#>@e456neL#?afm?eUZl?HrEea%%EhU{dJz%T(BWXO<# z3{#LnfedOH!>z0|T(P3dtu#^_gQqIPs2zh2h8!3k1j9pMco+vVHmSyu(8sB zyDGv7JA}u8@HnjWB&_rltn@Uj^bD-@Y#G9>tW+sO`Nn$E5}}Hf=CvH21H;RVR> zB4l_8GQ12KUMXXkzm-na#^9OXl71BouYuupFuVnZi(t3}hPM}l;a*Dydn?ULhIfE) z8CH51R+@p8uEI*!V5RG22=lkneYGH*uCMxiOW3W3_knN|2p<69Lm+$vgpYynNeu{M z#imrg8pdlva8yO$pJ>aI(q};U90*?k;Y%QV1%$7G@XdlCBrOr%z*~OU>#96voOU>D zzYGm_`G1T2zr%sydupK{Xg&RiL(@+h~Le^>F_)@d9u*3)w1q}Ps9W2FRzw!#r3 zWtqRtLXaH3AzOfEO4}j)0)$^7!Ecb@cS!IDB={2&{8ffL~L+ D1rgoM delta 167 zcmX@4@q?M`)W2Q(7#J9g86+oi?dIhvNi8l3$w&<;DlN&F_+H$zR#E y?Ti^1fslcLm1PHm;6@;WiGd49asg=&$-=-5gbWNk5Jf3=#mWvLPV= diff --git a/src/fi/oulu/tol/sqat/tests/GildedRoseTest.java b/src/fi/oulu/tol/sqat/tests/GildedRoseTest.java index 7aceb2e..613dbb2 100644 --- a/src/fi/oulu/tol/sqat/tests/GildedRoseTest.java +++ b/src/fi/oulu/tol/sqat/tests/GildedRoseTest.java @@ -36,7 +36,227 @@ public void testUpdateEndOfDay_AgedBrie_Quality_10_11() { } @Test - public void testUpdateEndOfDay() { - fail("Test not implemented"); + public void testUpdateEndOfDay_AgedBrie_Quality_12_14_SellIn0() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Aged Brie", 0, 12) ); + + // Act + store.updateEndOfDay(); + + // Assert + List items = store.getItems(); + Item itemBrie = items.get(0); + assertEquals(14, itemBrie.getQuality()); + } + + @Test + public void testUpdateEndOfDay_AgedBrie_SellIn9_8() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Aged Brie", 9, 10) ); + + // Act + store.updateEndOfDay(); + + // Assert + List items = store.getItems(); + Item itemBrie = items.get(0); + assertEquals(8, itemBrie.getSellIn()); + } + + @Test + public void testUpdateEndOfDay_AgedBrie_QualityStopsIncreasingAfter50() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Aged Brie", 9, 50) ); + + // Act + store.updateEndOfDay(); + + // Assert + List items = store.getItems(); + Item itemBrie = items.get(0); + assertEquals(50, itemBrie.getQuality()); + } + + @Test + public void testUpdateEndOfDay_AgedBrie_SellIn0_Quality49_QualityStopsIncreasingAfter50() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Aged Brie", 0, 49) ); + + // Act + store.updateEndOfDay(); + + // Assert + List items = store.getItems(); + Item itemBrie = items.get(0); + assertEquals(50, itemBrie.getQuality()); + } + + @Test + public void testUpdateEndOfDay_BackstagePass_SellIn15_Quality_20_21() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", 15, 20)); + + // Act + store.updateEndOfDay(); + + // Assert + List items = store.getItems(); + Item itemBackstagePass = items.get(0); + assertEquals(21, itemBackstagePass.getQuality()); + } + + @Test + public void testUpdateEndOfDay_BackstagePass_SellIn10_Quality_20_22() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", 10, 20)); + + // Act + store.updateEndOfDay(); + + // Assert + List items = store.getItems(); + Item itemBackstagePass = items.get(0); + assertEquals(22, itemBackstagePass.getQuality()); + } + + @Test + public void testUpdateEndOfDay_BackstagePass_SellIn5_Quality_20_23() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", 5, 20)); + + // Act + store.updateEndOfDay(); + + // Assert + List items = store.getItems(); + Item itemBackstagePass = items.get(0); + assertEquals(23, itemBackstagePass.getQuality()); + } + + @Test + public void testUpdateEndOfDay_BackstagePass_SellIn15_Quality_49_50() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", 15, 49)); + + // Act + store.updateEndOfDay(); + + // Assert + List items = store.getItems(); + Item itemBackstagePass = items.get(0); + assertEquals(50, itemBackstagePass.getQuality()); + } + + @Test + public void testUpdateEndOfDay_BackstagePass_SellIn10_Quality_49_50() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", 10, 49)); + + // Act + store.updateEndOfDay(); + + // Assert + List items = store.getItems(); + Item itemBackstagePass = items.get(0); + assertEquals(50, itemBackstagePass.getQuality()); + } + + @Test + public void testUpdateEndOfDay_BackstagePass_SellIn5_Quality_49_50() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", 5, 49)); + + // Act + store.updateEndOfDay(); + + // Assert + List items = store.getItems(); + Item itemBackstagePass = items.get(0); + assertEquals(50, itemBackstagePass.getQuality()); + } + + @Test + public void testUpdateEndOfDay_ConjuredManaCake_SellIn1_Quality_10_9() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Conjured Mana Cake", 1, 10)); + + // Act + store.updateEndOfDay(); + + // Assert + List items = store.getItems(); + Item itemConjuredManaCake = items.get(0); + assertEquals(9, itemConjuredManaCake.getQuality()); + } + + @Test + public void testUpdateEndOfDay_ConjuredManaCake_SellIn0_Quality_10_8() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Conjured Mana Cake", 0, 10)); + + // Act + store.updateEndOfDay(); + + // Assert + List items = store.getItems(); + Item itemConjuredManaCake = items.get(0); + assertEquals(8, itemConjuredManaCake.getQuality()); + } + + @Test + public void testUpdateEndOfDay_ConjuredManaCake_SellIn0_Quality_0_0_NoNegativeQuality() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Conjured Mana Cake", 0, 0)); + + // Act + store.updateEndOfDay(); + + // Assert + List items = store.getItems(); + Item itemConjuredManaCake = items.get(0); + assertEquals(0, itemConjuredManaCake.getQuality()); + } + + @Test + public void testUpdateEndOfDay_SulfurasQuality80() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Sulfuras, Hand of Ragnaros", 0, 80)); + + // Act + store.updateEndOfDay(); + + // Assert + List items = store.getItems(); + Item itemSulfuras = items.get(0); + assertEquals(80, itemSulfuras.getQuality()); + } + + @Test + public void testUpdateEndOfDay_SulfurasSellIn0() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Sulfuras, Hand of Ragnaros", 0, 80)); + + // Act + store.updateEndOfDay(); + + // Assert + List items = store.getItems(); + Item itemSulfuras = items.get(0); + assertEquals(0, itemSulfuras.getSellIn()); } } From f33d1bbf7e7d9c421e84af2e969701ccf2f1fe11 Mon Sep 17 00:00:00 2001 From: pasilack Date: Wed, 19 Oct 2016 17:34:05 +0300 Subject: [PATCH 2/2] refactoring --- bin/fi/oulu/tol/sqat/GildedRose.class | Bin 2131 -> 1787 bytes bin/fi/oulu/tol/sqat/Item.class | Bin 1034 -> 1693 bytes src/fi/oulu/tol/sqat/GildedRose.java | 111 +++++++++++--------------- src/fi/oulu/tol/sqat/Item.java | 33 ++++++++ 4 files changed, 80 insertions(+), 64 deletions(-) diff --git a/bin/fi/oulu/tol/sqat/GildedRose.class b/bin/fi/oulu/tol/sqat/GildedRose.class index b904cd2a2f60ff47b023e9e0b84ddbe56eddc526..067f48193be3adba2afe8069c60db084af3740b0 100644 GIT binary patch delta 812 zcmZXS%TH5L5XOI}t+ck6(lm;S4+tu@<=&j)`?{X-$l|x#yhuzWHV*GxO8;tI_@A_m{6gA1k|V zudU$WDCaZ+1QjmB)Uye5J*#LA1ZUO~PZQz1X{5u^8b0EolWr$n3jhDCMh{_yBcpGc zibM4X=|m|Je<})cY5DhL`>~)POH$<7z&A6UUM>ADr)Z%6|Zd%GFBeR;-6FI#m zcQGe|D=9tMHjy>-nB}{majWW^)c^6dxZ4_cEY4f!_7hnRUDCK~74CeT$jwUcK5yAG zs-QNo$p;@lq3zM3m?^Q-xkpIxjY!Pj8!FRZ=Hd2V2?Re$Pa9qw~G|Syin=D5=1Ds))vy9Qfv@BhWAhU#6qKg%}c_5ui(o2d$KRE_@ z&JYEWyb#Gt#(BjguVt2RM7}Lkdn?m80dRa6!?*9P>Dz9Jw literal 2131 zcmbVMOK%%h6#nkmi60qa*C}amn|9Jbu$vHv7D7{p7RPxuu0!g`sD(vu?6Es#Vkh$e zr9wgic3q&h3q*w~5fUv69~hLv6^Zw z!ISZ;q=)9k*i~4gBU|X#spp`g$N?cH>hie zpEkfj$ytV0DJO$8k8k?$M$@>}d@?45I^F7)&2`g{vou&UyzrrE@v^FHa??~z#i}Y? zSxe0?r!r?J=GM|mp;{@Z25of==VT-?%@8CCtAwFh+s=?J`9aeb&Dna%Hn=&aEb>ZG zsg{(>oJQEFnj-lf87a(Avgu0pk`j60os}^spaTS*Q+0i*BCHEC7DY~ga%xr~=0zFH zBGzkaH%SJj(X&M3owH~&m-uFVeuKHHZ4}gbO-y*GF=gYTkr<)_;i1z@gv6}1L{Kl*T({M3E))4wR2CM=2GJ(N4Tha(c+YZMPUt}t;tLkNGv~>qNor&CX7jmx~-MQ{IyVn%b@>y%=bLssBSd`HAKzG2me}62FiN`sk zH|Y?7?u#x&=~6sK7tC>d00p057@uMUcM-!wx|jFqrg?&K{DBD;p__9Alk6Pbj#qJk zZ6U>OW0rk~dG;8K>{nc5zazu`L{^GoRT{*aw2Zuz#T98C?@OOyK)Q`<|D7I5`Vtvj iA|6?K`VshxZju9RAK=ab7A6mHYvPPJm@DL!@b16uzSTPb diff --git a/bin/fi/oulu/tol/sqat/Item.class b/bin/fi/oulu/tol/sqat/Item.class index 86c608e1a130d3506ba1bc783f500e2d34d0181d..a59f2ec60ae159d95a0033d1d92d84304e1fb81f 100644 GIT binary patch delta 698 zcmZvY&rTCj6vn^PX<^z|oJM|7C$1ZH z#}KZu*%p@B`b3cZ4k1=;iTc~u;%HmcEQ1g??f-}U4q?cDS2Zl_l`UhAFj{R}2W>~V z`Rux|_3Yt6c1tvD;T*aV5K4+b2H6OnVPO#SghW$(5Cu!vjY75Mn07*aK;1gCyL*F^uC7{&$d7{e%F1anL(^|3Rz>QxBeK7bsrf=~u+MzH@2)9JxEcL;Oi#o;S6?Udw%~)GaI3=TibD z8TA5-e0JBn#*sKinNvAND0m{Ba4D6&b>7HVFo-2y>53<>+|2jnyUSzIFgKSu4dCT9 DfCX=I delta 36 scmbQs+r`0k>ff$?3=9m$3_2URmN8DA#AL(); } + public static void updateEndOfDay() { - for (int i = 0; i < items.size(); i++) + for (Item item : items) { - if ((!"Aged Brie".equals(items.get(i).getName())) && !"Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName())) + if("Sulfuras, Hand of Ragnaros".equals(item.getName())) + { + //do nothing about quality + } + + else if ("Backstage passes to a TAFKAL80ETC concert".equals(item.getName())) { - if (items.get(i).getQuality() > 0) - { - if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName())) - { - items.get(i).setQuality(items.get(i).getQuality() - 1); - } + if (item.isExpired()) + { + item.setQuality(0); } + else if(item.getSellIn() < 6) + { + item.increaseQuality(3); + } + else if(item.getSellIn() < 11) + { + item.increaseQuality(2); + } + else + { + item.increaseQuality(1); + } } - else + + else if("Aged Brie".equals(item.getName())) { - if (items.get(i).getQuality() < 50) - { - items.get(i).setQuality(items.get(i).getQuality() + 1); - - if ("Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName())) - { - if (items.get(i).getSellIn() < 11) - { - if (items.get(i).getQuality() < 50) - { - items.get(i).setQuality(items.get(i).getQuality() + 1); - } - } - - if (items.get(i).getSellIn() < 6) - { - if (items.get(i).getQuality() < 50) - { - items.get(i).setQuality(items.get(i).getQuality() + 1); - } - } - } - } + + if (item.isExpired()) + { + item.increaseQuality(2); + } + else + { + item.increaseQuality(1); + } } + + else + { + if(item.isExpired()) + { + item.decreaseQuality(2); + } + else + { + item.decreaseQuality(1); + } + } - if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName())) - { - items.get(i).setSellIn(items.get(i).getSellIn() - 1); - } - - if (items.get(i).getSellIn() < 0) - { - if (!"Aged Brie".equals(items.get(i).getName())) - { - if (!"Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName())) - { - if (items.get(i).getQuality() > 0) - { - if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName())) - { - items.get(i).setQuality(items.get(i).getQuality() - 1); - } - } - } - else - { - items.get(i).setQuality(items.get(i).getQuality() - items.get(i).getQuality()); - } - } - else - { - if (items.get(i).getQuality() < 50) - { - items.get(i).setQuality(items.get(i).getQuality() + 1); - } - } - } + item.decreaseSellIn(1); } } diff --git a/src/fi/oulu/tol/sqat/Item.java b/src/fi/oulu/tol/sqat/Item.java index 447b7fe..81382ef 100644 --- a/src/fi/oulu/tol/sqat/Item.java +++ b/src/fi/oulu/tol/sqat/Item.java @@ -31,5 +31,38 @@ public int getQuality() { public void setQuality(int quality) { this.quality = quality; } + + public void decreaseQuality(int decrease) { + if(this.quality - decrease > 0) { + this.quality -= decrease; + } + else { + this.quality = 0; + } + } + + public void increaseQuality(int increase) { + if(this.quality + increase <= 50) { + this.quality += increase; + } + else { + this.quality = 50; + } + } + + public void decreaseSellIn(int decrease) { + if (!"Sulfuras, Hand of Ragnaros".equals(getName())) { + this.sellIn -= decrease; + } + } + + public boolean isExpired() { + if(getSellIn()<=0) { + return true; + } + else { + return false; + } + } }