From 6656aec9ad263511a8ceffed8e8b2cd60e0f810e Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 20 Aug 2010 11:53:32 +0200
Subject: test: Fix test scripts for new operator interfaces

---
 Makefile.am             |  2 ++
 test/get-operators      | 37 +++++++++++++++++++++++++++++++++++++
 test/propose-scan       | 40 ----------------------------------------
 test/scan-for-operators | 38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 77 insertions(+), 40 deletions(-)
 create mode 100755 test/get-operators
 delete mode 100755 test/propose-scan
 create mode 100755 test/scan-for-operators

diff --git a/Makefile.am b/Makefile.am
index fa0a0d99..368284c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -321,6 +321,8 @@ test_scripts = test/activate-context \
 		test/list-contexts \
 		test/list-modems \
 		test/list-operators \
+		test/scan-for-operators \
+		test/get-operators\
 		test/monitor-ofono \
 		test/process-context-settings \
 		test/receive-sms \
diff --git a/test/get-operators b/test/get-operators
new file mode 100755
index 00000000..2351db05
--- /dev/null
+++ b/test/get-operators
@@ -0,0 +1,37 @@
+#!/usr/bin/python
+
+import dbus
+import sys
+
+bus = dbus.SystemBus()
+
+if len(sys.argv) == 2:
+	path = sys.argv[1]
+else:
+	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+			'org.ofono.Manager')
+	properties = manager.GetProperties()
+	path = properties["Modems"][0]
+
+netreg = dbus.Interface(bus.get_object('org.ofono', path),
+				'org.ofono.NetworkRegistration')
+
+operators = netreg.GetOperators()
+
+for entry in operators:
+	path = entry[0]
+	properties = entry[1]
+
+	print "[ %s ]" % (path)
+
+	for key in properties.keys():
+		if key in ["Technologies"]:
+			val = ""
+			for i in properties[key]:
+				val += i + " "
+		else:
+			val = str(properties[key])
+		print "    %s = %s" % (key, val)
+	
+	print
+
diff --git a/test/propose-scan b/test/propose-scan
deleted file mode 100755
index c35618d3..00000000
--- a/test/propose-scan
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/python
-
-import dbus
-import sys
-
-bus = dbus.SystemBus()
-
-if len(sys.argv) == 2:
-	path = sys.argv[1]
-else:
-	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
-			'org.ofono.Manager')
-	properties = manager.GetProperties()
-	path = properties["Modems"][0]
-
-print "Propose scanning for modem %s..." % path
-netreg = dbus.Interface(bus.get_object('org.ofono', path),
-				'org.ofono.NetworkRegistration')
-
-operators = netreg.ProposeScan(timeout=100);
-
-for path in operators:
-	operator = dbus.Interface(bus.get_object('org.ofono', path),
-					'org.ofono.NetworkOperator')
-
-	properties = operator.GetProperties()
-
-	print "[ %s ]" % (path)
-
-	for key in properties.keys():
-		if key in ["Technologies"]:
-			val = ""
-			for i in properties[key]:
-				val += i + " "
-		else:
-			val = str(properties[key])
-		print "    %s = %s" % (key, val)
-	
-	print
-
diff --git a/test/scan-for-operators b/test/scan-for-operators
new file mode 100755
index 00000000..3206f8f0
--- /dev/null
+++ b/test/scan-for-operators
@@ -0,0 +1,38 @@
+#!/usr/bin/python
+
+import dbus
+import sys
+
+bus = dbus.SystemBus()
+
+if len(sys.argv) == 2:
+	path = sys.argv[1]
+else:
+	manager = dbus.Interface(bus.get_object('org.ofono', '/'),
+			'org.ofono.Manager')
+	properties = manager.GetProperties()
+	path = properties["Modems"][0]
+
+print "Propose scanning for modem %s..." % path
+netreg = dbus.Interface(bus.get_object('org.ofono', path),
+				'org.ofono.NetworkRegistration')
+
+operators = netreg.Scan(timeout=100);
+
+for entry in operators:
+	path = entry[0]
+	properties = entry[1]
+
+	print "[ %s ]" % (path)
+
+	for key in properties.keys():
+		if key in ["Technologies"]:
+			val = ""
+			for i in properties[key]:
+				val += i + " "
+		else:
+			val = str(properties[key])
+		print "    %s = %s" % (key, val)
+	
+	print
+
-- 
cgit v1.2.3