Skip to content

Commit 1ee0cb1

Browse files
committed
Few fix in code and added Junit test
1 parent 29a9bc9 commit 1ee0cb1

File tree

2 files changed

+42
-24
lines changed

2 files changed

+42
-24
lines changed

src/main/java/com/thealgorithms/conversions/TemperatureConversion.java

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@ public static void main(String[] args) {
4646
if (fromType == toType) {
4747
System.out.println("Your Temperature is the same !!");
4848
} else if (fromType == 1 && toType == 2) {
49-
System.out.println("Converted value: " + rnd.format(convertCelsiusToFahrenheit(inTemp)) + " °F");
49+
System.out.println("Converted value: " + convertCelsiusToFahrenheit(inTemp) + " °F");
5050
} else if (fromType == 1 && toType == 3) {
51-
System.out.println("Converted value: " + rnd.format(convertCelsiusToKelvin(inTemp)) + " K");
51+
System.out.println("Converted value: " + convertCelsiusToKelvin(inTemp) + " K");
5252
} else if (fromType == 2 && toType == 1) {
53-
System.out.println("Converted value: " + rnd.format(convertFahrenheitToCelsius(inTemp)) + " °C");
53+
System.out.println("Converted value: " + convertFahrenheitToCelsius(inTemp) + " °C");
5454
} else if (fromType == 2 && toType == 3) {
55-
System.out.println("Converted value: " + rnd.format(convertFahrenheitToKelvin(inTemp)) + " K");
55+
System.out.println("Converted value: " + convertFahrenheitToKelvin(inTemp) + " K");
5656
} else if (fromType == 3 && toType == 1) {
57-
System.out.println("Converted value: " + rnd.format(convertKelvinToCelsius(inTemp)) + " °C");
57+
System.out.println("Converted value: " + convertKelvinToCelsius(inTemp) + " °C");
5858
} else if (fromType == 3 && toType == 2) {
59-
System.out.println("Converted value: " + rnd.format(convertKelvinToFahrenheit(inTemp)) + " °F");
59+
System.out.println("Converted value: " + convertKelvinToFahrenheit(inTemp) + " °F");
6060
} else {
6161
System.out.println("Please check your input and output types");
6262
}
@@ -67,78 +67,78 @@ public static void main(String[] args) {
6767
* This method converts a Kelvin to Celsius.
6868
*
6969
* @param param float paramter
70-
* @return double
70+
* @return String
7171
*/
72-
private static double convertKelvinToCelsius(float inTemp) {
72+
public static String convertKelvinToCelsius(float inTemp) {
7373

7474
double result = 0;
7575
result = inTemp - 273.15;
76-
return result;
76+
return rnd.format(result);
7777
}
7878

7979
/**
8080
* This method converts a Kelvin to Fahrenheit.
8181
*
8282
* @param param float paramter
83-
* @return double
83+
* @return String
8484
*/
85-
private static double convertKelvinToFahrenheit(float inTemp) {
85+
public static String convertKelvinToFahrenheit(float inTemp) {
8686

8787
double result = 0;
8888
result = (inTemp * 1.8) - 459.67;
89-
return result;
89+
return rnd.format(result);
9090
}
9191

9292
/**
9393
* This method converts a Fahrenheit to Kelvin.
9494
*
9595
* @param param float paramter
96-
* @return double
96+
* @return String
9797
*/
98-
private static double convertFahrenheitToKelvin(float inTemp) {
98+
public static String convertFahrenheitToKelvin(float inTemp) {
9999

100100
double result = 0;
101101
result = (inTemp + 459.67) / 1.8;
102-
return result;
102+
return rnd.format(result);
103103
}
104104

105105
/**
106106
* This method converts a Fahrenheit to Kelvin.
107107
*
108108
* @param param float paramter
109-
* @return double
109+
* @return String
110110
*/
111-
private static double convertFahrenheitToCelsius(float inTemp) {
111+
public static String convertFahrenheitToCelsius(float inTemp) {
112112

113113
double result = 0;
114114
result = (inTemp - 32) / 1.8;
115-
return result;
115+
return rnd.format(result);
116116
}
117117

118118
/**
119119
* This method converts a Celsius to Fahrenheit.
120120
*
121121
* @param param float paramter
122-
* @return double
122+
* @return String
123123
*/
124-
private static double convertCelsiusToFahrenheit(float inTemp) {
124+
public static String convertCelsiusToFahrenheit(float inTemp) {
125125

126126
double result = 0;
127127
result = (inTemp * 1.8) + 32;
128-
return result;
128+
return rnd.format(result);
129129
}
130130

131131
/**
132132
* This method converts a Celsius to Kelvin.
133133
*
134134
* @param param float paramter
135-
* @return double
135+
* @return String
136136
*/
137-
private static double convertCelsiusToKelvin(float inTemp) {
137+
public static String convertCelsiusToKelvin(float inTemp) {
138138

139139
double result = 0;
140140
result = inTemp + 273.15;
141-
return result;
141+
return rnd.format(result);
142142
}
143143

144144
/*
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.thealgorithms.conversions;
2+
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
5+
import org.junit.jupiter.api.Test;
6+
7+
public class TemperatureConversionTest {
8+
9+
@Test
10+
public void testTemperatureConversion() {
11+
assertEquals("326.15", TemperatureConversion.convertCelsiusToKelvin(53));
12+
assertEquals("89.60", TemperatureConversion.convertCelsiusToFahrenheit(32));
13+
assertEquals("179.85", TemperatureConversion.convertKelvinToCelsius(453));
14+
assertEquals("137.93", TemperatureConversion.convertKelvinToFahrenheit(332));
15+
assertEquals("8.33", TemperatureConversion.convertFahrenheitToCelsius(47));
16+
assertEquals("273.71", TemperatureConversion.convertFahrenheitToKelvin(33));
17+
}
18+
}

0 commit comments

Comments
 (0)