Merge branch 'master' of personal.github.com:BBVA/kapow

internal/server/control/control.go

@@ -38,12 +38,12 @@ func removeRoute(http.ResponseWriter, *http.Request) {
 	}
 }
 
-// user.Routes.Snapshot() []model.Route
+// user.Routes.List() []model.Route
-var funcSnapshot func() []model.Route = user.Routes.Snapshot
+var funcList func() []model.Route = user.Routes.List
 
 func listRoutes(http.ResponseWriter, *http.Request) {
 
-	funcSnapshot()
+	funcList()
 
 }
 

internal/server/user/state/state.go

@@ -35,3 +35,11 @@ func (srl *safeRouteList) Snapshot() []model.Route {
 	copy(rs, srl.rs)
 	return rs
 }
+
+func (srl *safeRouteList) List() []model.Route {
+	rs := srl.Snapshot()
+	for i := 0; i < len(rs); i++ {
+		rs[i].Index = i
+	}
+	return rs
+}

internal/server/user/state/state_test.go

@@ -165,3 +165,28 @@ func TestAppendReturnsTheInsertedRoutedWithTheActualIndexWhenPopulated(t *testin
 		t.Errorf("Index of the returned route is not the last one, i.e., 41, but %d", r.Index)
 	}
 }
+
+func TestListReturnsTheSameNumberOfRoutesThanSnapshot(t *testing.T) {
+	srl := New()
+	srl.Append(model.Route{ID: "FOO"})
+
+	if len(srl.List()) != len(srl.Snapshot()) {
+		t.Error("The number of routes returned is not correct")
+	}
+}
+
+func TestListReturnsANumberedListOfRoutes(t *testing.T) {
+	srl := New()
+
+	for i := 0; i < 42; i++ {
+		srl.Append(model.Route{})
+	}
+
+	l := srl.List()
+
+	for i, r := range l {
+		if i != r.Index {
+			t.Fatalf("Route is correctly numbered. Got %v, expected %v", r.Index, i)
+		}
+	}
+}