From 5977342368778ded0e87e650a3296537c6939e0e Mon Sep 17 00:00:00 2001 From: tsalmela Date: Fri, 9 Sep 2016 16:42:27 +0300 Subject: [PATCH 1/2] Project 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 -> 3943 bytes .../oulu/tol/sqat/tests/GildedRoseTest.java | 160 ++++++++++++++++++ 5 files changed, 161 insertions(+) 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..0d3860b898690a164bba9bce345a8fb5eeb72905 100644 GIT binary patch literal 3943 zcmb7`+fx&F6vxj3At6MK7)9~6qGAF|(9sWH+AQ<$S*1b58v0pGQxK z=mhD0s^jSBq7v7NxnkVVa&i5(Xv7U!H}v>1dgsu<6SYBqj( zeo0<1IBGnlsETohqxxuUj-!SVO_GCDPfa26Q6op&GKwls7W4CRVOE^a$sDz0v;{FY zCl(a;-TKD{+7|v*gY<#H*h&ba+`>BPay{}1s#tk_ipjM8WSS~zECP)$5!^CLgs5P1?D>!2m6g8V3ACJwkBlm@9KONx6FG>{TBXpFbKvp)`4sf@ds`_s(u;vq^9bPi&JC4H$L#)BxbK0ozB=CaB| zx-J)t5cShZjzVJT+vsgLhAe&2i3wIlKHbm?sFnS01djGW7jt3nF3$fOz$(Fl{O2~wFMSmWLwpfQdj ztR8vPDzD^Ma&lf)4OwE6UI@`RO`zEpMJ2}^a#s}-G3h>67}3pMfG!~&dkudHYxohYvEBCBFBlsoeOZvBQyv$clkXUEfi>YOC|D<^5`qpfQ1gPg zh?vkXNaC6vpsOfAXF1Q7+t+NhUod-`nV(oThqyP}Ofk1uEQq>rK~yC{TNI|ntSS~X zT}TK6i2%Kfma^9z=h-4&TjcFU_El3TN_LgKlB1Ldo-=A#;WA1|D`K<=lAJAwk|S7{ zqpoM!t*t_jzJ#4ailcsyZMHEU=BaWP6Kxe{Bs?|_iwn!TA!cP^h4q^**je{sJ_cwB zH-?q&T+d{0#i8A+Yjf++FO(8hNOMY7R-$q ztyox)#}xMSu%q1Iv#`2{jV25_43yHq3E>StEco=}dmK*=PhaOc1@7aej)M4PVWKV6 zj8C=!3-H{6CrS;`I@*SJwknJ#JLoRHHQ;&jF>SxLPCGJPk12AkWtT4;T&LX+XzvCc z?0P`$myXvzq>eiJl_HZ7I^O+&dfwik6uY{`B*RlH4N@BEbs=_&PUFloIGG`svF8!v=&UEgw-!R*|3C-=V8{y~ z27pcgbORuP%acecMZFk4Oj8q}&jILm0CqY6K^FjvnE>ZJ0eXSP;q=Cq(G5CZb~6ZQ z!VNx%RCct{x}Bqoo~LbCatv3?k!cJ!KE=^V+tCP3xwUDBDg;Xc;Mh&W&}J0cj6s|8 zF!urtVJ?^T8Fus;bo6O=^l7E(8iQHP)Mv(%=x>W?x|(P<91KSsB-Cl;Uw6&Ul?h*T z6ZV(7WDBMgW>LUb=_t)nlwJVsb=1TS6za=hze!g}sGy#9s3$Dy1a_Nc zokoGbR7GvZOzP{N)SGnXjr#DE1MQ}~X;apArUWz@=G}sM%P=nooIK1^D-cdP2;QCf zN)b&Am&Xx2AT zPH$CkoprbdENf!U#OXz>dg7Qd(;CT>Yu(~H?cz!~)|gywDA^6wK~3nccL4P+pxy)2 z`+)iYP#;nUeS{hGF;e`b0_d~@)Mo*8I6z4kkQp<9vYtTqETEcSflOmVB~L9(lN-ex z6rTd+GbHpmwb2*&-~E?pgs(7Czec@%Q-R^Gw|24zX*Zm%9u#KG#JJ^&@q>jiSnZ1v z2sb~CBSOoYk=zBzcQEB1O!*$B+{drkkJLjyVI==tK{DtVlClgr>=@F6SiY)r%$P}{ zdXn6?NYXVV;n07fXq%xt1j-}KwqG#Yo?y29hKBhaKf!-sM*UfVl6Fu|SSUvvl(-AU NjF~96QN?vs_!o{?0uBHG delta 167 zcmaDZ_k)@1)W2Q(7#J9g86+oi?dIhvNi8l3$w&<;DlN&F_+H items = store.getItems(); + Item itemBrie = items.get(0); + assertEquals(1, itemBrie.getSellIn()); + } + @Test public void testUpdateEndOfDay() { fail("Test not implemented"); } + + @Test + public void testUpdateEndOfDay_Conjured_mana_cake_Quality_3_6() { + //Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Conjured Mana Cake", 3, 6)); + + //Act + store.updateEndOfDay(); + + //Assert + List items = store.getItems(); + Item itemCake = items.get(0); + assertEquals(5, itemCake.getQuality()); + assertEquals(2, itemCake.getSellIn()); + } + + @Test + public void testUpdateEndOfDay_Dexterity_vest_10_20_selling_after_6_days() { + //Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Dexterity vest", 10, 20)); + + //Act + store.updateEndOfDay(); + store.updateEndOfDay(); + store.updateEndOfDay(); + store.updateEndOfDay(); + store.updateEndOfDay(); + store.updateEndOfDay(); + + + //Assert + List items = store.getItems(); + Item itemDexVest = items.get(0); + assertEquals(14, itemDexVest.getQuality()); + assertEquals(4, itemDexVest.getSellIn()); + } + + @Test + public void testUpdateEndOfDay_Sulfuras_Hand_of_Ragnaros_0_80() { + //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_AgedBrie_quality_double_degrade() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Aged Brie", 2, 10) ); + + // Act + store.updateEndOfDay(); + store.updateEndOfDay(); + store.updateEndOfDay(); + store.updateEndOfDay(); + + + // Assert + List items = store.getItems(); + Item itemBrie = items.get(0); + assertEquals(16, itemBrie.getQuality()); + } + + @Test + public void testUpdateEndOfDay_AgedBrie_quality_over_50() { + // Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Aged Brie", 2, 50) ); + + // Act + store.updateEndOfDay(); + store.updateEndOfDay(); + store.updateEndOfDay(); + + + // Assert + List items = store.getItems(); + Item itemBrie = items.get(0); + assertEquals(50, itemBrie.getQuality()); + } + + @Test + public void testUpdateEndOfDay_Conjured_mana_cake_Quality_negative() { + //Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Conjured Mana Cake", 3, 1)); + + //Act + store.updateEndOfDay(); + store.updateEndOfDay(); + + //Assert + List items = store.getItems(); + Item itemCake = items.get(0); + assertEquals(0, itemCake.getQuality()); + } + + + @Test + public void testUpdateEndOfDay_Backstage_passes_quality_5_11() { + //Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", 5, 11)); + + //Act + store.updateEndOfDay(); + store.updateEndOfDay(); + + //Assert + List items = store.getItems(); + Item itemPass = items.get(0); + assertEquals(17, itemPass.getQuality()); + } + + @Test + public void testUpdateEndOfDay_Backstage_passes_quality_12_11() { + //Arrange + GildedRose store = new GildedRose(); + store.addItem(new Item("Backstage passes to a TAFKAL80ETC concert", 12, 11)); + + //Act + store.updateEndOfDay(); + store.updateEndOfDay(); + + //Assert + List items = store.getItems(); + Item itemPass = items.get(0); + assertEquals(13, itemPass.getQuality()); + } + + + + + } From f74088f777c037b0e5edfc8a3d1739467259046b Mon Sep 17 00:00:00 2001 From: Topi Salmela Date: Wed, 19 Oct 2016 23:36:20 +0300 Subject: [PATCH 2/2] Exercise 5 done --- bin/fi/oulu/tol/sqat/GildedRose.class | Bin 2131 -> 1954 bytes bin/fi/oulu/tol/sqat/Item.class | Bin 1034 -> 1388 bytes .../oulu/tol/sqat/tests/GildedRoseTest.class | Bin 3943 -> 3777 bytes src/fi/oulu/tol/sqat/GildedRose.java | 56 ++++++++++-------- src/fi/oulu/tol/sqat/Item.java | 12 ++++ .../oulu/tol/sqat/tests/GildedRoseTest.java | 5 -- 6 files changed, 42 insertions(+), 31 deletions(-) diff --git a/bin/fi/oulu/tol/sqat/GildedRose.class b/bin/fi/oulu/tol/sqat/GildedRose.class index b904cd2a2f60ff47b023e9e0b84ddbe56eddc526..a907fd78c1a7ed10b2117054dc05f4a2c65c6fea 100644 GIT binary patch delta 982 zcmZXT-Afc<6vlt=?&fUcq|1^bnWb2^yK1{yTDEE0_vBY**>^eRw5^OQtz*>HUIbkg z1bY!hM0g_+1Qr-2ND)K?T|_rg|4Vkpbt8#k4s+h;Ip;j*oOiy5X3F(1zuzqaJFw>T zGGDHgDz+I!h$@0<*Unn*WL8lbiS~_KH?8=zn|9*n%6YPsMw&I66yg6-gYCo>fsB32 zRje;&aI8!!K6qu^zUn45S`-!6((%b@XFBdqI(bLwx=w-}20LlXyS{oS!7hW{bST!Q zYkJ(qVwl!t1RPYM-8T2n>>CAuF zpuuquD=WqoRC{4342C%=dZ+&Cl^I3M=!iGW5rfm5QE1n#DRW?XaMI|x!Y(ETtO;92 zUD(7wZ6qa~>}sMo8)Yg=y@M6GukZUaDyM$nV~yb@WH}IRYl+_X83Ty>lW70Svo2Lq1G8%#p^8)AF;J2R60Xh z0nt39CRCDJeNs&0!2|NPKcTZ&F}kW^Ly=k|G^tn_^UpIhyDGnQaZ2%csclaB^HV1F zE_Gt7sAL1x^5kmSNCTVYD%H_RJ%`yU+l|N;8#zfcXNY6bLP~yy3~glT;1)@8!oI^n z?n%T0Odit9Gl_c6ATJr>jVyG55f(YiN6zz!OMGRNZ&LgxHsvBCMj$0h7N}v9xYf)H z`JC*dmN^NzAetL^!A1EBNH`)TxP&1DP1La@S9py^LL7~5rC>|QXx5g{iwqQ(CCta@ EAANP#Z2$lO 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..3170f757ef4aa689113f9e84489280f9a4aca2e2 100644 GIT binary patch delta 391 zcmeC;c*DhY>ff$?3=9m$3AOmFaK$J4bGROgWj11ZgIE+cbVvHKl7ff$?3=9m$3_2URmN8EL#%RUJzS)pTiiwqhfr&vI0OLFflmGw# diff --git a/bin/fi/oulu/tol/sqat/tests/GildedRoseTest.class b/bin/fi/oulu/tol/sqat/tests/GildedRoseTest.class index 0d3860b898690a164bba9bce345a8fb5eeb72905..2cbf957f53139b2fb18da93cc15a8e36280eb385 100644 GIT binary patch delta 728 zcmZWnT}YEr7=Di5THCjMHd6aG=eM?{mW-{e5K7Bd%~+*wnVN=V8qbAQe>aKf3q{m5xb#r(*=Y9U(_k0h$xAYHlZwdf5;6zRz z(^S2rwKAF2f~rL<+lXqDTecz9H8o@NDm5s}?Gws1Rj_|n^37qYgv>bt@mhm4 zz8p!G@%b`GP7ONGFdRHL@!SkAw!n{V2qKOMwxa<%SnZTPXT-mUZyL6;*A2yvF#DTP z!g{ZKa#Tp(X{uKF=!|u?|J6(Xuh#&B97*c!h7YZ%LK{}1oqQ?OAdNNHN9``GLpK_6 z04?a@ZLf6b5!E4=bf4N^)SJ{zTc_qpiE{dvbk9qQ$5HM(MB;u18Dx+QZ4Qxam_d$8 zc4@@l^G^u#Pl(1kK9Iw(1px8@{yPLbyfc}5VxS%h#7)i{qjT);+LWcaN7a3xe< z5t(#1$ydE>buFBXcbVubM2`|ZM)Xypub~##QI8vF!cCcWCscnCS!tMB!fumUqe@bS z&k|y9!^9m_;w~)Q<7n<9igBiRz!X+p7!~y0$l*u1!o`bOcw1P^;UfPR!&Cz@V}#TZ zNgH14A^9KC+hclrLT^v83eOP3BtOA(NtH%aMzW)pHl;HR;R;!M# delta 842 zcmZXS%TE(w6vfZimQtqEE-Kj8(o#SSF!E3d5kVft@=yc>T8V&K(*X+YfOLG|!pA~P z)EM<{G|@z4B?c3$Q6x%&kB$BZZe-_D{{rJ>lpryad~;_q=lssScUJu01JdVTOUnTE zAhjS(nOoDyNGu?&mB^o+$L#3(IgJQH$y z$of^(R6+0sSY4q-v@CFCg2bo9cVI6vPy;(x@}IBx?%*eZ!}QaULyb1KXs13~psAzm z70RzIVs|#WxNKT0*WAp8TLElb*Ynu`4-UYG5Q1oif)-Sx6-{WP*EYr1js2{s|H})a z0Q*>BVqTBIb7i?jFO_DMha(%jzW;gEM#>K6b;65o6=$m~@UI3Y#HpV2CI~(E7#<;TtyC=Cb zjV2^ToT9EwFBLhq(if?r{`7kCjq#KkLrSrU&L-#CuVvoX c3OD~A75KoKk95|lh$PK8y_sit;wDV~1_dmt6aWAK diff --git a/src/fi/oulu/tol/sqat/GildedRose.java b/src/fi/oulu/tol/sqat/GildedRose.java index 24741c6..93b3894 100644 --- a/src/fi/oulu/tol/sqat/GildedRose.java +++ b/src/fi/oulu/tol/sqat/GildedRose.java @@ -21,78 +21,82 @@ public GildedRose() { } 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())) + String itemName = item.getName(); + int itemSellIn = item.getSellIn(); + int itemQuality = item.getQuality(); + + + if ((!"Aged Brie".equals(itemName)) && !"Backstage passes to a TAFKAL80ETC concert".equals(itemName)) { - if (items.get(i).getQuality() > 0) + if (itemQuality > 0) { - if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName())) + if (!"Sulfuras, Hand of Ragnaros".equals(itemName)) { - items.get(i).setQuality(items.get(i).getQuality() - 1); + item.decreaseQuality(); } } } else { - if (items.get(i).getQuality() < 50) + if (itemQuality < 50) { - items.get(i).setQuality(items.get(i).getQuality() + 1); + item.increaseQuality(); - if ("Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName())) + if ("Backstage passes to a TAFKAL80ETC concert".equals(itemName)) { - if (items.get(i).getSellIn() < 11) + if (itemSellIn < 11) { - if (items.get(i).getQuality() < 50) + if (itemQuality < 50) { - items.get(i).setQuality(items.get(i).getQuality() + 1); + item.increaseQuality(); } } - if (items.get(i).getSellIn() < 6) + if (itemSellIn < 6) { - if (items.get(i).getQuality() < 50) + if (itemQuality < 50) { - items.get(i).setQuality(items.get(i).getQuality() + 1); + item.increaseQuality(); } } } } } - if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName())) + if (!"Sulfuras, Hand of Ragnaros".equals(itemName)) { - items.get(i).setSellIn(items.get(i).getSellIn() - 1); + item.decreaseSellIn(); } - if (items.get(i).getSellIn() < 0) + if (item.getSellIn() < 0) { - if (!"Aged Brie".equals(items.get(i).getName())) + if (!"Aged Brie".equals(itemName)) { - if (!"Backstage passes to a TAFKAL80ETC concert".equals(items.get(i).getName())) + if (!"Backstage passes to a TAFKAL80ETC concert".equals(itemName)) { - if (items.get(i).getQuality() > 0) + if (itemQuality > 0) { - if (!"Sulfuras, Hand of Ragnaros".equals(items.get(i).getName())) + if (!"Sulfuras, Hand of Ragnaros".equals(itemName)) { - items.get(i).setQuality(items.get(i).getQuality() - 1); + item.decreaseQuality(); } } } else { - items.get(i).setQuality(items.get(i).getQuality() - items.get(i).getQuality()); + item.setQuality(0); } } else { - if (items.get(i).getQuality() < 50) + if (itemQuality < 50) { - items.get(i).setQuality(items.get(i).getQuality() + 1); + item.increaseQuality(); } } } } } - } diff --git a/src/fi/oulu/tol/sqat/Item.java b/src/fi/oulu/tol/sqat/Item.java index 447b7fe..54bd72a 100644 --- a/src/fi/oulu/tol/sqat/Item.java +++ b/src/fi/oulu/tol/sqat/Item.java @@ -31,5 +31,17 @@ public int getQuality() { public void setQuality(int quality) { this.quality = quality; } + public void increaseQuality(){ + this.quality = this.quality +1; + } + public void decreaseQuality(){ + this.quality = this.quality -1; + } + public void increaseSellIn(){ + this.sellIn = this.sellIn +1; + } + public void decreaseSellIn(){ + this.sellIn = this.sellIn -1; + } } diff --git a/src/fi/oulu/tol/sqat/tests/GildedRoseTest.java b/src/fi/oulu/tol/sqat/tests/GildedRoseTest.java index b5af82b..464ce91 100644 --- a/src/fi/oulu/tol/sqat/tests/GildedRoseTest.java +++ b/src/fi/oulu/tol/sqat/tests/GildedRoseTest.java @@ -51,11 +51,6 @@ public void testUpdateEndOfDay_AgedBrie_SellIn_2_10() { } - @Test - public void testUpdateEndOfDay() { - fail("Test not implemented"); - } - @Test public void testUpdateEndOfDay_Conjured_mana_cake_Quality_3_6() { //Arrange