From eb8ef01791f3c35e28dcbd53f9352f0f81a6d361 Mon Sep 17 00:00:00 2001 From: Jonathan Basseri Date: Mon, 22 Jun 2015 20:15:19 -0700 Subject: More thorough XML testing. Include vendor.xml in unit tests. Note that changing the build target with lunch can switch your vendor.xml. Update DefaultCarrierConfigService#readConfigFromXml to throw errors instead of returning an empty bundle. This makes failed test output much better. Add a test to check that every variable in XML files matches a KEY in CarrierConfigManager. Increase detail of error messages with XmlPullParser#getPositionDescription Bug: 21619172 Change-Id: I500f4b2476a6fe4fdd6ae0232e293a0f1d82b7b0 --- .../android/carrierconfig/CarrierConfigTest.java | 86 +++++++++++++++++++++- 1 file changed, 83 insertions(+), 3 deletions(-) (limited to 'tests/src/com') diff --git a/tests/src/com/android/carrierconfig/CarrierConfigTest.java b/tests/src/com/android/carrierconfig/CarrierConfigTest.java index 5a29ea1..58802f3 100644 --- a/tests/src/com/android/carrierconfig/CarrierConfigTest.java +++ b/tests/src/com/android/carrierconfig/CarrierConfigTest.java @@ -2,13 +2,19 @@ package com.android.carrierconfig; import android.content.Context; import android.content.res.AssetManager; +import android.content.res.Resources; import android.os.PersistableBundle; import android.service.carrier.CarrierIdentifier; +import android.telephony.CarrierConfigManager; import android.test.InstrumentationTestCase; import android.util.Log; import java.io.IOException; import java.io.InputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.HashSet; +import java.util.Set; import junit.framework.AssertionFailedError; @@ -27,7 +33,6 @@ public class CarrierConfigTest extends InstrumentationTestCase { PersistableBundle b = DefaultCarrierConfigService.readConfigFromXml(parser, new CarrierIdentifier("001", "001", "Test", "", "", "")); assertNotNull("got null bundle", b); - assertTrue("got empty bundle", b.size() > 0); } }); } @@ -41,7 +46,8 @@ public class CarrierConfigTest extends InstrumentationTestCase { public void check(XmlPullParser parser) throws XmlPullParserException, IOException { int event; while (((event = parser.next()) != XmlPullParser.END_DOCUMENT)) { - if (event == XmlPullParser.START_TAG && "carrier_config".equals(parser.getName())) { + if (event == XmlPullParser.START_TAG + && "carrier_config".equals(parser.getName())) { for (int i = 0; i < parser.getAttributeCount(); ++i) { String attribute = parser.getAttributeName(i); switch (attribute) { @@ -53,7 +59,8 @@ public class CarrierConfigTest extends InstrumentationTestCase { case "device": break; default: - fail("Unknown attribute '" + attribute + "'"); + fail("Unknown attribute '" + attribute + + "' at " + parser.getPositionDescription()); break; } } @@ -63,6 +70,48 @@ public class CarrierConfigTest extends InstrumentationTestCase { }); } + /** + * Tests that the variable names in each XML file match actual keys in CarrierConfigManager. + */ + public void testVariableNames() { + final Set varXmlNames = getCarrierConfigXmlNames(); + // organize them into sets by type or unknown + forEachConfigXml(new ParserChecker() { + public void check(XmlPullParser parser) throws XmlPullParserException, IOException { + int event; + while (((event = parser.next()) != XmlPullParser.END_DOCUMENT)) { + if (event == XmlPullParser.START_TAG) { + switch (parser.getName()) { + case "int": + case "boolean": + case "string": + case "int-array": + case "string-array": + // NOTE: This doesn't check for other valid Bundle values, but it + // is limited to the key types in CarrierConfigManager. + final String varName = parser.getAttributeValue(null, "name"); + assertNotNull("No 'name' attribute: " + + parser.getPositionDescription(), varName); + assertTrue("Unknown variable: '" + varName + + "' at " + parser.getPositionDescription(), + varXmlNames.contains(varName)); + // TODO: Check that the type is correct. + break; + case "carrier_config_list": + case "carrier_config": + // do nothing + break; + default: + fail("unexpected tag: '" + parser.getName() + + "' at " + parser.getPositionDescription()); + break; + } + } + } + } + }); + } + /** * Utility for iterating over each XML document in the assets folder. * @@ -96,8 +145,39 @@ public class CarrierConfigTest extends InstrumentationTestCase { throw new AssertionError("Problem in " + fileName + ": " + e.getMessage(), e); } } + // Check vendor.xml too + try { + Resources res = getInstrumentation().getTargetContext().getResources(); + checker.check(res.getXml(R.xml.vendor)); + } catch (Throwable e) { + throw new AssertionError("Problem in vendor.xml: " + e.getMessage(), e); + } } catch (IOException e) { fail(e.toString()); } } + + /** + * Get the set of config variable names, as used in XML files. + */ + private Set getCarrierConfigXmlNames() { + // get values of all KEY_ members of CarrierConfigManager + Field[] fields = CarrierConfigManager.class.getDeclaredFields(); + HashSet varXmlNames = new HashSet<>(); + for (Field f : fields) { + if (!f.getName().startsWith("KEY_")) continue; + if ((f.getModifiers() & Modifier.STATIC) == 0) { + fail("non-static key in CarrierConfigManager: " + f.toString()); + } + try { + String value = (String) f.get(null); + varXmlNames.add(value); + } + catch (IllegalAccessException e) { + throw new AssertionError("Failed to get config key: " + e.getMessage(), e); + } + } + assertTrue("Found zero keys", varXmlNames.size() > 0); + return varXmlNames; + } } -- cgit v1.2.3