From a4d3540a6ff67ca7673d0ff0c308b1ff56a76612 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Fri, 27 Jun 2014 10:48:55 +0200
Subject: [PATCH] Pullup "login" to managed test

---
 tests/org/cacert/gigi/LoginTest.java             | 13 -------------
 tests/org/cacert/gigi/testUtils/ManagedTest.java | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/tests/org/cacert/gigi/LoginTest.java b/tests/org/cacert/gigi/LoginTest.java
index 9aa24c76..729a5988 100644
--- a/tests/org/cacert/gigi/LoginTest.java
+++ b/tests/org/cacert/gigi/LoginTest.java
@@ -35,18 +35,5 @@ public class LoginTest extends ManagedTest {
 		huc.addRequestProperty("Cookie", cookie);
 		return huc.getResponseCode() == 200;
 	}
-	public String login(String email, String pw) throws IOException {
-		URL u = new URL("https://" + getServerName() + "/login");
-		HttpURLConnection huc = (HttpURLConnection) u.openConnection();
-		huc.setDoOutput(true);
-		OutputStream os = huc.getOutputStream();
-		String data = "username=" + URLEncoder.encode(email, "UTF-8")
-				+ "&password=" + URLEncoder.encode(pw, "UTF-8");
-		os.write(data.getBytes());
-		os.flush();
-		String headerField = huc.getHeaderField("Set-Cookie");
-		headerField = headerField.substring(0, headerField.indexOf(';'));
-		return headerField;
-	}
 
 }
diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 25ae8bb6..20fa9147 100644
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -8,6 +8,7 @@ import java.io.DataOutputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.InetSocketAddress;
@@ -231,4 +232,17 @@ public class ManagedTest {
 	public String createUniqueName() {
 		return "test" + System.currentTimeMillis() + "a" + (count++);
 	}
+	public String login(String email, String pw) throws IOException {
+		URL u = new URL("https://" + getServerName() + "/login");
+		HttpURLConnection huc = (HttpURLConnection) u.openConnection();
+		huc.setDoOutput(true);
+		OutputStream os = huc.getOutputStream();
+		String data = "username=" + URLEncoder.encode(email, "UTF-8")
+				+ "&password=" + URLEncoder.encode(pw, "UTF-8");
+		os.write(data.getBytes());
+		os.flush();
+		String headerField = huc.getHeaderField("Set-Cookie");
+		headerField = headerField.substring(0, headerField.indexOf(';'));
+		return headerField;
+	}
 }
-- 
2.39.2