diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-01-18 16:26:21 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2020-01-19 10:38:02 +0100 |
commit | 1ce2696019f99e51cecb150e1082b049f210dd9f (patch) | |
tree | e221d42981781b257de95ab2c455de086801b368 /node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl | |
parent | 83beb601d06fa34841c2e4dda9cb1d39f2c2d2ea (diff) |
Use new collections initializers
Diffstat (limited to 'node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl')
3 files changed, 7 insertions, 9 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java index 90674f86907..adecc370b85 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainerTest.java @@ -15,8 +15,6 @@ import org.junit.Test; import java.nio.file.FileSystem; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.function.Function; @@ -70,7 +68,7 @@ public class AclMaintainerTest { verify(dockerOperations, times(2)).executeCommandInNetworkNamespace(eq(context), eq("ip6tables-restore"), any()); verifyNoMoreInteractions(dockerOperations); - List<String> expected = Arrays.asList( + List<String> expected = List.of( // IPv4 filter table restore "*filter\n" + "-P INPUT ACCEPT\n" + @@ -137,7 +135,7 @@ public class AclMaintainerTest { verify(dockerOperations, times(1)).executeCommandInNetworkNamespace(eq(context), eq("ip6tables-restore"), any()); verifyNoMoreInteractions(dockerOperations); - List<String> expected = Arrays.asList( + List<String> expected = List.of( // IPv4 filter table restore "*filter\n" + "-P INPUT ACCEPT\n" + @@ -194,7 +192,7 @@ public class AclMaintainerTest { verify(dockerOperations, never()).executeCommandInNetworkNamespace(eq(context), eq("ip6tables-restore"), any()); //we don't have a ip4 address for the container so no redirect verifyNoMoreInteractions(dockerOperations); - List<String> expected = Collections.singletonList( + List<String> expected = List.of( "*filter\n" + "-P INPUT ACCEPT\n" + "-P FORWARD ACCEPT\n" + diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/FilterTableLineEditorTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/FilterTableLineEditorTest.java index f72cde92839..192422492c8 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/FilterTableLineEditorTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/FilterTableLineEditorTest.java @@ -6,7 +6,7 @@ import com.yahoo.vespa.hosted.node.admin.task.util.file.Editor; import com.yahoo.vespa.hosted.node.admin.task.util.network.IPVersion; import org.junit.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.Assert.assertEquals; @@ -42,7 +42,7 @@ public class FilterTableLineEditorTest { FilterTableLineEditor filterLineEditor = FilterTableLineEditor.from(acl, ipVersion); Editor editor = new Editor( "nat-table", - () -> Arrays.asList(currentFilterTable.split("\n")), + () -> List.of(currentFilterTable.split("\n")), result -> assertEquals(expectedRestoreFileContent, String.join("\n", result)), filterLineEditor); editor.edit(m -> {}); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/NatTableLineEditorTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/NatTableLineEditorTest.java index 63dc69a180c..1ea3658db76 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/NatTableLineEditorTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/NatTableLineEditorTest.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.node.admin.maintenance.acl; import com.yahoo.vespa.hosted.node.admin.task.util.file.Editor; import org.junit.Test; -import java.util.Arrays; +import java.util.List; import static org.junit.Assert.assertEquals; @@ -88,7 +88,7 @@ public class NatTableLineEditorTest { NatTableLineEditor natLineEditor = NatTableLineEditor.from(redirectRule); Editor editor = new Editor( "nat-table", - () -> Arrays.asList(currentNatTable.split("\n")), + () -> List.of(currentNatTable.split("\n")), result -> assertEquals(expectedNatTable, String.join("\n", result)), natLineEditor); editor.edit(m -> {}); |