From d568726c8d7831b83c8bcc3f96129bc17df42f3e Mon Sep 17 00:00:00 2001 From: courseatf Date: Wed, 19 Nov 2014 15:07:17 +0900 Subject: [PATCH 1/2] test test --- .../tc/test/TemperatureConverterTests.java | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterTests.java b/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterTests.java index 8376807..5806f92 100644 --- a/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterTests.java +++ b/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterTests.java @@ -5,7 +5,11 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; +import java.util.Collection; import java.util.HashMap; +import java.util.Iterator; + +import android.util.Log; import com.example.i2at.tc.TemperatureConverter; @@ -21,7 +25,7 @@ public class TemperatureConverterTests extends TestCase { new HashMap(); static { - sConversionTableDouble.put(0.0, 32.0); + sConversionTableDouble.put(0.0, 32.0); // 섭씨 , 화씨 sConversionTableDouble.put(100.0, 212.0); sConversionTableDouble.put(-1.0, 30.20); sConversionTableDouble.put(-100.0, -148.0); @@ -58,6 +62,40 @@ public void testFahrenheitToCelsius() { /* TODO 6: 섭씨온도와 화씨온도를 서로 변환할 수 있어야 함. (기대 값의 허용오차는 0.005 로 가정) * 미리 준비 된 변환 테이블을 참조하여 작성(sConversionTableDouble) */ + ////////////////////////////////////////////////// + ///섭씨 + Collection keys = sConversionTableDouble.keySet(); + Iterator Ir_keys ; + Ir_keys = keys.iterator(); + + while (Ir_keys.hasNext()) { + // Log.d("testt","" + Ir_keys.next() ); + double c = Ir_keys.next(); + double expected = TemperatureConverter.celsiusToFahrenheit(c); + double actual = c; + double delta = Math.abs(expected - actual); + assertTrue("delta=" + delta + " expected=" + expected + " actual=" + actual, delta < 0.005); + + } + + //////////////////////////////////////////////// + /// 화씨 + + Collection values = sConversionTableDouble.values(); + Iterator Ir_values; + Ir_values = values.iterator(); + + while (Ir_values.hasNext()) { + Log.d("testt","" + Ir_values.next()); + double f = Ir_keys.next(); + double expected = TemperatureConverter.fahrenheitToCelsius(f); + double actual = f; + double delta = Math.abs(expected - actual); + assertTrue("delta=" + delta + " expected=" + expected + " actual=" + actual, delta < 0.005); + + } + + } /** From 0fa09813c6cf1f8749a7b32416456aa98f4edbe2 Mon Sep 17 00:00:00 2001 From: courseatf Date: Wed, 19 Nov 2014 15:09:36 +0900 Subject: [PATCH 2/2] test test --- .../src/com/example/i2at/tc/TemperatureConverter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverter.java b/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverter.java index 0250447..d9706df 100644 --- a/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverter.java +++ b/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverter.java @@ -12,11 +12,11 @@ private TemperatureConverter() { // do nothing } public static double fahrenheitToCelsius(double f) { - return 0.27777; + return ((f - 32) / 1.8); } public static double celsiusToFahrenheit(double c) { - return 32.5; + return ((c * 1.8) + 32); } }