Temperature - Adds the tests

vogella · vogella · commit ab45cd679810 · 2015-06-09T07:40:09.000+02:00
diff --git a/com.vogella.android.temperatureconverter/app/build.gradle b/com.vogella.android.temperatureconverter/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 22
-    buildToolsVersion "23.0.0 rc2"
+    buildToolsVersion '23.0.0 rc2'
 
     defaultConfig {
         applicationId "com.vogella.android.temperatureconverter"
@@ -20,5 +20,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-}
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    testCompile 'junit:junit:4.12'
+}
diff --git a/com.vogella.android.temperatureconverter/app/src/main/java/com/vogella/android/temperatureconverter/MainActivity.java b/com.vogella.android.temperatureconverter/app/src/main/java/com/vogella/android/temperatureconverter/MainActivity.java
@@ -14,7 +14,7 @@ public class MainActivity extends Activity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        text = (EditText) findViewById(R.id.editText1);
+        text = (EditText) findViewById(R.id.inputValue);
 
     }
 
diff --git a/com.vogella.android.temperatureconverter/app/src/main/res/layout/activity_main.xml b/com.vogella.android.temperatureconverter/app/src/main/res/layout/activity_main.xml
@@ -14,7 +14,8 @@
     <EditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/editText1" />
+        android:id="@+id/inputValue"
+        android:inputType="numberSigned|numberDecimal"/>
 
     <RadioGroup
         android:id="@+id/radioGroup1"
@@ -28,13 +29,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:checked="true"
-            android:text="RadioButton" />
+            android:text="@string/celsius" />
 
         <RadioButton
             android:id="@+id/radio1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="RadioButton" />
+            android:text="@string/fahrenheit" />
     </RadioGroup>
 
     <Button
@@ -44,6 +45,7 @@
         android:layout_alignStart="@+id/radioGroup1"
         android:layout_below="@+id/radioGroup1"
         android:layout_marginTop="22dp"
-        android:text="Button" />
+        android:text="@string/calc"
+        android:onClick="onClick"/>
 
 </LinearLayout>
diff --git a/com.vogella.android.temperatureconverter/app/src/test/java/com/vogella/android/temperatureconverter/AllTests.java b/com.vogella.android.temperatureconverter/app/src/test/java/com/vogella/android/temperatureconverter/AllTests.java
@@ -0,0 +1,13 @@
+package com.vogella.android.temperatureconverter;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+        ConverterTest.class
+})
+
+public class AllTests {
+}
diff --git a/com.vogella.android.temperatureconverter/app/src/test/java/com/vogella/android/temperatureconverter/ConverterTest.java b/com.vogella.android.temperatureconverter/app/src/test/java/com/vogella/android/temperatureconverter/ConverterTest.java
@@ -0,0 +1,14 @@
+package com.vogella.android.temperatureconverter;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class ConverterTest {
+    @Test
+    public void testConvert() {
+        float actual = ConverterUtil.convertCelsiusToFahrenheit(100);
+        float expected = 212;
+        assertEquals("Conversion from celsius to fahrenheit failed", expected,
+                actual, 0.001);
+    }
+}
diff --git a/com.vogella.android.temperatureconverter/build.gradle b/com.vogella.android.temperatureconverter/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.3.0-beta2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class MainActivity extends Activity {`
`14`	`14`	`public void onCreate(Bundle savedInstanceState) {`
`15`	`15`	`super.onCreate(savedInstanceState);`
`16`	`16`	`setContentView(R.layout.activity_main);`
`17`		`- text = (EditText) findViewById(R.id.editText1);`
	`17`	`+ text = (EditText) findViewById(R.id.inputValue);`
`18`	`18`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:1.2.3'`
	`8`	`+ classpath 'com.android.tools.build:gradle:1.3.0-beta2'`
`9`	`9`
`10`	`10`	`// NOTE: Do not place your application dependencies here; they belong`
`11`	`11`	`// in the individual module build.gradle files`