From 900852dabbe0bd4c20b779f82273433c005f2a6f Mon Sep 17 00:00:00 2001 From: junhee Date: Wed, 19 Nov 2014 14:01:26 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9A=94=EA=B5=AC=EC=82=AC=ED=95=AD=205?= =?UTF-8?q?=EB=B2=88=20=EA=B5=AC=ED=98=84=20=EB=B0=8F=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=B6=94=EA=B0=80=20#8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i2at/tc/TemperatureConverterActivity.java | 3 +++ .../test/TemperatureConverterActivityTests.java | 16 ++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverterActivity.java b/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverterActivity.java index 965c486..bad6b3d 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 + mCelsius.setNumber(TemperatureConverter.fahrenheitToCelsius(f)); } else if (dest == mFahrenheit && !Double.isNaN(c)) { // TODO: complete this method. Use setNumber of EditNumber method + mFahrenheit.setNumber(TemperatureConverter.celsiusToFahrenheit(c)); } } }; diff --git a/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java b/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java index e06822e..c7b4d6b 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,17 +110,15 @@ public void testFahrenheitToCelsiusConversion() { assertTrue(mCelsius.requestFocus()); assertTrue(mCelsius.isFocused()); - final double expected; // COMPLETE - final double actual; // COMPLETE + final double expected = 0.277; // COMPLETE + final double actual = mCelsius.getNumber(); // COMPLETE final double delta = Math.abs(expected - actual); assertTrue("delta=" + delta + " expected=" + expected + " actual=" + actual, delta < 0.005); - */ - assertTrue(true); } @UiThreadTest public void testCelsiusToFahrenheitConversion() { - /* TODO 5-2: 하나의 field 에 값을 입력하면, 다른 field 에 해당 값이 실시간으로 변환되어야 함 + /* TODO 5-2: 하나의 field 에 값을 입력하면, 다른 field 에 해당 값이 실시간으로 변환되어야 함 */ mCelsius.clear(); mFahrenheit.clear(); final double c = 100; @@ -129,12 +127,10 @@ public void testCelsiusToFahrenheitConversion() { assertEquals(c, mCelsius.getNumber()); assertTrue(mFahrenheit.requestFocus()); assertTrue(mFahrenheit.isFocused()); - final double expected; // COMEPLETE - final double actual; // COMPLETE + final double expected = 32.5; // COMEPLETE + final double actual = mFahrenheit.getNumber(); // COMPLETE final double delta = Math.abs(expected - actual); assertTrue("delta=" + delta + " expected=" + expected + " actual=" + actual, delta < 0.005); - */ - assertTrue(true); } public void testFahrenheitToCelsiusConversion_text() throws Throwable {