From 6b750198f233c0d4d8f2b66f58f13803bc459a20 Mon Sep 17 00:00:00 2001
From: xenolf <xenolf@users.noreply.github.com>
Date: Sun, 27 Dec 2015 18:56:44 +0100
Subject: [PATCH] Fix tests

---
 acme/client_test.go | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/acme/client_test.go b/acme/client_test.go
index 7a2f586a..c5c32672 100644
--- a/acme/client_test.go
+++ b/acme/client_test.go
@@ -27,7 +27,7 @@ func TestNewClient(t *testing.T) {
 		w.Write(data)
 	}))
 
-	client, err := NewClient(ts.URL, user, keyBits, nil)
+	client, err := NewClient(ts.URL, user, keyBits)
 	if err != nil {
 		t.Fatalf("Could not create client: %v", err)
 	}
@@ -48,7 +48,7 @@ func TestNewClient(t *testing.T) {
 	}
 }
 
-func TestNewClientOptPort(t *testing.T) {
+func TestClientOptPort(t *testing.T) {
 	keyBits := 32 // small value keeps test fast
 	key, err := rsa.GenerateKey(rand.Reader, keyBits)
 	if err != nil {
@@ -66,10 +66,12 @@ func TestNewClientOptPort(t *testing.T) {
 	}))
 
 	optPort := "1234"
-	client, err := NewClient(ts.URL, user, keyBits, []string{"http-01:" + optPort})
+	client, err := NewClient(ts.URL, user, keyBits)
 	if err != nil {
 		t.Fatalf("Could not create client: %v", err)
 	}
+	client.SetHTTPPort(optPort)
+	client.SetTLSPort(optPort)
 
 	httpSolver, ok := client.solvers["http-01"].(*httpChallenge)
 	if !ok {
@@ -81,6 +83,17 @@ func TestNewClientOptPort(t *testing.T) {
 	if httpSolver.optPort != optPort {
 		t.Errorf("Expected http-01 to have optPort %s but was %s", optPort, httpSolver.optPort)
 	}
+
+	httpsSolver, ok := client.solvers["tls-sni-01"].(*tlsSNIChallenge)
+	if !ok {
+		t.Fatal("Expected tls-sni-01 solver to be httpChallenge type")
+	}
+	if httpsSolver.jws != client.jws {
+		t.Error("Expected tls-sni-01 to have same jws as client")
+	}
+	if httpsSolver.optPort != optPort {
+		t.Errorf("Expected tls-sni-01 to have optPort %s but was %s", optPort, httpSolver.optPort)
+	}
 }
 
 func TestValidate(t *testing.T) {