From 4b921e10e12c9d2a86bccbb4a0a5f2e36df48c9e Mon Sep 17 00:00:00 2001 From: Drewry Pope Date: Tue, 13 Feb 2018 22:17:31 -0600 Subject: [PATCH 1/8] Confirmed failing canDoToString test. Added .gitignore. --- .gitignore | 3 +-- bin/Car.class | Bin 0 -> 789 bytes bin/CarTest.class | Bin 0 -> 1312 bytes 3 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 bin/Car.class create mode 100644 bin/CarTest.class diff --git a/.gitignore b/.gitignore index 5855298..8d1c8b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -bin/*.class -.DS_Store + diff --git a/bin/Car.class b/bin/Car.class new file mode 100644 index 0000000000000000000000000000000000000000..228f80a974297f8346b2a19777f658f088c40896 GIT binary patch literal 789 zcmZXSOK;Oa6ot>&PU5<5Q(QNNCOjG*bzGH5EZFeaR6?p0U=b9F9TR61TpYV{9mJNO z!io(Gkcg02@B{cw2yw=-N~9{1@0~ky&;8C-e*gXX3%~;$G++pr$1-og64*MG?`1!c z>9qfHe5#^CpcZ9GmJ4`;|98V8kJITRUY?&RH4zXe0`^RP7%q?X$8j1LPX$`R<*t+7 zNWePICdz?{O&1QDLukqG1GYeO5U1+Jd^T43D>+V-hRPzD zjAS0`b5*p8xA8gI26RP6d#Z|xi$e(N$S6{Y%4I!JKvrj%&GSe-i#482g8O=H*yokWjhisEKW2vZR7SdFv~)Ap z`E_|3^IpIA!yniP4;R=9I}3QBxq$zz>}v7bq88w>*XOQwu*u3ccKHKtE&Fj5*Lb2* zIhTy(Tbud_?8$uw6ELT43^| z-T8!djqHCW|7+ITZz^=NRNgC>a6roen&=TKSzVOdx762h0S>mD>s=LGzhNH j_=8=c|0Mh9RyaqD8r$@4e`Q#8@^Hn8dEw-4`Rd+3^hjvNXHM3KqkL3*z zO?&_!%6MkGX-iULyx7^DvoqiCob#PuzrX(ku!YwKVhl!!%c=;JfjC3*j9>6Vi+hd2 z!O59$6vN1l>$z%|VJMfcF~m!LU6>fcsD)vSFicilPrPrRp9opyCoREXSA2)JYFxT{ z9|hy8=>`m=l?Yd4NIOz+B?5|kbXD`{vk>)z(_Elq;O{6fR6P#t3$yIt)9VzL0jbb@p(?`-4=5d=L z(GV)chgFtM+{J={3`44Sv+OC+5Yj>xi`2CX-fD}3Q!QW4_W`0~MHBb2Y+#8>(b+cn zIaM2|Ldln6pDU*+WMJU|9x}vqV^;dJ?DW2v4-4&HjjoY&9;*gcs1v;-|4%EB5R zF_=8uRhyg)Tpgf1SUB|8;c}B`7K{=XUXBU zY$&;%-Jn#C{I+z&J6BJiMTzUFSl8BJ5o9S%J7^ZDDvZ!-(5^slrlTuYNPMG@7))CA zZ@rGuYIP3Kdz^L*6BLhOGCGx{w-!1^oT5PH2U4Hxsbu{Mw<@cbn7hWEA$qQH?;5!t zVIoY&B-JsRGQ9#b9fgQw!Nz)&;Ko3vh?vVam`U>zn-Mu_4nW&<4M-9uMF<;9nCinX zck$^i{^|eVMIXNYSNtqt<_Ml9{QN)g&j#W@MAfHnRDX%*c5!gCGlX0qXtocR?p8bA Lt@aglCx+cWpw{~` literal 0 HcmV?d00001 From a075b34868a8e01b2f633d3fd8a6596cc7690d4f Mon Sep 17 00:00:00 2001 From: Drewry Pope Date: Tue, 13 Feb 2018 22:20:26 -0600 Subject: [PATCH 2/8] Implemented Car.toString() --- .gitignore | 1 + bin/Car.class | Bin 789 -> 1021 bytes src/Car.java | 3 +-- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8d1c8b6..ebda7f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +/bin/ diff --git a/bin/Car.class b/bin/Car.class index 228f80a974297f8346b2a19777f658f088c40896..505995494b58321170e281b090eb353070099f9f 100644 GIT binary patch delta 321 zcmbQr_LrUO)W2Q(7#J9g7|b_vc`(+qGpH~!h-W31CF^9+HP-IZr9KqPi z80y8q%)kirr^0RqmWE+FQHU{GjKs8JZVnC7&tlpGC V9LVN@=w*;#kOcA=8BD>d%mC56NiqNc delta 88 zcmey%K9!B@)W2Q(7#J9g7}Pg%c`&kZFsLvxFl<(4YGt(0WnctC1_ov! Date: Tue, 13 Feb 2018 22:26:16 -0600 Subject: [PATCH 3/8] Implemented decelerate test until it would not run. --- bin/CarTest.class | Bin 1312 -> 1558 bytes test/CarTest.java | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/CarTest.class b/bin/CarTest.class index 64cd92bba37949c2bfb4bed73cc7bda78dc56527..ec67b7cfd1b2e96273192f6148927b611930954b 100644 GIT binary patch delta 267 zcmX|*y-EW?6ot=>xY2P#B*A__P*VlO$|C+G(FgDc#A@8VF)On(%VZ2#`3xdh`wGEA zP|#Mad=)z@@rqz^zr%s=UhciROV#`L(+hxg>`&F3ysl@)^(iAu!9=QIOQ3OKCZ=PJ zJMRoa@L>)+0;fkV(Ae7v5}5e=Q{ttxK_B>*2P#~ zx}1iEw*o4|l6vG)VS;XgY7 delta 36 scmbQnvw(~1)W2Q(7#J9g80 Date: Tue, 13 Feb 2018 22:27:21 -0600 Subject: [PATCH 4/8] Implemented decelerate until test runs. --- bin/Car.class | Bin 1021 -> 1101 bytes bin/CarTest.class | Bin 1558 -> 1455 bytes src/Car.java | 4 ++++ 3 files changed, 4 insertions(+) diff --git a/bin/Car.class b/bin/Car.class index 505995494b58321170e281b090eb353070099f9f..3bfffea7436aa3a4d70252cfb5b488f494122bf3 100644 GIT binary patch delta 299 zcmXAj%}T>S6ot>7S`&vXq}WCmO0=n_KN?%DTC);&;;taLl3<5Y39W?Etq(CT;nJc+ zQ1Af+AHvrV6z{Z)`*CK@xo76r`m*Kc-`fX(7EY!zASrw5RwXKp$2z3SLWSUJ5^l%F z4#7GfC8PAzlkib>AWk5{F4V?1$ZPIvDn&>Xk_}9PDCGKT_oG6P6lY_g<;q ze7j}51N}prwvV=hEtGXxM3jHN5oh$U4uZqKYV!yln$ARtxyTmKgv%_=O{`*#PaMMr zY$lmLrm46DA`1MW$N9Q@ke2W;gcZU6uP diff --git a/bin/CarTest.class b/bin/CarTest.class index ec67b7cfd1b2e96273192f6148927b611930954b..11768a457d00cb73f1aee616de4d59c6f37fa680 100644 GIT binary patch delta 138 zcmbQnv!0vl)W2Q(7#J9g7@Rk9U1JjGVi07o=V5SQFkxiiN=Z#l%}FgvEJ@v5!5q&N z>Bqprzywq*w3|UNQb<@JWjlkYk2c3P2D^g1Aj!wT3?x+) delta 227 zcmZ3_J&lL!)W2Q(7#J9g7~D5eeE Date: Tue, 13 Feb 2018 22:28:09 -0600 Subject: [PATCH 5/8] Completed decelerate test. --- bin/CarTest.class | Bin 1455 -> 1477 bytes test/CarTest.java | 1 + 2 files changed, 1 insertion(+) diff --git a/bin/CarTest.class b/bin/CarTest.class index 11768a457d00cb73f1aee616de4d59c6f37fa680..b3df22b28098be95543ffad575552fdc101bb52b 100644 GIT binary patch delta 99 zcmZ3_eUy7c7^`v$0}BHa0|SG~ZU(_fAz^`(?F^zm+8o;$?6kKrNbF#c5s076%OYv4 t%D}^*#vsU`&Y;Yo!N3jFAqLS06z2u^1^LnHac$Bp(AakW^*h mVNhcbWKd_|2J*xpx`1N5KpqbR8-pH$J_92VIs*Aj3{C*DD+%)e diff --git a/test/CarTest.java b/test/CarTest.java index 0fcbf77..34a8f9d 100644 --- a/test/CarTest.java +++ b/test/CarTest.java @@ -36,6 +36,7 @@ public void canDoToString(){ public void canDecelerate() { Car car1 = new Car("Red", 100); car1.decelerate(5); + assertThat(car1.getSpeed(), is(95)); } // Create and pass test for no deceleration below 0. From b9764945a647b2a42778ce79cca38c8cbc9e893d Mon Sep 17 00:00:00 2001 From: Drewry Pope Date: Tue, 13 Feb 2018 22:34:31 -0600 Subject: [PATCH 6/8] Corrected test conditions, implemented decelerate. Realized test didn't accelerate car first. Made test accelerate car to expected starting condition. Test now correct, method also now passes. --- bin/Car.class | Bin 1101 -> 1115 bytes bin/CarTest.class | Bin 1477 -> 1487 bytes src/Car.java | 2 +- test/CarTest.java | 1 + 4 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/Car.class b/bin/Car.class index 3bfffea7436aa3a4d70252cfb5b488f494122bf3..19f543e9c93fa5f72af7263a0e9870fc93ffd5c3 100644 GIT binary patch delta 74 zcmX@hahqeqR%SbA24)5(1_lOht;j75BGM^a8ALV$xl9aVK#~hAWdNiN8N`8nF^EzI P2?j|Z52$JKQ|1f+%ee{O delta 60 zcmcc3ah7AlR%QcJ1_lNuAZFYMW{3evHU>r@X~-ZBB*h?-3=#~IKps%p3*0Q^%1 A-2eap diff --git a/bin/CarTest.class b/bin/CarTest.class index b3df22b28098be95543ffad575552fdc101bb52b..9b04d0141e4e85722cfd9bd15bf1bb7df760ce0e 100644 GIT binary patch delta 101 zcmX@geV%(m7^`$10}BHa0|SHBZU(_fAz^`(?F^zm+5#!t7z`(8vntw(F|Yz~s iGiWey1J#K^R0G9%fjk}t2?jj|eFjD#bOiF57@Po& Date: Tue, 13 Feb 2018 22:46:44 -0600 Subject: [PATCH 7/8] Made failing cannotDeceleratePastZero test. --- bin/CarTest.class | Bin 1487 -> 1639 bytes test/CarTest.java | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/CarTest.class b/bin/CarTest.class index 9b04d0141e4e85722cfd9bd15bf1bb7df760ce0e..86beb5a3c3851407bfb43f0620edb775f8c4c9e5 100644 GIT binary patch delta 147 zcmX@l{hWvE)W2Q(7#J9g7+f}Ty=Rh?NKVYl%P())W2Q(7#J9g7@Rk9y=R&%!mP^3w%Lk#H4`fX0~3Q20O^Pc^#A|> diff --git a/test/CarTest.java b/test/CarTest.java index e3116fa..af277e5 100644 --- a/test/CarTest.java +++ b/test/CarTest.java @@ -39,6 +39,12 @@ public void canDecelerate() { car1.decelerate(5); assertThat(car1.getSpeed(), is(95)); } - // Create and pass test for no deceleration below 0. + // Create and pass test for no deceleration below 0. + @Test + public void cannotDeceleratePastZero() { + Car car1 = new Car("Red", 100); + car1.decelerate(5); + assertThat(car1.getSpeed(), is(0)); + } } \ No newline at end of file From 82dd2b3f3ba8f315c4b29e388482ffc0c7d9677c Mon Sep 17 00:00:00 2001 From: Drewry Pope Date: Tue, 13 Feb 2018 22:50:12 -0600 Subject: [PATCH 8/8] Made cannotDeceleratePastZero test pass. --- bin/Car.class | Bin 1115 -> 1170 bytes src/Car.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/Car.class b/bin/Car.class index 19f543e9c93fa5f72af7263a0e9870fc93ffd5c3..4bb5e8a5e38f30740dfa46561d95c69717575939 100644 GIT binary patch delta 139 zcmcc3F^O}-R_6LD1{MY;1_lOct;j75B3eK!oic}k3&dE?z#^Tpl|f`9P@0)R3`lZ; zl^QTeF&Hw41NmYQtqc+jl0Y8N5C%C04hBXB1t43If$2YkC<7Ba10y4Z{0|g`aG61Z Nj6j7-lm9Zu0RYHK5bgi~ delta 79 zcmbQld7ERyR%T~s24)5(1_lOht;j75BGM^a8ALV$xl9aVK#~hAWdNiN8N`8nF^EzI U2?j|Z52%Sjj)8+=vOY^P0OA}86#xJL diff --git a/src/Car.java b/src/Car.java index 823dcbf..3c0f984 100644 --- a/src/Car.java +++ b/src/Car.java @@ -45,7 +45,7 @@ public void accelerate(int amount){ } public void decelerate(int amount) { - speed -= amount; + speed -= speed-amount < 0 ? speed : amount; } /**