From 385acf3c23a0a72cbcb9831769234e4b86da3a1d Mon Sep 17 00:00:00 2001 From: dgsw Date: Wed, 19 Nov 2014 13:45:17 +0900 Subject: [PATCH 1/2] 5. F to C #8 --- .../i2at/tc/test/TemperatureConverterActivityTests.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java b/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java index e06822e..fdfbd5d 100644 --- a/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java +++ b/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java @@ -100,7 +100,7 @@ public void testVirtualKeyboardSpaceReserved() { @UiThreadTest public void testFahrenheitToCelsiusConversion() { - /* TODO 5-1: 하나의 field 에 값을 입력하면, 다른 field 에 해당 값이 실시간으로 변환되어야 함 + /* TODO 5-1: 하나의 field 에 값을 입력하면, 다른 field 에 해당 값이 실시간으로 변환되어야 함*/ mCelsius.clear(); mFahrenheit.clear(); final double f = 32.5; @@ -110,12 +110,10 @@ public void testFahrenheitToCelsiusConversion() { assertTrue(mCelsius.requestFocus()); assertTrue(mCelsius.isFocused()); - final double expected; // COMPLETE - final double actual; // COMPLETE + final double expected = 0.2777; + final double actual = mCelsius.getNumber(); final double delta = Math.abs(expected - actual); assertTrue("delta=" + delta + " expected=" + expected + " actual=" + actual, delta < 0.005); - */ - assertTrue(true); } @UiThreadTest From f6023ac53127fc2ff6605f0839089a5605fec0fd Mon Sep 17 00:00:00 2001 From: dgsw Date: Wed, 19 Nov 2014 14:15:33 +0900 Subject: [PATCH 2/2] 5. Converter #8 --- .../src/com/example/i2at/tc/TemperatureConverter.java | 4 ++-- .../src/com/example/i2at/tc/TemperatureConverterActivity.java | 3 +++ 2 files changed, 5 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..0fef796 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) * 5 / 9.0; } public static double celsiusToFahrenheit(double c) { - return 32.5; + return 9 / 5.0 * c + 32; } } diff --git a/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverterActivity.java b/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverterActivity.java index 965c486..faf1693 100644 --- a/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverterActivity.java +++ b/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverterActivity.java @@ -85,6 +85,7 @@ public void onTextChanged(CharSequence s, int start, int before, + parsedNumber + "}"); // TODO: complete this method. // Hint: use abstract method 'convert' and EditNumber.setNumber + mDest.setNumber(convert(parsedNumber)); } catch (NumberFormatException e) { // WARNING: @@ -130,9 +131,11 @@ public void onFocusChange(View dest, boolean hasFocus) { if (dest == mCelsius && ! Double.isNaN(f)) { // TODO: complete this method. Use setNumber of EditNumber method + TemperatureConverter.fahrenheitToCelsius(f); } else if (dest == mFahrenheit && !Double.isNaN(c)) { // TODO: complete this method. Use setNumber of EditNumber method + TemperatureConverter.celsiusToFahrenheit(c); } } };