mirror of
https://github.com/google/nomulus.git
synced 2025-05-19 02:39:34 +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
80 lines
2.8 KiB
Java
80 lines
2.8 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.domain.registry.request.JsonResponse.JSON_SAFETY_PREFIX;
|
|
import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8;
|
|
import static org.mockito.Matchers.any;
|
|
import static org.mockito.Matchers.anyMapOf;
|
|
import static org.mockito.Matchers.eq;
|
|
import static org.mockito.Mockito.when;
|
|
|
|
import com.google.common.collect.ImmutableMap;
|
|
import com.google.common.net.MediaType;
|
|
import com.google.domain.registry.tools.ServerSideCommand.Connection;
|
|
import com.google.domain.registry.tools.server.UpdatePremiumListAction;
|
|
|
|
import org.junit.Before;
|
|
import org.junit.Test;
|
|
import org.mockito.Mock;
|
|
|
|
/** Unit tests for {@link UpdatePremiumListCommand}. */
|
|
public class UpdatePremiumListCommandTest<C extends UpdatePremiumListCommand>
|
|
extends CreateOrUpdatePremiumListCommandTestCase<C> {
|
|
|
|
@Mock
|
|
Connection connection;
|
|
|
|
String premiumTermsPath;
|
|
String premiumTermsCsv;
|
|
String servletPath;
|
|
|
|
@Before
|
|
public void init() throws Exception {
|
|
command.setConnection(connection);
|
|
servletPath = "/_dr/admin/updatePremiumList";
|
|
premiumTermsPath = writeToNamedTmpFile(
|
|
"example_premium_terms.csv",
|
|
readResourceUtf8(
|
|
UpdatePremiumListCommandTest.class,
|
|
"testdata/example_premium_terms.csv"));
|
|
when(connection.send(
|
|
eq(UpdatePremiumListAction.PATH),
|
|
anyMapOf(String.class, String.class),
|
|
any(MediaType.class),
|
|
any(byte[].class)))
|
|
.thenReturn(JSON_SAFETY_PREFIX + "{\"status\":\"success\",\"lines\":[]}");
|
|
}
|
|
|
|
@Test
|
|
public void testRun() throws Exception {
|
|
runCommandForced("-i=" + premiumTermsPath, "-n=foo");
|
|
verifySentParams(
|
|
connection,
|
|
servletPath,
|
|
ImmutableMap.of("name", "foo", "inputData", generateInputData(premiumTermsPath)));
|
|
}
|
|
|
|
@Test
|
|
public void testRun_noProvidedName_usesBasenameOfInputFile() throws Exception {
|
|
runCommandForced("-i=" + premiumTermsPath);
|
|
assertInStdout("Successfully");
|
|
verifySentParams(
|
|
connection,
|
|
servletPath,
|
|
ImmutableMap.of(
|
|
"name", "example_premium_terms", "inputData", generateInputData(premiumTermsPath)));
|
|
}
|
|
}
|