Turn Flow into an interface and inject all its fields

This concludes your flow flattening experience. Please
fill out a flow flattening satisfaction survey before
exiting.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=137903095
This commit is contained in:
cgoldfeder
2016-11-02 15:19:34 -04:00
committed by Ben McIlwain
parent 82b0bff9b5
commit 053538b1b5
49 changed files with 630 additions and 569 deletions
@@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.TestDataHelper.loadFileWithSubstitutions;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.google.appengine.api.users.User;
import com.google.common.base.Joiner;
@@ -31,8 +30,6 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.testing.TestLogHandler;
import google.registry.model.eppcommon.Trid;
import google.registry.model.eppinput.EppInput;
import google.registry.model.eppoutput.EppOutput;
import google.registry.model.eppoutput.EppResponse;
import google.registry.monitoring.whitebox.EppMetric;
import google.registry.testing.AppEngineRule;
@@ -66,27 +63,23 @@ public class FlowRunnerTest extends ShardableTestCase {
public void before() {
Logger.getLogger(FlowRunner.class.getCanonicalName()).addHandler(handler);
final EppOutput eppOutput = mock(EppOutput.class);
EppResponse eppResponse = mock(EppResponse.class);
when(eppOutput.getResponse()).thenReturn(eppResponse);
final EppResponse eppResponse = mock(EppResponse.class);
flowRunner.clientId = "TheRegistrar";
flowRunner.clock = new FakeClock();
flowRunner.credentials = new PasswordOnlyTransportCredentials();
flowRunner.eppInput = new EppInput();
flowRunner.eppRequestSource = EppRequestSource.UNIT_TEST;
flowRunner.flowProvider =
Providers.<Flow>of(
new Flow() {
@Override
protected EppOutput run() {
return eppOutput;
public EppResponse run() {
return eppResponse;
}});
flowRunner.inputXmlBytes = "<xml/>".getBytes(UTF_8);
flowRunner.isDryRun = false;
flowRunner.isSuperuser = false;
flowRunner.isTransactional = false;
flowRunner.metric = EppMetric.builderForRequest("request-id-1", flowRunner.clock);
flowRunner.metric = EppMetric.builderForRequest("request-id-1", new FakeClock());
flowRunner.sessionMetadata =
new StatelessRequestSessionMetadata("TheRegistrar", ImmutableSet.<String>of());
flowRunner.trid = Trid.create("client-123", "server-456");
@@ -52,7 +52,6 @@ import google.registry.model.eppcommon.StatusValue;
import google.registry.model.eppcommon.Trid;
import google.registry.model.eppoutput.EppOutput;
import google.registry.model.eppoutput.EppResponse;
import google.registry.model.eppoutput.Result;
import google.registry.model.eppoutput.Result.Code;
import google.registry.model.host.HostResource;
import google.registry.model.ofy.RequestCapturingAsyncDatastoreService;
@@ -443,8 +442,8 @@ public class DomainResourceTest extends EntityTestCase {
int numPreviousReads = RequestCapturingAsyncDatastoreService.getReads().size();
EppXmlTransformer.marshal(
EppOutput.create(new EppResponse.Builder()
.setResult(Result.create(Code.SUCCESS))
.setResData(ImmutableList.of(domain))
.setResultFromCode(Code.SUCCESS)
.setResData(domain)
.setTrid(Trid.create(null, "abc"))
.build()),
ValidationMode.STRICT);
@@ -1,48 +0,0 @@
// Copyright 2016 The Nomulus 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 google.registry.model.poll;
import static com.google.common.truth.Truth.assertThat;
import com.google.common.testing.NullPointerTester;
import com.google.common.testing.NullPointerTester.Visibility;
import org.joda.time.DateTime;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
/** Unit tests for {@link MessageQueueInfo}. */
@RunWith(JUnit4.class)
public final class MessageQueueInfoTest {
@Test
public void testDeadCodeWeDontWantToDelete() throws Exception {
MessageQueueInfo mp = new MessageQueueInfo();
mp.queueDate = DateTime.parse("1984-12-18TZ");
assertThat(mp.getQueueDate()).isEqualTo(DateTime.parse("1984-12-18TZ"));
mp.msg = "sloth";
assertThat(mp.getMsg()).isEqualTo("sloth");
mp.queueLength = 123;
assertThat(mp.getQueueLength()).isEqualTo(123);
mp.messageId = "adorable";
assertThat(mp.getMessageId()).isEqualTo("adorable");
}
@Test
public void testNullness() {
NullPointerTester tester = new NullPointerTester();
tester.testStaticMethods(MessageQueueInfo.class, Visibility.PROTECTED);
}
}
@@ -17,7 +17,6 @@ package google.registry.model.translators;
import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import google.registry.flows.EppXmlTransformer;
import google.registry.model.eppcommon.StatusValue;
@@ -51,9 +50,9 @@ public class StatusValueAdapterTest {
String marshalled = new String(
EppXmlTransformer.marshal(
EppOutput.create(new EppResponse.Builder()
.setResData(ImmutableList.of(new HostResource.Builder()
.setResData(new HostResource.Builder()
.addStatusValue(StatusValue.CLIENT_UPDATE_PROHIBITED)
.build()))
.build())
.build()),
ValidationMode.LENIENT),
UTF_8);