From eb8c7f67fb19c0d0076a87f4be5db8f3cec6a341 Mon Sep 17 00:00:00 2001 From: "Anosh D. Ullenius" Date: Fri, 17 Jun 2022 20:40:27 +0200 Subject: [PATCH] Simplify assertions --- .../threerings/getdown/util/ConfigTest.java | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/core/src/test/java/com/threerings/getdown/util/ConfigTest.java b/core/src/test/java/com/threerings/getdown/util/ConfigTest.java index f1bba18..911191f 100644 --- a/core/src/test/java/com/threerings/getdown/util/ConfigTest.java +++ b/core/src/test/java/com/threerings/getdown/util/ConfigTest.java @@ -62,81 +62,81 @@ public class ConfigTest opts.osarch = "i386"; List parsed = Config.parsePairs(toReader(pairs), opts); assertTrue(exists(parsed, linux.key)); - assertTrue(!exists(parsed, mac.key)); + assertFalse(exists(parsed, mac.key)); assertTrue(exists(parsed, linuxAndMac.key)); - assertTrue(!exists(parsed, linux64.key)); - assertTrue(!exists(parsed, linux64s.key)); - assertTrue(!exists(parsed, mac64.key)); - assertTrue(!exists(parsed, win64.key)); + assertFalse(exists(parsed, linux64.key)); + assertFalse(exists(parsed, linux64s.key)); + assertFalse(exists(parsed, mac64.key)); + assertFalse(exists(parsed, win64.key)); assertTrue(exists(parsed, notWin.key)); opts.osarch = "x86_64"; parsed = Config.parsePairs(toReader(pairs), opts); assertTrue(exists(parsed, linux.key)); - assertTrue(!exists(parsed, mac.key)); + assertFalse(exists(parsed, mac.key)); assertTrue(exists(parsed, linuxAndMac.key)); assertTrue(exists(parsed, linux64.key)); assertTrue(exists(parsed, linux64s.key)); - assertTrue(!exists(parsed, mac64.key)); - assertTrue(!exists(parsed, win64.key)); + assertFalse(exists(parsed, mac64.key)); + assertFalse(exists(parsed, win64.key)); assertTrue(exists(parsed, notWin.key)); opts.osarch = "amd64"; parsed = Config.parsePairs(toReader(pairs), opts); assertTrue(exists(parsed, linux.key)); - assertTrue(!exists(parsed, mac.key)); + assertFalse(exists(parsed, mac.key)); assertTrue(exists(parsed, linuxAndMac.key)); - assertTrue(!exists(parsed, linux64.key)); + assertFalse(exists(parsed, linux64.key)); assertTrue(exists(parsed, linux64s.key)); - assertTrue(!exists(parsed, mac64.key)); - assertTrue(!exists(parsed, win64.key)); + assertFalse(exists(parsed, mac64.key)); + assertFalse(exists(parsed, win64.key)); assertTrue(exists(parsed, notWin.key)); opts.osname = "mac os x"; opts.osarch = "x86_64"; parsed = Config.parsePairs(toReader(pairs), opts); - assertTrue(!exists(parsed, linux.key)); + assertFalse(exists(parsed, linux.key)); assertTrue(exists(parsed, mac.key)); assertTrue(exists(parsed, linuxAndMac.key)); - assertTrue(!exists(parsed, linux64.key)); - assertTrue(!exists(parsed, linux64s.key)); + assertFalse(exists(parsed, linux64.key)); + assertFalse(exists(parsed, linux64s.key)); assertTrue(exists(parsed, mac64.key)); - assertTrue(!exists(parsed, win64.key)); + assertFalse(exists(parsed, win64.key)); assertTrue(exists(parsed, notWin.key)); opts.osname = "windows"; opts.osarch = "i386"; parsed = Config.parsePairs(toReader(pairs), opts); - assertTrue(!exists(parsed, linux.key)); - assertTrue(!exists(parsed, mac.key)); - assertTrue(!exists(parsed, linuxAndMac.key)); - assertTrue(!exists(parsed, linux64.key)); - assertTrue(!exists(parsed, linux64s.key)); - assertTrue(!exists(parsed, mac64.key)); - assertTrue(!exists(parsed, win64.key)); - assertTrue(!exists(parsed, notWin.key)); + assertFalse(exists(parsed, linux.key)); + assertFalse(exists(parsed, mac.key)); + assertFalse(exists(parsed, linuxAndMac.key)); + assertFalse(exists(parsed, linux64.key)); + assertFalse(exists(parsed, linux64s.key)); + assertFalse(exists(parsed, mac64.key)); + assertFalse(exists(parsed, win64.key)); + assertFalse(exists(parsed, notWin.key)); opts.osarch = "x86_64"; parsed = Config.parsePairs(toReader(pairs), opts); - assertTrue(!exists(parsed, linux.key)); - assertTrue(!exists(parsed, mac.key)); - assertTrue(!exists(parsed, linuxAndMac.key)); - assertTrue(!exists(parsed, linux64.key)); - assertTrue(!exists(parsed, linux64s.key)); - assertTrue(!exists(parsed, mac64.key)); + assertFalse(exists(parsed, linux.key)); + assertFalse(exists(parsed, mac.key)); + assertFalse(exists(parsed, linuxAndMac.key)); + assertFalse(exists(parsed, linux64.key)); + assertFalse(exists(parsed, linux64s.key)); + assertFalse(exists(parsed, mac64.key)); assertTrue(exists(parsed, win64.key)); - assertTrue(!exists(parsed, notWin.key)); + assertFalse(exists(parsed, notWin.key)); opts.osarch = "amd64"; parsed = Config.parsePairs(toReader(pairs), opts); - assertTrue(!exists(parsed, linux.key)); - assertTrue(!exists(parsed, mac.key)); - assertTrue(!exists(parsed, linuxAndMac.key)); - assertTrue(!exists(parsed, linux64.key)); - assertTrue(!exists(parsed, linux64s.key)); - assertTrue(!exists(parsed, mac64.key)); - assertTrue(!exists(parsed, win64.key)); - assertTrue(!exists(parsed, notWin.key)); + assertFalse(exists(parsed, linux.key)); + assertFalse(exists(parsed, mac.key)); + assertFalse(exists(parsed, linuxAndMac.key)); + assertFalse(exists(parsed, linux64.key)); + assertFalse(exists(parsed, linux64s.key)); + assertFalse(exists(parsed, mac64.key)); + assertFalse(exists(parsed, win64.key)); + assertFalse(exists(parsed, notWin.key)); } protected static boolean exists (List pairs, String key)