Updates to code to address Peter's feedback for build.gradle, concurrency/DefaultExecutorsTests.java, serializer/CalendarSerializerTests.java, and ISO8601Test.java.

Author: TBag

graphsdk/build.gradle

@@ -22,7 +22,7 @@ android {
     buildToolsVersion "23.0.1"
 
     defaultConfig {
-        minSdkVersion 23
+        minSdkVersion 15
         targetSdkVersion 23
         versionCode this.getVersionCode()
         versionName this.getVersionName()

graphsdk/src/androidTest/java/com/microsoft/graph/concurrency/DefaultExecutorsTests.java

@@ -31,22 +31,20 @@ public void testNotNull() {
 
     public void testPerformOnBackground() {
         final String expectedLogMessage = "Starting background task, current active count: 0";
-        final AtomicBoolean success = new AtomicBoolean(false);
-        final SimpleWaiter simpleWaiter = new SimpleWaiter();
-        final AtomicReference<CallingState> callingState = new AtomicReference<>(CallingState.Unknown);
+        final String expectedResult = "test perform on background success";
+        final ExecutorTestCallback<String> callback = new ExecutorTestCallback<>();
 
         defaultExecutors.performOnBackground(new Runnable() {
             @Override
             public void run() {
-                success.set(true);
-                callingState.set(Looper.getMainLooper().isCurrentThread() ? CallingState.Foreground : CallingState.Background);
-                simpleWaiter.signal();
+                callback.success(expectedResult);
             }
         });
 
-        simpleWaiter.waitForSignal();
-        assertEquals(CallingState.Background, callingState.get());
-        assertTrue(success.get());
+        callback._completionWaiter.waitForSignal();
+        assertEquals(CallingState.Background,callback._callingState.get());
+        assertTrue(callback._successCalled.get());
+        assertEquals(expectedResult, callback._successResult.get());
         assertEquals(1,mLogger.getLogMessages().size());
         assertTrue(mLogger.hasMessage(expectedLogMessage));
     }

…/serializer/CalendarSerializerTests.java …rosoft/graph/serializer/ISO8601Test.javagraphsdk/src/androidTest/java/com/microsoft/graph/serializer/CalendarSerializerTests.java renamed to graphsdk/src/androidTest/java/com/microsoft/graph/serializer/ISO8601Test.java graphsdk/src/androidTest/java/com/microsoft/graph/serializer/CalendarSerializerTests.java renamed to graphsdk/src/androidTest/java/com/microsoft/graph/serializer/ISO8601Test.java

@@ -1,39 +1,47 @@
 package com.microsoft.graph.serializer;
 
 import android.test.AndroidTestCase;
-import junit.framework.Assert;
+
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 
-
 /**
- * Test cases for {@see CalendarSerializer}
+ * Test cases for the {@see ISO8601} class
  */
-public class CalendarSerializerTests extends AndroidTestCase {
+public class ISO8601Test extends AndroidTestCase {
 
-    public void testCalendarSerialize() throws Exception {
+    /**
+     * Make sure that dates with and without millis can be converted properly into strings
+     * @throws Exception If there is an exception during the test
+     */
+    public void testFromDate() throws Exception {
         TimeZone.setDefault(TimeZone.getTimeZone("PST"));
         final Calendar date = Calendar.getInstance();
         date.setTime(new Date(123456789012345L));
-        Assert.assertEquals("5882-03-11T00:30:12.345Z", CalendarSerializer.serialize(date));
+        assertEquals("5882-03-11T00:30:12.345Z", CalendarSerializer.serialize(date));
 
         final Calendar dateNoMillis = Calendar.getInstance();
         dateNoMillis.setTime(new Date(123456789012000L));
-        Assert.assertEquals("5882-03-11T00:30:12.000Z", CalendarSerializer.serialize(dateNoMillis));
+        assertEquals("5882-03-11T00:30:12.000Z", CalendarSerializer.serialize(dateNoMillis));
     }
 
-    public void testCalendarDeserialize() throws Exception {
+    /**
+     * Make sure that dates in string format with and without millis can be converted properly into date objects
+     * @throws Exception If there is an exception during the test
+     */
+    public void testToDate() throws Exception {
         TimeZone.setDefault(TimeZone.getTimeZone("PST"));
         final long toTheSecondDate = 123456789012000L;
         final Calendar dateToSecond = CalendarSerializer.deserialize("5882-03-11T00:30:12Z");
-        Assert.assertEquals(toTheSecondDate, dateToSecond.getTimeInMillis());
+        assertEquals(toTheSecondDate, dateToSecond.getTimeInMillis());
 
         final long toTheMillisecondDate = 123456789012345L;
         final Calendar dateToTheMillisecond = CalendarSerializer.deserialize("5882-03-11T00:30:12.345Z");
-        Assert.assertEquals(toTheMillisecondDate, dateToTheMillisecond.getTimeInMillis());
+        assertEquals(toTheMillisecondDate, dateToTheMillisecond.getTimeInMillis());
 
         final Calendar dateToTheExtremeMillisecond = CalendarSerializer.deserialize("5882-03-11T00:30:12.3456789Z");
-        Assert.assertEquals(toTheMillisecondDate, dateToTheExtremeMillisecond.getTimeInMillis());
+        assertEquals(toTheMillisecondDate, dateToTheExtremeMillisecond.getTimeInMillis());
     }
+
 }