Added real unit tests

vogella · vogella · commit dc17b865e4eb · 2015-09-10T01:23:08.000+02:00
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
@@ -6,7 +6,7 @@
 
 @RunWith(Suite.class)
 @SuiteClasses({
-        ConverterTest.class
+        ConverterUtilTest.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
diff --git a/com.vogella.android.temperatureconverter/app/src/test/java/com/vogella/android/temperatureconverter/ConverterUtilTest.java b/com.vogella.android.temperatureconverter/app/src/test/java/com/vogella/android/temperatureconverter/ConverterUtilTest.java
@@ -0,0 +1,30 @@
+package com.vogella.android.temperatureconverter;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+import org.junit.*;
+
+import static org.junit.Assert.assertTrue;
+
+public class ConverterUtilTest {
+
+
+    @Test
+    public void testConvertFahrenheitToCelsius() {
+        float actual = ConverterUtil.convertCelsiusToFahrenheit(100);
+        // expected value is 212
+        float expected = 212;
+        // use this method because float is not precise
+        assertEquals("Conversion from celsius to fahrenheit failed", expected, actual, 0.001);
+    }
+
+    @Test
+    public void testConvertCelsiusToFahrenheit() {
+        float actual = ConverterUtil.convertFahrenheitToCelsius(212);
+        // expected value is 100
+        float expected = 100;
+        // use this method because float is not precise
+        assertEquals("Conversion from celsius to fahrenheit failed", expected, actual, 0.001);
+    }
+}
diff --git a/com.vogella.android.temperatureconverter/app/src/test/java/com/vogella/android/temperatureconverter/ParameterizedTestFields.java b/com.vogella.android.temperatureconverter/app/src/test/java/com/vogella/android/temperatureconverter/ParameterizedTestFields.java
@@ -16,31 +16,25 @@ public class ParameterizedTestFields {
 
     // fields used together with @Parameter must be public
     @Parameter
-    public int m1;
+    public float m1;
     @Parameter (value = 1)
-    public int m2;
+    public float m2;
 
 
     // creates the test data
     @Parameters
     public static Collection<Object[]> data() {
-        Object[][] data = new Object[][] { { 1 , 2 }, { 5, 3 }, { 121, 4 } };
+        Object[][] data = new Object[][] { { 46.4f , 8f }, { 5f, -15f }, { 24f, -4.44444465637207f } };
         return Arrays.asList(data);
     }
 
 
     @Test
     public void testMultiplyException() {
-        MyClass tester = new MyClass();
-        assertEquals("Result", m1 * m2, tester.multiply(m1, m2));
+        float actual = ConverterUtil.convertFahrenheitToCelsius(m1);
+        assertEquals("Result", m2, actual, 0.001);
     }
 
 
-    // class to be tested
-    class MyClass {
-        public int multiply(int i, int j) {
-            return i *j;
-        }
-    }
 
 }
