From d74b988f7586ce648be6860a21b22ff5370fb597 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Mon, 30 Mar 2020 13:57:43 -0600
Subject: global: cleanup code style

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 .../com/wireguard/config/BadConfigExceptionTest.java | 19 ++++++++++---------
 .../test/java/com/wireguard/config/ConfigTest.java   | 20 ++++++++++++--------
 2 files changed, 22 insertions(+), 17 deletions(-)

(limited to 'tunnel/src/test')

diff --git a/tunnel/src/test/java/com/wireguard/config/BadConfigExceptionTest.java b/tunnel/src/test/java/com/wireguard/config/BadConfigExceptionTest.java
index 54935510..3743852d 100644
--- a/tunnel/src/test/java/com/wireguard/config/BadConfigExceptionTest.java
+++ b/tunnel/src/test/java/com/wireguard/config/BadConfigExceptionTest.java
@@ -18,9 +18,11 @@ import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 public class BadConfigExceptionTest {
+    private static final Map<String, InputStream> CONFIG_MAP = new HashMap<>();
     private static final String[] CONFIG_NAMES = {
             "invalid-key",
             "invalid-number",
@@ -31,14 +33,6 @@ public class BadConfigExceptionTest {
             "unknown-attribute",
             "unknown-section"
     };
-    private static final Map<String, InputStream> CONFIG_MAP = new HashMap<>();
-
-    @BeforeClass
-    public static void readConfigs() {
-        for (final String config: CONFIG_NAMES) {
-            CONFIG_MAP.put(config, BadConfigExceptionTest.class.getClassLoader().getResourceAsStream(config + ".conf"));
-        }
-    }
 
     @AfterClass
     public static void closeStreams() {
@@ -50,6 +44,13 @@ public class BadConfigExceptionTest {
         }
     }
 
+    @BeforeClass
+    public static void readConfigs() {
+        for (final String config : CONFIG_NAMES) {
+            CONFIG_MAP.put(config, BadConfigExceptionTest.class.getClassLoader().getResourceAsStream(config + ".conf"));
+        }
+    }
+
     @Test
     public void throws_correctly_with_INVALID_KEY_reason() {
         try {
diff --git a/tunnel/src/test/java/com/wireguard/config/ConfigTest.java b/tunnel/src/test/java/com/wireguard/config/ConfigTest.java
index 6d599217..693a37ea 100644
--- a/tunnel/src/test/java/com/wireguard/config/ConfigTest.java
+++ b/tunnel/src/test/java/com/wireguard/config/ConfigTest.java
@@ -5,7 +5,6 @@
 
 package com.wireguard.config;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -15,8 +14,20 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Objects;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 public class ConfigTest {
 
+    @Test(expected = BadConfigException.class)
+    public void invalid_config_throws() throws IOException, BadConfigException {
+        try (final InputStream is = Objects.requireNonNull(getClass().getClassLoader()).getResourceAsStream("broken.conf")) {
+            Config.parse(is);
+        }
+    }
+
     @Test
     public void valid_config_parses_correctly() throws IOException, ParseException {
         Config config = null;
@@ -35,11 +46,4 @@ public class ConfigTest {
         assertEquals("Test config's allowed IPs are 0.0.0.0/0 and ::0/0", config.getPeers().get(0).getAllowedIps(), expectedAllowedIps);
         assertEquals("Test config has one DNS server", 1, config.getInterface().getDnsServers().size());
     }
-
-    @Test(expected = BadConfigException.class)
-    public void invalid_config_throws() throws IOException, BadConfigException {
-        try (final InputStream is = Objects.requireNonNull(getClass().getClassLoader()).getResourceAsStream("broken.conf")) {
-            Config.parse(is);
-        }
-    }
 }
-- 
cgit v1.2.3