mirror of
https://github.com/google/nomulus.git
synced 2025-08-21 16:51:10 +02:00
f20b1d89a9
This CL fixes bugs introduced when the premium list commands were moved to be server-side commands. Fixes: - omitting the --name parameter actually works now; before it was failing in the local build() call since it uses the name as the @Id and tries to create a key for PremiumListRevision, but key IDs cannot be null. - premium list data larger than about 2K works now (see [] before it was stuffing the list data all into a POST query parameter, and URLs of more than 2K in length were all getting 404s. Fix was changing it to put the inputData param in the POST body. - misc test cleanup ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=119912494
64 lines
2.3 KiB
Java
64 lines
2.3 KiB
Java
// Copyright 2016 The Domain Registry Authors. All Rights Reserved.
|
|
//
|
|
// 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.domain.registry.tools;
|
|
|
|
import static com.google.common.truth.Truth.assertThat;
|
|
import static java.nio.charset.StandardCharsets.UTF_8;
|
|
import static org.mockito.Matchers.eq;
|
|
import static org.mockito.Mockito.verify;
|
|
|
|
import com.google.common.collect.ImmutableMap;
|
|
import com.google.common.io.Files;
|
|
import com.google.common.net.MediaType;
|
|
import com.google.domain.registry.testing.UriParameters;
|
|
import com.google.domain.registry.tools.ServerSideCommand.Connection;
|
|
|
|
import org.mockito.ArgumentCaptor;
|
|
import org.mockito.Captor;
|
|
|
|
import java.io.File;
|
|
import java.nio.charset.StandardCharsets;
|
|
|
|
/**
|
|
* Base class for common testing setup for create and update commands for Premium Lists.
|
|
*/
|
|
public abstract class CreateOrUpdatePremiumListCommandTestCase<
|
|
T extends CreateOrUpdatePremiumListCommand> extends CommandTestCase<T> {
|
|
|
|
@Captor
|
|
ArgumentCaptor<ImmutableMap<String, String>> urlParamCaptor;
|
|
|
|
@Captor
|
|
ArgumentCaptor<byte[]> requestBodyCaptor;
|
|
|
|
static String generateInputData(String premiumTermsPath) throws Exception {
|
|
return Files.toString(new File(premiumTermsPath), StandardCharsets.UTF_8);
|
|
}
|
|
|
|
void verifySentParams(
|
|
Connection connection, String path, ImmutableMap<String, String> parameterMap)
|
|
throws Exception {
|
|
verify(connection).send(
|
|
eq(path),
|
|
urlParamCaptor.capture(),
|
|
eq(MediaType.FORM_DATA),
|
|
requestBodyCaptor.capture());
|
|
assertThat(new ImmutableMap.Builder<String, String>()
|
|
.putAll(urlParamCaptor.getValue())
|
|
.putAll(UriParameters.parse(new String(requestBodyCaptor.getValue(), UTF_8)).entries())
|
|
.build())
|
|
.containsExactlyEntriesIn(parameterMap);
|
|
}
|
|
}
|