From 565237c14a303a46d62d240b35c6f0082424256a Mon Sep 17 00:00:00 2001
From: jwijenbergh <jeroenwijenbergh@protonmail.com>
Date: Tue, 11 Oct 2022 10:19:56 +0200
Subject: Client: Refactor out adding a Server from getting a config

---
 client_test.go | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

(limited to 'client_test.go')

diff --git a/client_test.go b/client_test.go
index e618d07..87d00f7 100644
--- a/client_test.go
+++ b/client_test.go
@@ -85,6 +85,10 @@ func Test_server(t *testing.T) {
 		t.Fatalf("Register error: %v", registerErr)
 	}
 
+    _, addErr := state.AddCustomServer(serverURI)
+    if addErr != nil {
+		t.Fatalf("Add error: %v", addErr)
+    }
 	_, _, configErr := state.GetConfigCustomServer(serverURI, false)
 	if configErr != nil {
 		t.Fatalf("Connect error: %v", configErr)
@@ -137,13 +141,14 @@ func test_connect_oauth_parameter(
 	if registerErr != nil {
 		t.Fatalf("Register error: %v", registerErr)
 	}
-	_, _, configErr := state.GetConfigCustomServer(serverURI, false)
+
+    _, addErr := state.AddCustomServer(serverURI)
 
 	var wrappedErr *types.WrappedErrorMessage
 
 	// We ensure the error is of a wrappedErrorMessage
-	if !errors.As(configErr, &wrappedErr) {
-		t.Fatalf("error %T = %v, wantErr %T", configErr, configErr, wrappedErr)
+	if !errors.As(addErr, &wrappedErr) {
+		t.Fatalf("error %T = %v, wantErr %T", addErr, addErr, wrappedErr)
 	}
 
 	gotExpectedErr := wrappedErr.Cause()
@@ -206,6 +211,11 @@ func Test_token_expired(t *testing.T) {
 		t.Fatalf("Register error: %v", registerErr)
 	}
 
+    _, addErr := state.AddCustomServer(serverURI)
+    if addErr != nil {
+		t.Fatalf("Add error: %v", addErr)
+    }
+
 	_, _, configErr := state.GetConfigCustomServer(serverURI, false)
 
 	if configErr != nil {
@@ -261,6 +271,11 @@ func Test_token_invalid(t *testing.T) {
 		t.Fatalf("Register error: %v", registerErr)
 	}
 
+    _, addErr := state.AddCustomServer(serverURI)
+    if addErr != nil {
+		t.Fatalf("Add error: %v", addErr)
+    }
+
 	_, _, configErr := state.GetConfigCustomServer(serverURI, false)
 
 	if configErr != nil {
@@ -313,6 +328,11 @@ func Test_invalid_profile_corrected(t *testing.T) {
 		t.Fatalf("Register error: %v", registerErr)
 	}
 
+    _, addErr := state.AddCustomServer(serverURI)
+    if addErr != nil {
+		t.Fatalf("Add error: %v", addErr)
+    }
+
 	_, _, configErr := state.GetConfigCustomServer(serverURI, false)
 
 	if configErr != nil {
@@ -365,6 +385,11 @@ func Test_prefer_tcp(t *testing.T) {
 		t.Fatalf("Register error: %v", registerErr)
 	}
 
+    _, addErr := state.AddCustomServer(serverURI)
+    if addErr != nil {
+		t.Fatalf("Add error: %v", addErr)
+    }
+
 	// get a config with preferTCP set to true
 	config, configType, configErr := state.GetConfigCustomServer(serverURI, true)
 
-- 
cgit v1.2.3