Merge "Fix SettingsDumpServiceTest" into udc-dev

tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java

@@ -29,8 +29,6 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 
-import androidx.annotation.NonNull;
-
 import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService;
 
 import org.json.JSONException;
@@ -43,8 +41,8 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-import java.io.OutputStream;
 import java.io.PrintWriter;
+import java.io.StringWriter;
 
 @RunWith(RobolectricTestRunner.class)
 public class SettingsDumpServiceTest {
@@ -102,15 +100,16 @@ public class SettingsDumpServiceTest {
     }
 
     @Test
-    public void testDump_ReturnJsonObject() throws JSONException {
+    public void testDump_printServiceAsKey() {
         mResolveInfo.activityInfo = new ActivityInfo();
         mResolveInfo.activityInfo.packageName = PACKAGE_BROWSER;
-        TestPrintWriter printWriter = new TestPrintWriter(System.out);
+        StringWriter stringWriter = new StringWriter();
+        PrintWriter printWriter = new PrintWriter(stringWriter);
 
         mTestService.dump(null, printWriter, null);
-        JSONObject object = (JSONObject) printWriter.getPrintObject();
 
-        assertThat(object.get(TestService.KEY_SERVICE)).isNotNull();
+        assertThat(stringWriter.toString())
+                .contains("{\"" + SettingsDumpService.KEY_SERVICE + "\":");
     }
 
     /**
@@ -128,24 +127,4 @@ public class SettingsDumpServiceTest {
             return mPm;
         }
     }
-
-    /**
-     * Test printWriter to store the object to be printed
-     */
-    private class TestPrintWriter extends PrintWriter {
-        private Object mPrintObject;
-
-        private TestPrintWriter(@NonNull OutputStream out) {
-            super(out);
-        }
-
-        @Override
-        public void println(Object object) {
-            mPrintObject = object;
-        }
-
-        private Object getPrintObject() {
-            return mPrintObject;
-        }
-    }
 }