gnome-shell/tests/testcommon/serviceproviders-test.xml

<?xml version="1.0"?>

<!-- -*- Mode: XML; tab-width: 2; indent-tabs-mode: t; c-basic-offset: 2 -*- -->

<!DOCTYPE serviceproviders SYSTEM "serviceproviders.2.dtd">

<serviceproviders format="2.0">

  <!-- United States -->
  <country code="us">
    <provider>
      <name>AT&amp;T</name>
      <gsm>
	<network-id mcc="310" mnc="038"/>
	<network-id mcc="310" mnc="090"/>
	<network-id mcc="310" mnc="150"/>
      </gsm>
    </provider>
    <provider>
      <name>Verizon</name>
      <gsm>
	<network-id mcc="310" mnc="995"/>
	<network-id mcc="311" mnc="480"/>
      </gsm>
      <cdma>
	<sid value="2"/>
	<sid value="4"/>
	<sid value="5"/>
      </cdma>
    </provider>
  </country>

  <!-- Spain -->
  <country code="es">
    <provider>
      <name>Movistar (Telefónica)</name>
      <gsm>
	<network-id mcc="214" mnc="05"/>
	<network-id mcc="214" mnc="07"/>
      </gsm>
    </provider>
  </country>

</serviceproviders>
mobile-providers: new country-specific type to gather providers shell_mobile_providers_parse() was returning the country information split into a hash table with providers and a hash table with country names. This patch merges both outputs into a single per-country object, so the parse() method now returns a GHashTable with the following element-type: (element-type utf8 ShellCountryMobileProvider>) This also avoids more complex setups like returning lists inside of hash tables, which was actually breaking either g-i or gtk-doc. shell_mobile_providers_parse() was also modified to allow inputting the paths of the country codes and provider list files to use. If paths are not given, the default ones will be used. This helps us to provide test files during unit tests. Both the findProviderForMCCMNC() and findProviderForSid() methods are exported out of the GSM and CDMA specific classes, and new unit tests for them are implemented. Tests can be run manually with: $> ./tests/run-test.sh tests/unit/mobileProviders.js https://bugzilla.gnome.org/show_bug.cgi?id=687356. 2012-11-01 12:52:09 -04:00			`<?xml version="1.0"?>`

			`<!-- -- Mode: XML; tab-width: 2; indent-tabs-mode: t; c-basic-offset: 2 -- -->`

			`<!DOCTYPE serviceproviders SYSTEM "serviceproviders.2.dtd">`

			`<serviceproviders format="2.0">`

			`<!-- United States -->`
			`<country code="us">`
			`<provider>`
			`<name>AT&T</name>`
			`<gsm>`
			`<network-id mcc="310" mnc="038"/>`
			`<network-id mcc="310" mnc="090"/>`
			`<network-id mcc="310" mnc="150"/>`
			`</gsm>`
			`</provider>`
			`<provider>`
			`<name>Verizon</name>`
			`<gsm>`
			`<network-id mcc="310" mnc="995"/>`
			`<network-id mcc="311" mnc="480"/>`
			`</gsm>`
			`<cdma>`
			`<sid value="2"/>`
			`<sid value="4"/>`
			`<sid value="5"/>`
			`</cdma>`
			`</provider>`
			`</country>`

			`<!-- Spain -->`
			`<country code="es">`
			`<provider>`
			`<name>Movistar (Telefónica)</name>`
			`<gsm>`
			`<network-id mcc="214" mnc="05"/>`
			`<network-id mcc="214" mnc="07"/>`
			`</gsm>`
			`</provider>`
			`</country>`

			`</serviceproviders>`