diff options
| author | Marja Hassinen <ext-marja.2.hassinen@nokia.com> | 2009-11-24 14:08:48 +0200 |
|---|---|---|
| committer | Jani Lehmuskoski <ext-jani.i.lehmuskoski@nokia.com> | 2009-12-08 18:42:43 +0200 |
| commit | 8e2c9f447b84fad42a4fcd3c6db35c6b900078cc (patch) | |
| tree | 43ccee7e19e0b4ea3bf0852e39a99881d44a8106 | |
| parent | 60ec0e0e50dbea29f8de9b08de7fb96726cc746e (diff) | |
context-ls modifications:
Sort the keys
Print out new type names (+customer test updated)
Long listing: Print out key names and types even if keys aren't provided
| -rw-r--r-- | libcontextsubscriber/cls/context-ls.cpp | 11 | ||||
| -rwxr-xr-x | libcontextsubscriber/customer-tests/registry/registry.py | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/libcontextsubscriber/cls/context-ls.cpp b/libcontextsubscriber/cls/context-ls.cpp index 58026b99..69ad5776 100644 --- a/libcontextsubscriber/cls/context-ls.cpp +++ b/libcontextsubscriber/cls/context-ls.cpp @@ -45,7 +45,8 @@ int main(int argc, char **argv) ContextRegistryInfo *regInfo = ContextRegistryInfo::instance(backendName); QStringList keys = regInfo->listKeys(); - + keys.sort(); + QRegExp rx(filter, Qt::CaseSensitive, QRegExp::Wildcard); QTextStream out(stdout); foreach (QString key, keys) { @@ -55,9 +56,13 @@ int main(int argc, char **argv) if (provided && !info.provided()) continue; if (longListing) { + // Print the key and the type even if we don't have providers + if (info.providers().size() == 0) + out << key << "\t" << info.typeInfo().name() << endl; + for (int i = 0; i < info.providers().size(); i++ ) - out << key << "\t" << info.type() << "\t" << info.providers()[i].plugin << "\t" - << info.providers()[i].constructionString << "\n"; + out << key << "\t" << info.typeInfo().name() << "\t" << info.providers()[i].plugin << "\t" + << info.providers()[i].constructionString << endl; } else out << key << "\n"; if (doc) { diff --git a/libcontextsubscriber/customer-tests/registry/registry.py b/libcontextsubscriber/customer-tests/registry/registry.py index 0511a7ce..32a193c1 100755 --- a/libcontextsubscriber/customer-tests/registry/registry.py +++ b/libcontextsubscriber/customer-tests/registry/registry.py @@ -60,10 +60,10 @@ class PrintingProperties(unittest.TestCase): "context-provide.context couldn't been written by context-provide") info_client = CLTool("context-ls","-l","-d","test.*") - self.assert_(info_client.expect(["^test.int\tINT\tcontextkit-dbus\tsession:com.nokia.test$", - "^test.double\tDOUBLE\tcontextkit-dbus\tsession:com.nokia.test$", - "^test.truth\tTRUTH\tcontextkit-dbus\tsession:com.nokia.test$", - "^test.string\tSTRING\tcontextkit-dbus\tsession:com.nokia.test$", + self.assert_(info_client.expect(["^test.int\tinteger\tcontextkit-dbus\tsession:com.nokia.test$", + "^test.double\tnumber\tcontextkit-dbus\tsession:com.nokia.test$", + "^test.truth\tbool\tcontextkit-dbus\tsession:com.nokia.test$", + "^test.string\tstring\tcontextkit-dbus\tsession:com.nokia.test$", "^Documentation: A phony but very flexible property.$"]), "Bad introspection result from context-ls") |