Merge lp:~kyrofa/unity-scope-snappy/finish_dbus_client_testing into lp:~unity-api-team/unity-scope-snappy/trunk

[Kyle Fazzari]

Finish testing dbus client in store scope.

Finish testing dbus client in store scope.

Now everything has 100% test coverage.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/132/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/86
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/86/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/86

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/132/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/134/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/88

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/134/rebuild

review: Approve (continuous-integration)

[lp:~kyrofa/unity-scope-snappy/finish_dbus_client_testing]

36. By Kyle Fazzari on 2015-07-29

Merge prerequisite changes from lp:~kyrofa/unity-scope-snappy/update_godbus_testability.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/135/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/89
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/89/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/89

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/135/rebuild

review: Approve (continuous-integration)

[lp:~kyrofa/unity-scope-snappy/finish_dbus_client_testing]

37. By Kyle Fazzari on 2015-07-30

Merge prerequisite changes from lp:~kyrofa/unity-scope-snappy/update_godbus_testability

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:37
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/137/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/91
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/91/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/91

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/137/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

Copyright headers in source files please.

[lp:~kyrofa/unity-scope-snappy/finish_dbus_client_testing]

38. By Kyle Fazzari on 2015-08-12

Add copyright file headers to new files.

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:38
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/139/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/96/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/93/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/93/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/139/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:38
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/140/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/94
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/94/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/94

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/140/rebuild

review: Approve (continuous-integration)

=== added file 'store/packages/dbus_connection.go'
--- store/packages/dbus_connection.go	1970-01-01 00:00:00 +0000
+++ store/packages/dbus_connection.go	2015-08-12 19:46:23 +0000
@@ -0,0 +1,30 @@
+/* Copyright (C) 2015 Canonical Ltd.
+ *
+ * This file is part of unity-scope-snappy.
+ *
+ * unity-scope-snappy is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * unity-scope-snappy is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * unity-scope-snappy. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package packages
+
+import (
+	"launchpad.net/unity-scope-snappy/internal/github.com/godbus/dbus"
+)
+
+// DbusConnection is an interface of the DBus connection used by the DBus
+// package manager client.
+type DbusConnection interface {
+	Names() []string
+	Object(dest string, path dbus.ObjectPath) dbus.BusObject
+}

=== modified file 'store/packages/dbus_manager_client.go'
--- store/packages/dbus_manager_client.go	2015-06-30 19:59:02 +0000
+++ store/packages/dbus_manager_client.go	2015-08-12 19:46:23 +0000
@@ -15,7 +15,7 @@
 // DbusManagerClient is a DBus client for communicating with the WebDM Package
 // Manager DBus service.
 type DbusManagerClient struct {
-	connection *dbus.Conn // Connection to the dbus bus
+	connection DbusConnection // Connection to the dbus bus
 
 	dbusObject          string
 	dbusObjectInterface string

=== modified file 'store/packages/dbus_manager_client_test.go'
--- store/packages/dbus_manager_client_test.go	2015-06-30 18:32:04 +0000
+++ store/packages/dbus_manager_client_test.go	2015-08-12 19:46:23 +0000
@@ -1,6 +1,8 @@
 package packages
 
 import (
+	"launchpad.net/unity-scope-snappy/store/packages/fakes"
+	"launchpad.net/unity-scope-snappy/store/packages/mocks"
 	"testing"
 )
 
@@ -34,6 +36,34 @@
 	}
 }
 
+// Test typical Install usage.
+func TestDbusManagerClient_install(t *testing.T) {
+	client := NewDbusManagerClient()
+	mockObject := &mocks.MockBusObject{}
+	client.connection = fakes.FakeDbusConnection{mockObject}
+
+	_, err := client.Install("foo")
+	if err != nil {
+		t.Errorf("Unexpected error installing: %s", err)
+	}
+
+	if !mockObject.CallCalled {
+		t.Errorf("Expected client to call MockBusObject.Call")
+	}
+
+	if mockObject.Method != client.installMethod {
+		t.Errorf(`Client called method "%s", expected "%s"`, mockObject.Method, client.installMethod)
+	}
+
+	if len(mockObject.Args) != 1 {
+		t.Fatalf("Got %d arguments, expected 1", len(mockObject.Args))
+	}
+
+	if mockObject.Args[0] != "foo" {
+		t.Error(`Install was called with "%s", expected "foo"`, mockObject.Args[0])
+	}
+}
+
 // Test that trying to install before connecting results in an error.
 func TestDbusManagerClient_install_beforeConnect(t *testing.T) {
 	client := NewDbusManagerClient()
@@ -43,6 +73,34 @@
 	}
 }
 
+// Test typical Uninstall usage.
+func TestDbusManagerClient_uninstall(t *testing.T) {
+	client := NewDbusManagerClient()
+	mockObject := &mocks.MockBusObject{}
+	client.connection = fakes.FakeDbusConnection{mockObject}
+
+	_, err := client.Uninstall("foo")
+	if err != nil {
+		t.Errorf("Unexpected error installing: %s", err)
+	}
+
+	if !mockObject.CallCalled {
+		t.Errorf("Expected client to call MockBusObject.Call")
+	}
+
+	if mockObject.Method != client.uninstallMethod {
+		t.Errorf(`Client called method "%s", expected "%s"`, mockObject.Method, client.uninstallMethod)
+	}
+
+	if len(mockObject.Args) != 1 {
+		t.Fatalf("Got %d arguments, expected 1", len(mockObject.Args))
+	}
+
+	if mockObject.Args[0] != "foo" {
+		t.Error(`Uninstall was called with "%s", expected "foo"`, mockObject.Args[0])
+	}
+}
+
 // Test that trying to uninstall before connecting results in an error.
 func TestDbusManagerClient_uninstall_beforeConnect(t *testing.T) {
 	client := NewDbusManagerClient()

=== added file 'store/packages/fakes/fake_dbus_connection.go'
--- store/packages/fakes/fake_dbus_connection.go	1970-01-01 00:00:00 +0000
+++ store/packages/fakes/fake_dbus_connection.go	2015-08-12 19:46:23 +0000
@@ -0,0 +1,37 @@
+/* Copyright (C) 2015 Canonical Ltd.
+ *
+ * This file is part of unity-scope-snappy.
+ *
+ * unity-scope-snappy is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * unity-scope-snappy is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * unity-scope-snappy. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package fakes
+
+import (
+	"launchpad.net/unity-scope-snappy/internal/github.com/godbus/dbus"
+)
+
+// DbusConnection is an interface of the DBus connection used by the DBus
+// package manager client.
+type FakeDbusConnection struct {
+	DbusObject dbus.BusObject
+}
+
+func (fake FakeDbusConnection) Names() []string {
+	return []string{":1.42"}
+}
+
+func (fake FakeDbusConnection) Object(dest string, path dbus.ObjectPath) dbus.BusObject {
+	return fake.DbusObject
+}

=== added file 'store/packages/fakes/fake_dbus_connection_test.go'
--- store/packages/fakes/fake_dbus_connection_test.go	1970-01-01 00:00:00 +0000
+++ store/packages/fakes/fake_dbus_connection_test.go	2015-08-12 19:46:23 +0000
@@ -0,0 +1,45 @@
+/* Copyright (C) 2015 Canonical Ltd.
+ *
+ * This file is part of unity-scope-snappy.
+ *
+ * unity-scope-snappy is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * unity-scope-snappy is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * unity-scope-snappy. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package fakes
+
+import (
+	"launchpad.net/unity-scope-snappy/store/packages/mocks"
+	"reflect"
+	"testing"
+)
+
+// Test that Names returns a single name
+func TestFakeDbusConnection_names(t *testing.T) {
+	connection := FakeDbusConnection{}
+
+	names := connection.Names()
+	if len(names) != 1 {
+		t.Fatalf("Got %d names, expected 1", len(names))
+	}
+}
+
+// Test that Object simply returns the given DbusObject.
+func TestFakeDbusConnection_object(t *testing.T) {
+	mock := &mocks.MockBusObject{}
+	connection := FakeDbusConnection{mock}
+
+	if !reflect.DeepEqual(connection.Object("foo", "bar"), mock) {
+		t.Error("Expected the fake connection to return the given mock")
+	}
+}

=== added directory 'store/packages/mocks'
=== added file 'store/packages/mocks/mock_bus_object.go'
--- store/packages/mocks/mock_bus_object.go	1970-01-01 00:00:00 +0000
+++ store/packages/mocks/mock_bus_object.go	2015-08-12 19:46:23 +0000
@@ -0,0 +1,65 @@
+/* Copyright (C) 2015 Canonical Ltd.
+ *
+ * This file is part of unity-scope-snappy.
+ *
+ * unity-scope-snappy is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * unity-scope-snappy is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * unity-scope-snappy. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package mocks
+
+import (
+	"launchpad.net/unity-scope-snappy/internal/github.com/godbus/dbus"
+)
+
+// MockBusObject is a mocked implementation of the dbus.BusObject interface, for
+// use within tests.
+type MockBusObject struct {
+	CallCalled bool
+	GoCalled bool
+	GetPropertyCalled bool
+	DestinationCalled bool
+	PathCalled bool
+
+	Method string
+	Args []interface{}
+}
+
+func (mock *MockBusObject) Call(method string, flags dbus.Flags, args ...interface{}) *dbus.Call {
+	mock.CallCalled = true
+	mock.Method = method
+	mock.Args = args
+	return &dbus.Call{Body: []interface{}{dbus.ObjectPath("/foo/1")}}
+}
+
+func (mock *MockBusObject) Go(method string, flags dbus.Flags, ch chan *dbus.Call, args ...interface{}) *dbus.Call {
+	mock.GoCalled = true
+	mock.Method = method
+	mock.Args = args
+	return &dbus.Call{Body: []interface{}{dbus.ObjectPath("/foo/1")}}
+}
+
+func (mock *MockBusObject) GetProperty(p string) (dbus.Variant, error) {
+	mock.GetPropertyCalled = true
+	return dbus.MakeVariant("foo"), nil
+}
+
+func (mock *MockBusObject) Destination() string {
+	mock.DestinationCalled = true
+	return "foo"
+}
+
+func (mock *MockBusObject) Path() dbus.ObjectPath {
+	mock.PathCalled = true
+	return dbus.ObjectPath("/foo/1")
+}

=== modified file 'test_coverage.sh'
--- test_coverage.sh	2015-07-15 16:34:50 +0000
+++ test_coverage.sh	2015-08-12 19:46:23 +0000
@@ -63,8 +63,6 @@
 
 get_coverages $coverage_final $@
 
-echo "Cov type: $coverage_type"
-
 if [ "$coverage_type" == "xml" ]; then
 	gocov convert $coverage_final | gocov-xml > coverage.xml
 elif [ "$coverage_type" == "html" ]; then