diff options
Diffstat (limited to 'configserver/src/test/java/com/yahoo')
2 files changed, 7 insertions, 4 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java index f7b2d4119a7..52d5ba16562 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java @@ -366,7 +366,7 @@ public class SessionPreparerTest { TestModelFactory modelFactory = new TestModelFactory(version123); preparer = createPreparer(new ModelFactoryRegistry(List.of(modelFactory)), HostProvisionerProvider.empty()); ApplicationId applicationId = applicationId("test"); - List<DataplaneToken> expected = List.of(new DataplaneToken("id", List.of(new DataplaneToken.Version("f1", "ch1")))); + List<DataplaneToken> expected = List.of(new DataplaneToken("id", List.of(new DataplaneToken.Version("f1", "ch1", Optional.empty())))); PrepareParams params = new PrepareParams.Builder().applicationId(applicationId) .dataplaneTokens(expected) .build(); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializerTest.java index 505abcb5598..59e98742777 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/DataplaneTokenSerializerTest.java @@ -5,7 +5,10 @@ import com.yahoo.config.provision.DataplaneToken; import com.yahoo.slime.Slime; import org.junit.Test; +import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.List; +import java.util.Optional; import static org.junit.Assert.assertEquals; @@ -18,10 +21,10 @@ public class DataplaneTokenSerializerTest { public void testSerialization() { List<DataplaneToken> tokens = List.of( new DataplaneToken("id1", - List.of(new DataplaneToken.Version("id1_fingerPrint1", "id1_checkaccesshash1"))), + List.of(new DataplaneToken.Version("id1_fingerPrint1", "id1_checkaccesshash1", Optional.empty()))), new DataplaneToken("id2", - List.of(new DataplaneToken.Version("id2_fingerPrint1", "id2_checkaccesshash1"), - new DataplaneToken.Version("id3_fingerPrint1", "id3_checkaccesshash1")))); + List.of(new DataplaneToken.Version("id2_fingerPrint1", "id2_checkaccesshash1", Optional.of(Instant.EPOCH)), + new DataplaneToken.Version("id3_fingerPrint1", "id3_checkaccesshash1", Optional.of(Instant.EPOCH.plus(20000, ChronoUnit.DAYS)))))); Slime slime = DataplaneTokenSerializer.toSlime(tokens); List<DataplaneToken> deserialized = DataplaneTokenSerializer.fromSlime(slime.get()); assertEquals(tokens, deserialized); |