diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-08-14 15:54:57 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-08-14 15:54:57 +0200 |
commit | cdaebc60ea153728e9744bfcfd1b867405d8ceb2 (patch) | |
tree | 36b66c7a90cbcbde4c78046719c399cac029e4f6 /config-provisioning/src/test | |
parent | 845125fb3aa0d0a438db1aa4b1d120040b1da0f9 (diff) |
Remove canonical flavor
Diffstat (limited to 'config-provisioning/src/test')
-rw-r--r-- | config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java index 6e536745c33..ec3f73a8194 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java @@ -2,9 +2,7 @@ package com.yahoo.config.provision; import com.yahoo.config.provisioning.FlavorsConfig; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import java.util.ArrayList; import java.util.List; @@ -13,18 +11,13 @@ import static org.junit.Assert.assertEquals; public class NodeFlavorsTest { - @Rule - public final ExpectedException exception = ExpectedException.none(); - @Test public void testConfigParsing() { FlavorsConfig.Builder builder = new FlavorsConfig.Builder(); List<FlavorsConfig.Flavor.Builder> flavorBuilderList = new ArrayList<>(); { FlavorsConfig.Flavor.Builder flavorBuilder = new FlavorsConfig.Flavor.Builder(); - FlavorsConfig.Flavor.Replaces.Builder flavorReplacesBuilder = new FlavorsConfig.Flavor.Replaces.Builder(); - flavorReplacesBuilder.name("banana"); - flavorBuilder.name("strawberry").cost(2).replaces.add(flavorReplacesBuilder); + flavorBuilder.name("strawberry").cost(2); flavorBuilderList.add(flavorBuilder); } { @@ -38,25 +31,4 @@ public class NodeFlavorsTest { assertEquals(3, nodeFlavors.getFlavor("banana").get().cost()); } - @Test - public void testRetiredFlavorWithoutReplacement() { - FlavorsConfig.Builder builder = new FlavorsConfig.Builder(); - List<FlavorsConfig.Flavor.Builder> flavorBuilderList = new ArrayList<>(); - { - FlavorsConfig.Flavor.Builder flavorBuilder = new FlavorsConfig.Flavor.Builder(); - flavorBuilder.name("retired").retired(true); - flavorBuilderList.add(flavorBuilder); - } - { - FlavorsConfig.Flavor.Builder flavorBuilder = new FlavorsConfig.Flavor.Builder(); - flavorBuilder.name("chocolate"); - flavorBuilderList.add(flavorBuilder); - } - builder.flavor(flavorBuilderList); - FlavorsConfig config = new FlavorsConfig(builder); - exception.expect(IllegalStateException.class); - exception.expectMessage("Flavor 'retired' is retired, but has no replacement"); - new NodeFlavors(config); - } - } |