Improve API

1 files changed, 37 insertions, 20 deletions

diff --git a/model/user_test.go b/model/user_test.go
index 769696f..ac075a8 100644
--- a/model/user_test.go
+++ b/model/user_test.go
@@ -35,42 +35,59 @@ func TestValidateUserCreation(t *testing.T) {
 
 func TestValidateUserModification(t *testing.T) {
 	user := &User{}
-	if err := user.ValidateUserModification(); err == nil {
-		t.Error(`An empty user should generate an error`)
+	if err := user.ValidateUserModification(); err != nil {
+		t.Error(`There is no changes, so we should not have an error`)
 	}
 
-	user = &User{ID: 42, Username: "test", Password: "", Theme: "default"}
+	user = &User{Theme: "default"}
 	if err := user.ValidateUserModification(); err != nil {
-		t.Error(`User without password should not generate an error`)
+		t.Error(`A valid theme should not generate any errors`)
 	}
 
-	user = &User{ID: 42, Username: "test", Password: "a", Theme: "default"}
+	user = &User{Theme: "invalid theme"}
 	if err := user.ValidateUserModification(); err == nil {
-		t.Error(`Passwords shorter than 6 characters should generate an error`)
+		t.Error(`An invalid theme should generate an error`)
 	}
 
-	user = &User{ID: 42, Username: "", Password: "secret", Theme: "default"}
-	if err := user.ValidateUserModification(); err == nil {
-		t.Error(`An empty username should generate an error`)
+	user = &User{Password: "test123"}
+	if err := user.ValidateUserModification(); err != nil {
+		t.Error(`A valid password should not generate any errors`)
 	}
 
-	user = &User{ID: -1, Username: "test", Password: "secret", Theme: "default"}
+	user = &User{Password: "a"}
 	if err := user.ValidateUserModification(); err == nil {
-		t.Error(`An invalid userID should generate an error`)
+		t.Error(`An invalid password should generate an error`)
 	}
+}
 
-	user = &User{ID: 0, Username: "test", Password: "secret", Theme: "default"}
-	if err := user.ValidateUserModification(); err == nil {
-		t.Error(`An invalid userID should generate an error`)
+func TestMergeUsername(t *testing.T) {
+	user1 := &User{ID: 42, Username: "user1", Password: "secret", Theme: "default"}
+	user2 := &User{ID: 42, Username: "user2"}
+	user1.Merge(user2)
+
+	if user1.Username != "user2" {
+		t.Fatal(`The username should be merged into user1`)
 	}
 
-	user = &User{ID: 42, Username: "test", Password: "secret", Theme: "invalid"}
-	if err := user.ValidateUserModification(); err == nil {
-		t.Error(`An invalid theme should generate an error`)
+	if user1.Theme != "default" {
+		t.Fatal(`The theme should not be merged into user1`)
 	}
+}
 
-	user = &User{ID: 42, Username: "test", Password: "secret", Theme: "default"}
-	if err := user.ValidateUserModification(); err != nil {
-		t.Error(`A valid user should not generate any error`)
+func TestMergeIsAdmin(t *testing.T) {
+	user1 := &User{ID: 42, Username: "user1", Password: "secret", Theme: "default"}
+	user2 := &User{ID: 42, IsAdmin: true}
+	user1.Merge(user2)
+
+	if !user1.IsAdmin {
+		t.Fatal(`The is_admin flag should be merged into user1`)
+	}
+
+	user1 = &User{ID: 42, Username: "user1", Password: "secret", Theme: "default"}
+	user2 = &User{ID: 42}
+	user1.Merge(user2)
+
+	if user1.IsAdmin {
+		t.Fatal(`The is_admin flag should not be merged into user1`)
 	}
 }