From 2ee4a4846edaf8275dd0f8bc013b594facdb05d2 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Tue, 11 Sep 2018 12:52:45 -0700
Subject: [PATCH] Move ShadowXmlUtils to settingslib

Test: robotests
Change-Id: Iadea11ff207cab90a9803cb88d76b7b00b4a03df
---
 tests/robotests/config/robolectric.properties |  3 +-
 .../testutils/shadow/ShadowXmlUtils.java      | 28 -------------------
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowXmlUtils.java

diff --git a/tests/robotests/config/robolectric.properties b/tests/robotests/config/robolectric.properties
index 717f20d8fb6..aae277902fb 100644
--- a/tests/robotests/config/robolectric.properties
+++ b/tests/robotests/config/robolectric.properties
@@ -1,5 +1,6 @@
 manifest=packages/apps/Settings/AndroidManifest.xml
 sdk=NEWEST_SDK
+
 shadows=\
    com.android.settings.testutils.shadow.ShadowThreadUtils,\
-   com.android.settings.testutils.shadow.ShadowXmlUtils
\ No newline at end of file
+   com.android.settingslib.testutils.shadow.ShadowXmlUtils
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowXmlUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowXmlUtils.java
deleted file mode 100644
index c2864e5f984..00000000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowXmlUtils.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.android.settings.testutils.shadow;
-
-import static org.robolectric.shadow.api.Shadow.directlyOn;
-
-import com.android.internal.util.XmlUtils;
-
-import org.robolectric.Robolectric;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.util.ReflectionHelpers;
-import org.robolectric.util.ReflectionHelpers.ClassParameter;
-
-@Implements(XmlUtils.class)
-public class ShadowXmlUtils {
-
-    @Implementation
-    public static final int convertValueToInt(CharSequence charSeq, int defaultValue) {
-        final Class<?> xmlUtilsClass = ReflectionHelpers.loadClass(
-                Robolectric.class.getClassLoader(), "com.android.internal.util.XmlUtils");
-        try {
-            return directlyOn(xmlUtilsClass, "convertValueToInt",
-                    ClassParameter.from(CharSequence.class, charSeq),
-                    ClassParameter.from(int.class, new Integer(defaultValue)));
-        } catch (NumberFormatException e) {
-            return defaultValue;
-        }
-    }
-}