From 0e7259501954e00d27d146c77bcb6cfe443d1bf7 Mon Sep 17 00:00:00 2001 From: courseatf Date: Wed, 19 Nov 2014 13:46:38 +0900 Subject: [PATCH 1/3] test test --- .../tc/test/TemperatureConverterActivityTests.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java b/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java index 6cd5fad..74689f8 100644 --- a/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java +++ b/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java @@ -10,6 +10,7 @@ import android.test.ViewAsserts; import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.Suppress; +import android.util.Log; import android.view.Gravity; import android.view.KeyEvent; import android.view.View; @@ -96,7 +97,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; @@ -106,11 +107,13 @@ public void testFahrenheitToCelsiusConversion() { assertTrue(mCelsius.requestFocus()); assertTrue(mCelsius.isFocused()); - final double expected; // COMPLETE - final double actual; // COMPLETE + final double expected = TemperatureConverter.fahrenheitToCelsius(f); // COMPLETE + final double actual = mCelsius.getNumber(); // COMPLETE + + Log.d("ttest","expected :" + expected +",actual :" + actual ); final double delta = Math.abs(expected - actual); assertTrue("delta=" + delta + " expected=" + expected + " actual=" + actual, delta < 0.005); - */ + assertTrue(true); } From d16332eceb7dff3a1d28ccc7dc35735b949ddc0b Mon Sep 17 00:00:00 2001 From: courseatf Date: Wed, 19 Nov 2014 13:51:27 +0900 Subject: [PATCH 2/3] test test --- .../i2at/tc/test/TemperatureConverterActivityTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java b/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java index 74689f8..41b0824 100644 --- a/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java +++ b/TemperatureConverterTest/src/com/example/i2at/tc/test/TemperatureConverterActivityTests.java @@ -107,8 +107,8 @@ public void testFahrenheitToCelsiusConversion() { assertTrue(mCelsius.requestFocus()); assertTrue(mCelsius.isFocused()); - final double expected = TemperatureConverter.fahrenheitToCelsius(f); // COMPLETE - final double actual = mCelsius.getNumber(); // COMPLETE + final double expected = TemperatureConverter.fahrenheitToCelsius(f); + final double actual = mCelsius.getNumber(); Log.d("ttest","expected :" + expected +",actual :" + actual ); final double delta = Math.abs(expected - actual); From 492b8461594d04cb0d7976554269b0db6814ec31 Mon Sep 17 00:00:00 2001 From: courseatf Date: Wed, 19 Nov 2014 14:19:25 +0900 Subject: [PATCH 3/3] test test --- .../src/com/example/i2at/tc/TemperatureConverter.java | 5 +++-- .../com/example/i2at/tc/TemperatureConverterActivity.java | 3 +++ 2 files changed, 6 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..17fd5c8 100644 --- a/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverter.java +++ b/TemperatureConverter/src/com/example/i2at/tc/TemperatureConverter.java @@ -12,11 +12,12 @@ 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); } } 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)); } } };