// Copyright (C) 2013 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.gerrit.acceptance;

import static java.util.stream.Collectors.toList;

import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.server.mail.Address;
import com.jcraft.jsch.KeyPair;
import java.io.ByteArrayOutputStream;
import java.util.Arrays;
import java.util.List;
import org.eclipse.jgit.lib.PersonIdent;

public class TestAccount {
  public static List<Account.Id> ids(List<TestAccount> accounts) {
    return accounts.stream().map(a -> a.id).collect(toList());
  }

  public static List<Account.Id> ids(TestAccount... accounts) {
    return ids(Arrays.asList(accounts));
  }

  public static List<String> names(List<TestAccount> accounts) {
    return accounts.stream().map(a -> a.fullName).collect(toList());
  }

  public static List<String> names(TestAccount... accounts) {
    return names(Arrays.asList(accounts));
  }

  public final Account.Id id;
  public final String username;
  public final String email;
  public final Address emailAddress;
  public final String fullName;
  public final KeyPair sshKey;
  public final String httpPassword;
  public String status;

  TestAccount(
      Account.Id id,
      String username,
      String email,
      String fullName,
      KeyPair sshKey,
      String httpPassword) {
    this.id = id;
    this.username = username;
    this.email = email;
    this.emailAddress = new Address(fullName, email);
    this.fullName = fullName;
    this.sshKey = sshKey;
    this.httpPassword = httpPassword;
  }

  public byte[] privateKey() {
    ByteArrayOutputStream out = new ByteArrayOutputStream();
    sshKey.writePrivateKey(out);
    return out.toByteArray();
  }

  public PersonIdent getIdent() {
    return new PersonIdent(fullName, email);
  }

  public String getHttpUrl(GerritServer server) {
    return String.format(
        "http://%s:%s@%s:%d",
        username,
        httpPassword,
        server.getHttpAddress().getAddress().getHostAddress(),
        server.getHttpAddress().getPort());
  }

  public Account.Id getId() {
    return id;
  }
}

@@ -692,16 +692,60 @@
 oList;%0A%0A
+import com.google.common.net.InetAddresses;%0A
 import c
@@ -918,42 +918,125 @@
 ava.
-util.Arrays;%0Aimport java.util.List
+net.InetSocketAddress;%0Aimport java.util.Arrays;%0Aimport java.util.List;%0Aimport org.apache.http.client.utils.URIBuilder
 ;%0Aim
@@ -2528,68 +2528,134 @@
     
-return String.format(%0A        %22http://%25s:%25s@%25s:%25d%22,%0A        
+InetSocketAddress addr = server.getHttpAddress();%0A    return new URIBuilder()%0A        .setScheme(%22http%22)%0A        .setUserInfo(
 user
@@ -2659,24 +2659,16 @@
 sername,
-%0A       
  httpPas
@@ -2672,17 +2672,17 @@
 Password
-,
+)
 %0A       
@@ -2686,51 +2686,50 @@
     
-server.getHttpAddress().getAddress().getHos
+.setHost(InetAddresses.toUriString(addr.ge
 tAdd
@@ -2734,17 +2734,18 @@
 ddress()
-,
+))
 %0A       
@@ -2749,41 +2749,51 @@
     
+.
 se
-rver.getHttpAddress().getPort()
+tPort(addr.getPort())%0A        .toString(
 );%0A 

Build HTTP URL more robustly