Refactor out creation of server TRIDs so they can be tested

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=152837185
This commit is contained in:
mcilwain 2017-04-11 11:28:11 -07:00 committed by Ben McIlwain
parent af942774f4
commit 8653d2f204
29 changed files with 174 additions and 62 deletions

View file

@ -337,7 +337,7 @@ public class ContactResourceToXjcConverterTest {
.setTransferRequestTime(DateTime.parse("1925-04-19TZ"))
.setPendingTransferExpirationTime(DateTime.parse("1925-04-21TZ"))
.setTransferStatus(TransferStatus.SERVER_APPROVED)
.setTransferRequestTrid(Trid.create("client trid"))
.setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
.build())
.setDisclose(new Disclose.Builder()
.setFlag(true)

View file

@ -352,7 +352,7 @@ public class DomainResourceToXjcConverterTest {
Key.create(billingEvent)))
.setTransferRequestTime(DateTime.parse("1919-01-01T00:00:00Z"))
.setTransferStatus(TransferStatus.PENDING)
.setTransferRequestTrid(Trid.create("client trid"))
.setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
.build())
.build();
clock.advanceOneMilli();

View file

@ -177,7 +177,7 @@ final class RdeFixtures {
Key.create(billingEvent)))
.setTransferRequestTime(DateTime.parse("1919-01-01T00:00:00Z"))
.setTransferStatus(TransferStatus.PENDING)
.setTransferRequestTrid(Trid.create("client trid"))
.setTransferRequestTrid(Trid.create("client-trid", "server-trid"))
.build())
.build();
clock.advanceOneMilli();

View file

@ -127,7 +127,7 @@ public class RdeContactImportActionTest extends MapreduceTestCase<RdeContactImpo
return new HistoryEntry.Builder()
.setType(HistoryEntry.Type.RDE_IMPORT)
.setClientId(clid)
.setTrid(Trid.create(null))
.setTrid(Trid.create("client-trid", "server-trid"))
.setModificationTime(DateTime.now())
.setXmlBytes(objectXml)
.setBySuperuser(true)

View file

@ -340,7 +340,7 @@ public class RdeDomainImportActionTest extends MapreduceTestCase<RdeDomainImport
return new HistoryEntry.Builder()
.setType(HistoryEntry.Type.RDE_IMPORT)
.setClientId(clid)
.setTrid(Trid.create(null))
.setTrid(Trid.create("client-trid", "server-trid"))
.setModificationTime(DateTime.now())
.setXmlBytes(objectXml)
.setBySuperuser(true)

View file

@ -158,7 +158,7 @@ public class RdeHostImportActionTest extends MapreduceTestCase<RdeHostImportActi
return new HistoryEntry.Builder()
.setType(HistoryEntry.Type.RDE_IMPORT)
.setClientId(clid)
.setTrid(Trid.create(null))
.setTrid(Trid.create("client-trid", "server-trid"))
.setModificationTime(DateTime.now())
.setXmlBytes(objectXml)
.setBySuperuser(true)