From 1f49be5e3bcc8beff50fbe85cef9debcb5b9a016 Mon Sep 17 00:00:00 2001 From: vidyachandasekhar Date: Fri, 12 May 2017 12:15:36 -0400 Subject: [PATCH] completed the COnversionTool completed tests --- .idea/compiler.xml | 18 +--- .idea/copyright/profiles_settings.xml | 3 - .idea/encodings.xml | 6 -- .idea/misc.xml | 84 ++++++++++++++++--- conversion.iml | 3 +- src/main/java/ConversionTool.java | 21 ----- src/main/java/newTool.java | 78 +++++++++++++++++ src/test/java/ConversionToolSpec.java | 52 ++++++------ target/classes/ConversionTool.class | Bin 1471 -> 0 bytes target/test-classes/ConversionToolSpec.class | Bin 3584 -> 3724 bytes 10 files changed, 179 insertions(+), 86 deletions(-) delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 src/main/java/ConversionTool.java create mode 100644 src/main/java/newTool.java delete mode 100644 target/classes/ConversionTool.class diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 3c5f7fa..7ec525c 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,27 +1,11 @@ - - - - - - - - - - - - - - - - + - diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index dfca8c4..78226aa 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,42 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + 1.8 @@ -37,6 +84,17 @@ + + + + + + + \ No newline at end of file diff --git a/conversion.iml b/conversion.iml index 4b044f1..0ddf51c 100644 --- a/conversion.iml +++ b/conversion.iml @@ -1,11 +1,10 @@ - + - diff --git a/src/main/java/ConversionTool.java b/src/main/java/ConversionTool.java deleted file mode 100644 index df73653..0000000 --- a/src/main/java/ConversionTool.java +++ /dev/null @@ -1,21 +0,0 @@ -public class ConversionTool { - - - public static void main(String[] args){} - - public static float CentimetersToInches(float centimeters){} - - public static float InchesToCentimeters(float inches){} - - public static float FeetToMeters(float feet){} - - public static float MetersToFeet(float meters){} - - public static float CelsiusToFahrenheit(float celsius){} - - public static float FahrenheitToCelsius(float fahrenheit){} - - public static float MphToKph(float mph){} - - public static float KphToMph(float kph){} -} diff --git a/src/main/java/newTool.java b/src/main/java/newTool.java new file mode 100644 index 0000000..5f79aa8 --- /dev/null +++ b/src/main/java/newTool.java @@ -0,0 +1,78 @@ +import java.util.Scanner; + +public class newTool { + + + public static void main(String[] args){ + } + + public float centimetersToInches(float centimeters){ + if (centimeters<0){ + return 0; + } + float inches = (float) (((centimeters / 2.54) * 100 ) / 100.0); + return (inches ); + } + + public static float InchesToCentimeters(float inches){ + if (inches<0){ + return 0; + } + float centimeters = (float) (((inches * 2.54) * 100 )/ 100.0 ); + return (centimeters ); + } + + public static float FeetToMeters(float feet) { + if (feet<0){ + return 0; + } + float meters = (float) (((feet * 0.3048) * 100) / 100.0); + return (meters); + + } + + + public static float MetersToFeet(float meters){ + if (meters<0){ + return 0; + } + float feet = (float) (((meters / 0.3048) * 100) / 100.0); + return (feet); + } + + + + public static float CelsiusToFahrenheit(float celsius){ + float Fahrenheit = (float) ((((celsius * 9/5.0) +32) * 100) / 100.0); + return (Fahrenheit); + + } + + + public static float FahrenheitToCelsius(float fahrenheit){ + float celsius = (float) ((((fahrenheit -32) * 5/9.0) * 100) / 100.0); + return (celsius); + + } + + public static float MphToKph(float mph){ + if (mph<0){ + return 0; + } + float Kph = (float) (((mph * 1.60934) * 100) / 100.0); + return (Kph); + + } + + public static float KphToMph(float kph){ + if (kph<0){ + return 0; + } + float mph = (float) (((kph / 1.60934) * 100) / 100.0); + return (mph); + } + + +} + + diff --git a/src/test/java/ConversionToolSpec.java b/src/test/java/ConversionToolSpec.java index 5bbfb07..351b032 100644 --- a/src/test/java/ConversionToolSpec.java +++ b/src/test/java/ConversionToolSpec.java @@ -3,110 +3,114 @@ public class ConversionToolSpec { + newTool newTool = new newTool(); + @Test public void shouldConvertCentimetersToInches() { - float inches = ConversionTool.CentimetersToInches(2f); + + float inches = newTool.centimetersToInches(2f); assertEquals(0.7874f, inches, 0.001); } @Test public void shouldConvertZeroCentimetersToZeroInches() { - float inches = ConversionTool.CentimetersToInches(0); + float inches = newTool.centimetersToInches(0); assertEquals(0, inches, 0.0); } @Test public void shouldConvertNegativeCentimetersToZeroInches() { - float inches = ConversionTool.CentimetersToInches(-5); + float inches = newTool.centimetersToInches(-5); assertEquals(0, inches, 0.0); } @Test public void shouldConvertInchesToCentimeters() { - float centimeters = ConversionTool.InchesToCentimeters(4f); + float centimeters = newTool.InchesToCentimeters(4f); assertEquals(10.16f, centimeters, 0.001); } @Test public void shouldConvertZeroInchesToZeroCentimeters() { - float centimeters = ConversionTool.InchesToCentimeters(0); + float centimeters = newTool.InchesToCentimeters(0); assertEquals(0, centimeters, 0.0); } @Test public void shouldConvertNegativeInchesToZeroCentimeters() { - float centimeters = ConversionTool.InchesToCentimeters(-5); + float centimeters = newTool.InchesToCentimeters(-5); assertEquals(0, centimeters, 0.0); } @Test public void shouldConvertFeetToMeters() { - float meters = ConversionTool.FeetToMeters(5f); + float meters = newTool.FeetToMeters(5f); assertEquals(1.524f, meters, 0.001); } @Test public void shouldConvertZeroFeetToZeroMeters() { - float meters = ConversionTool.FeetToMeters(0); + float meters = newTool.FeetToMeters(0); assertEquals(0, meters, 0.0); } @Test public void shouldConvertNegativeFeetToZeroMeters() { - float meters = ConversionTool.FeetToMeters(-10); + float meters = newTool.FeetToMeters(-10); assertEquals(0, meters, 0.0); } @Test public void shouldConvertMetersToFeet() { - float feet = ConversionTool.MetersToFeet(9f); + float feet = newTool.MetersToFeet(9f); assertEquals(29.5276f, feet, 0.001); } @Test public void shouldConvertZeroMetersToZeroFeet() { - float feet = ConversionTool.MetersToFeet(0); + float feet = newTool.MetersToFeet(0); assertEquals(0, feet, 0.0); } @Test public void shouldConvertNegativeMetersToZeroFeet() { - float feet = ConversionTool.MetersToFeet(-10); + float feet = newTool.MetersToFeet(-10); assertEquals(0, feet, 0.0); } - @Test - public void shouldConvertFahrenheitToCelsius() { - float celsius = ConversionTool.FahrenheitToCelsius(80); - assertEquals(26.67, celsius, 0.01); - } + @Test + public void shouldConvertFahrenheitToCelsius() { + float celsius = newTool.FahrenheitToCelsius(80); + assertEquals(26.67, celsius, 0.01); + } + @Test public void shouldConvertCelsiusToFahrenheit() { - float fahrenheit = ConversionTool.CelsiusToFahrenheit(26.67f); + float fahrenheit = newTool.CelsiusToFahrenheit(26.67f); assertEquals(80, fahrenheit, 0.01); } @Test public void shouldConvertMphToKph(){ - float kph = ConversionTool.MphToKph(24f); + float kph = newTool.MphToKph(24f); assertEquals(38.62, kph, 0.01); } @Test public void shouldConvertZeroMphToZeroKph(){ - float kph = ConversionTool.MphToKph(0f); + float kph = newTool.MphToKph(0f); assertEquals(0, kph, 0.0); } @Test public void shouldConvertNegativeMphToZeroKph(){ - float kph = ConversionTool.MphToKph(-50f); + float kph = newTool.MphToKph(-50f); assertEquals(0, kph, 0.0); } @Test public void shouldConvertKphToMph(){ - float mph = ConversionTool.KphToMph(6.44f); + float mph = newTool.KphToMph(6.44f); assertEquals(4, mph, 0.01); } @Test public void shouldConvertZeroKphToZeroMph(){ - float mph = ConversionTool.KphToMph(0f); + float mph = newTool.KphToMph(0f); assertEquals(0, mph, 0.0); } @Test public void shouldConvertNegativeKphToZeroMph(){ - float mph = ConversionTool.KphToMph(-50f); + float mph = newTool.KphToMph(-50f); assertEquals(0, mph, 0.0); } diff --git a/target/classes/ConversionTool.class b/target/classes/ConversionTool.class deleted file mode 100644 index 7d20ebc7517733b6c814cac4fcef422936d99bfb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1471 zcmZva%}x_h6vxlBx1DJ_r8reUP(BJ`i$Z~DVgdoAP-7?%Wr7P`IIUAUwVffuz!SK0 z;lj8xMqj|hmBxjxHSslk1~(f2cVs z#nPcbtYSUW1K#~=n$^%chnj8hyKiJp%Qz8euvW3mGu=KhEK{|t z&I)w8nqdkwRD4`(YiC-yqnStL1IISZqZOB<*+D2Xbi}e^ zwNw=-)95(`5@1Q#nqydK#qcBZUW#f3bOe&Cy6&jft}6?J2Eu-fy*JtYdRuQeG=(3K#WVB2fCS269mK7SUBI50`%JC{rRh*{Of*x@jSoxZ_y8LP>lwE0Ify$4SU7ePp9k$Fse_-Oi z_@MD=7? zEb6Wt8s7YaMY%#)XG{0w#eb6VU)jt4&C_tlb1@H zf69v=fB4(#7l8+^@Gl3WER7*@yy!^le18mmlaC6ebfT`Md|)Epe$k;oM>4iWo&Ow-l%;z?4?C6r_q zEB=^~QnEWrPGjFIi>^XO%S#l9MGXC1&E+*iXN2ujHHFjz`HWG_9+s~aBC1}{PSgUz z62>h(l~Hl0tW_pbRHDAEq8YNI$(iR59bW&~-J9wCAd0xc$M)NfLZ^iP}=Nazu|(y{Yc8BoaT0V|btK$)l=TNEmTb zBIK2AN;GH-V#snJn^l8HY%x^@jd6Bh`R;_756y7|z6e(htD+?m;~L}as-sFKr|KD1 zLzNLVo7alidUvWivj1<7)@l z6^xGJ==y4>Gn~(>ImCMvbFy+)RI==(2bY(Z*&C*-+Uwl$L$tlMz12=(%ebeu#av@_ z2|J*rw$Clq4WU82!6)!8l<*5n7`ritG>kL&wm{A1HQ(41lE%KHru`?>{5840#I+`R z9V2_E;`NFjncl$6TaKrzbPeAmx{h2;X0A;{u-NXgugKN@4L!FUAbIFvfLcoAsU_?H zlBkVZkt#s#X40PWjg_SA%A52SlHWk2jK8xcYR*E%E2vI}YGbI5p@$s;j1QPj@{ymz zbXu4eA!gpftXD98hVeg((+y8OAoX$_e}&^AF=xTzY*#qFjI-P?Ff)CD?lr zxPA`STYVdspCwsGi&B5M02jlIn3hdpqU=8+q zoQev;UKsY4I1X=5#JOd08tplPR!~qB_EtF%Z%+hz+XB_u>nqUleI^)&Psa zUYvvR_SOXUVotD^OEdu3pc8Bpur0v09bj<*Y~2YqRH9+PMx0=~fb9Xc?*Q8nz;0Wx zhQ1hf>Wc&P#a;BpJ&wcog^06haq9ZwGAqjAR4FJZiM~j2Aigg|pe+kj*B8MOjl$lT zlf5)x8Q9Y}7~dD$0(%Jy)?jbcsi-XMoxq;Xad>+o&N~*T(Vipd3eAd?*B!(nD+nx literal 3584 zcmaKt&r=&^7{{N5ut`G*5YiuX1fkFxuq8^XwzQChq$yAWrEIZ9+PVn~SsHdRKRDQn z2OUox|Ak&V&N$=Aj0XpM^x(l6?|O9f;=vgYj^p>;WOv^!@0!D#&AZ?C`Rx07-*@xF zzu$gGL~oN3rb${4lS238)Nj-3C+L+^cZ!9d{(SLIm^SGBz|nJ}KpHn#>b{&FU;CY< z0%`QKt_O1J?_%K>*7f}enoM7-e^XA+e%^P)`sbgwx;~K8Ghco-++6!ZPJR0EueZL6 zKMiDl-kM-#w&b*eEIxtEQ7isXPG?uQ5`Vq?BJgqn{pla$Pg(SloCbq^g7i2@A4(+O z&<(vlCsAi&Vnd=p*4)-4>Rr|iZKbha)T)YFte_{hY?jo@hFaCx?{;UPUe;?8#h0_D zai~>mx@jn;Sy?~OO4lVCsg=z}WxI8+p4E)HzOU60Q_Mx9RMs$3*4r0SUZTOf4J)#t z*K{y4hGEv#I%*==w`^8-lY0$3Yf{l_b(Bwd%5Q2_(}Q3gHs+!yx}xo(?4jlx_da;5 zh{9KwsJrA&NAxK6pjRGCBJrd6#s@u5p4YUxViqikkk_&)(WocHkgXuQvcu;+8C${e zoEO*{tyuN2Id;Go;p~`=mPm{{p7W~CtL3U@lre!7i+n*Q#yIs^Vn41PsIKScH8s!Ai7IuZpw@ z-b{GiY*b5HUT25!^zm~xwWl7c5qgs@1_|FqDg|jfLK^KvXqQS6Dzips%^qu>u%^PA zeJbHtAFqhR#%d-js*D4| z4Yk4!ej=C4u@}yOz4f_zNPBmB#NIfp8)MuR=k^Jn$l5X94H0seJ!G#BjnV{O-t2Rd zB<2q7CHzX_Tf%qO*1&AIXqA1nNA$lA{NQk)VAeP#QXe{(Uj2Kb_)I)KO5p6SMOj0zBYYt&+Lfmi=9$mhSbC|{$ zbd7TiUYCe5>o8nh*j-WR>h;r=0A~WaCOHnTYfhjm<#2diQ9oUmplb@ck{p89B|@Yf zgsZEcO~q#iPh%RFq3a6A;B|=@8HeHOiZy8fy5fGiu7Yz7x@I^IuWMeQE9-E0T?2ko znT4)7=t^-2UY7`wa}XX~zKnTHBMV(Qj=}2^F>X2xSJ$Z~orbP6OxIb#i)8_vMd(`M zIJ~aBK-Vn+=d~scfivvKVK37aa8`Xd3j)rffHTshQE<-ran`|6z`5tcSrTw=I~;!b zNBx%nK9>IhmVc8&@XIekEISBy`N!E*d``$>1Kl`?ec(6z@QcwHjI9S7mj<;&Q|Gz{o6IR>vw#8|`s Ia0lJ}5Bza;{r~^~