diff options
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CostReportMaintainerTest.java')
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CostReportMaintainerTest.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CostReportMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CostReportMaintainerTest.java index 294272041b6..7cfe5dee3de 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CostReportMaintainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CostReportMaintainerTest.java @@ -7,13 +7,13 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.Property; import com.yahoo.vespa.hosted.controller.api.integration.resource.CostReportConsumerMock; import com.yahoo.vespa.hosted.controller.api.integration.resource.ResourceAllocation; import com.yahoo.vespa.hosted.controller.integration.ZoneApiMock; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.Duration; import java.time.Instant; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author ldalves @@ -23,7 +23,7 @@ public class CostReportMaintainerTest { private final ControllerTester tester = new ControllerTester(); @Test - public void maintain() { + void maintain() { tester.clock().setInstant(Instant.EPOCH); tester.zoneRegistry().setZones( ZoneApiMock.newBuilder().withId("prod.us-east-3").withCloud("yahoo").build(), @@ -35,9 +35,9 @@ public class CostReportMaintainerTest { CostReportConsumerMock costReportConsumer = new CostReportConsumerMock( (csv) -> assertEquals( "Date,Property,Reserved Cpu Cores,Reserved Memory GB,Reserved Disk Space GB,Usage Fraction\n" + - "1970-01-01,Property1,96.0,96.0,2000.0,0.3055555555555555\n" + - "1970-01-01,Property3,128.0,96.0,2000.0,0.3333333333333333\n" + - "1970-01-01,Property2,160.0,96.0,2000.0,0.3611111111111111", + "1970-01-01,Property1,96.0,96.0,2000.0,0.3055555555555555\n" + + "1970-01-01,Property3,128.0,96.0,2000.0,0.3333333333333333\n" + + "1970-01-01,Property2,160.0,96.0,2000.0,0.3611111111111111", csv), Map.of(new Property("Property3"), new ResourceAllocation(256, 192, 4000, NodeResources.Architecture.getDefault())) ); |