From d6baf8bbe2ba7961401aa25345f663c8e88df562 Mon Sep 17 00:00:00 2001
From: Victor Vieux <vieux@docker.com>
Date: Sat, 13 Dec 2014 01:18:23 +0000
Subject: [PATCH] add a few tests

Signed-off-by: Victor Vieux <vieux@docker.com>
---
 discovery/discovery.go        |  5 +++--
 discovery/etcd/etcd_test.go   | 16 ++++++++++++++++
 discovery/file/file.go        |  3 +--
 discovery/file/file_test.go   | 18 ++++++++++++++++++
 discovery/token/token_test.go |  4 ++--
 5 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 discovery/etcd/etcd_test.go
 create mode 100644 discovery/file/file_test.go

diff --git a/discovery/discovery.go b/discovery/discovery.go
index 84d339a3a3..60c225cdf0 100644
--- a/discovery/discovery.go
+++ b/discovery/discovery.go
@@ -34,8 +34,9 @@ type DiscoveryService interface {
 }
 
 var (
-	discoveries     map[string]func() DiscoveryService
-	ErrNotSupported = errors.New("discovery service not supported")
+	discoveries       map[string]func() DiscoveryService
+	ErrNotSupported   = errors.New("discovery service not supported")
+	ErrNotImplemented = errors.New("not implemented in this discovery service")
 )
 
 func init() {
diff --git a/discovery/etcd/etcd_test.go b/discovery/etcd/etcd_test.go
new file mode 100644
index 0000000000..2088890a63
--- /dev/null
+++ b/discovery/etcd/etcd_test.go
@@ -0,0 +1,16 @@
+package etcd
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestInitialize(t *testing.T) {
+	discovery := &EtcdDiscoveryService{}
+	assert.Error(t, discovery.Initialize("127.0.0.1/path", 0))
+	assert.Equal(t, discovery.path, "/path/")
+
+	assert.Error(t, discovery.Initialize("127.0.0.1,127.0.0.2,127.0.0.3/path", 0))
+	assert.Equal(t, discovery.path, "/path/")
+}
diff --git a/discovery/file/file.go b/discovery/file/file.go
index 39ac7af32b..ec9b90ca2a 100644
--- a/discovery/file/file.go
+++ b/discovery/file/file.go
@@ -1,7 +1,6 @@
 package file
 
 import (
-	"errors"
 	"io/ioutil"
 	"strings"
 	"time"
@@ -54,5 +53,5 @@ func (s *FileDiscoveryService) Watch(callback discovery.WatchCallback) {
 }
 
 func (s *FileDiscoveryService) Register(addr string) error {
-	return errors.New("unimplemented")
+	return discovery.ErrNotImplemented
 }
diff --git a/discovery/file/file_test.go b/discovery/file/file_test.go
new file mode 100644
index 0000000000..366e34f9fe
--- /dev/null
+++ b/discovery/file/file_test.go
@@ -0,0 +1,18 @@
+package file
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestInitialize(t *testing.T) {
+	discovery := &FileDiscoveryService{}
+	discovery.Initialize("/path/to/file", 0)
+	assert.Equal(t, discovery.path, "/path/to/file")
+}
+
+func TestRegister(t *testing.T) {
+	discovery := &FileDiscoveryService{path: "/path/to/file"}
+	assert.Error(t, discovery.Register("0.0.0.0"))
+}
diff --git a/discovery/token/token_test.go b/discovery/token/token_test.go
index c5d49ec6c6..9a6a7d7e3c 100644
--- a/discovery/token/token_test.go
+++ b/discovery/token/token_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestInit(t *testing.T) {
+func TestInitialize(t *testing.T) {
 	discovery := &TokenDiscoveryService{}
 	discovery.Initialize("token", 0)
 	assert.Equal(t, discovery.token, "token")
@@ -18,7 +18,7 @@ func TestInit(t *testing.T) {
 }
 
 func TestRegister(t *testing.T) {
-	discovery := TokenDiscoveryService{token: "TEST_TOKEN", url: DISCOVERY_URL}
+	discovery := &TokenDiscoveryService{token: "TEST_TOKEN", url: DISCOVERY_URL}
 	expected := "127.0.0.1:2675"
 	assert.NoError(t, discovery.Register(expected))