diff --git a/qa/os/src/test/java/org/elasticsearch/packaging/test/ArchiveTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/ArchiveTests.java index 42dab729043f7..7903ba016c927 100644 --- a/qa/os/src/test/java/org/elasticsearch/packaging/test/ArchiveTests.java +++ b/qa/os/src/test/java/org/elasticsearch/packaging/test/ArchiveTests.java @@ -117,7 +117,7 @@ public void test50StartAndStop() throws Exception { throw e; } - assertTrue("gc logs exist", Files.exists(installation.logs.resolve("gc.log"))); + assertThat(installation.logs.resolve("gc.log"), fileExists()); ServerUtils.runElasticsearchTests(); stopElasticsearch(); diff --git a/qa/os/src/test/java/org/elasticsearch/packaging/test/DebPreservationTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/DebPreservationTests.java index 75f764fb4b1d8..e7d895005a618 100644 --- a/qa/os/src/test/java/org/elasticsearch/packaging/test/DebPreservationTests.java +++ b/qa/os/src/test/java/org/elasticsearch/packaging/test/DebPreservationTests.java @@ -25,7 +25,7 @@ import java.nio.file.Paths; import static org.elasticsearch.packaging.util.FileExistenceMatchers.fileExists; -import static org.elasticsearch.packaging.util.FileUtils.assertPathsDontExist; +import static org.elasticsearch.packaging.util.FileUtils.assertPathsDoNotExist; import static org.elasticsearch.packaging.util.FileUtils.assertPathsExist; import static org.elasticsearch.packaging.util.Packages.SYSVINIT_SCRIPT; import static org.elasticsearch.packaging.util.Packages.assertInstalled; @@ -76,14 +76,14 @@ public void test20Remove() throws Exception { // keystore was removed - assertPathsDontExist( + assertPathsDoNotExist( installation.config("elasticsearch.keystore"), installation.config(".elasticsearch.keystore.initial_md5sum") ); // doc files were removed - assertPathsDontExist( + assertPathsDoNotExist( Paths.get("/usr/share/doc/" + distribution().flavor.name), Paths.get("/usr/share/doc/" + distribution().flavor.name + "/copyright") ); @@ -100,7 +100,7 @@ public void test30Purge() throws Exception { assertRemoved(distribution()); - assertPathsDontExist( + assertPathsDoNotExist( installation.config, installation.envFile, SYSVINIT_SCRIPT diff --git a/qa/os/src/test/java/org/elasticsearch/packaging/test/PackageTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/PackageTests.java index c64fe390ca562..21db408999375 100644 --- a/qa/os/src/test/java/org/elasticsearch/packaging/test/PackageTests.java +++ b/qa/os/src/test/java/org/elasticsearch/packaging/test/PackageTests.java @@ -38,7 +38,7 @@ import static org.elasticsearch.packaging.util.FileExistenceMatchers.fileDoesNotExist; import static org.elasticsearch.packaging.util.FileExistenceMatchers.fileExists; import static org.elasticsearch.packaging.util.FileUtils.append; -import static org.elasticsearch.packaging.util.FileUtils.assertPathsDontExist; +import static org.elasticsearch.packaging.util.FileUtils.assertPathsDoNotExist; import static org.elasticsearch.packaging.util.FileUtils.assertPathsExist; import static org.elasticsearch.packaging.util.FileUtils.cp; import static org.elasticsearch.packaging.util.FileUtils.fileWithGlobExist; @@ -205,7 +205,7 @@ public void test50Remove() throws Exception { } - assertPathsDontExist( + assertPathsDoNotExist( installation.bin, installation.lib, installation.modules, diff --git a/qa/os/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java index 2784cc33aa14a..7b674b4554a1d 100644 --- a/qa/os/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java +++ b/qa/os/src/test/java/org/elasticsearch/packaging/test/PackagingTestCase.java @@ -56,9 +56,10 @@ import static org.elasticsearch.packaging.util.Cleanup.cleanEverything; import static org.elasticsearch.packaging.util.Docker.ensureImageIsLoaded; import static org.elasticsearch.packaging.util.Docker.removeContainer; +import static org.elasticsearch.packaging.util.FileExistenceMatchers.fileExists; +import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.anyOf; import static org.junit.Assume.assumeFalse; import static org.junit.Assume.assumeTrue; @@ -326,7 +327,7 @@ public void assertElasticsearchFailure(Shell.Result result, List expecte // If log file exists, then we have bootstrapped our logging and the // error should be in the logs - assertTrue("log file exists", Files.exists(installation.logs.resolve("elasticsearch.log"))); + assertThat(installation.logs.resolve("elasticsearch.log"), fileExists()); String logfile = FileUtils.slurp(installation.logs.resolve("elasticsearch.log")); assertThat(logfile, anyOf(stringMatchers)); diff --git a/qa/os/src/test/java/org/elasticsearch/packaging/test/RpmPreservationTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/RpmPreservationTests.java index 31d4897c2c863..6acc5df875973 100644 --- a/qa/os/src/test/java/org/elasticsearch/packaging/test/RpmPreservationTests.java +++ b/qa/os/src/test/java/org/elasticsearch/packaging/test/RpmPreservationTests.java @@ -23,14 +23,13 @@ import org.elasticsearch.packaging.util.Shell; import org.junit.BeforeClass; -import java.nio.file.Files; import java.nio.file.Path; import java.util.stream.Stream; import static org.elasticsearch.packaging.util.FileExistenceMatchers.fileDoesNotExist; import static org.elasticsearch.packaging.util.FileExistenceMatchers.fileExists; import static org.elasticsearch.packaging.util.FileUtils.append; -import static org.elasticsearch.packaging.util.FileUtils.assertPathsDontExist; +import static org.elasticsearch.packaging.util.FileUtils.assertPathsDoNotExist; import static org.elasticsearch.packaging.util.Packages.SYSTEMD_SERVICE; import static org.elasticsearch.packaging.util.Packages.SYSVINIT_SCRIPT; import static org.elasticsearch.packaging.util.Packages.assertInstalled; @@ -103,7 +102,7 @@ public void test30PreserveConfig() throws Exception { assertThat(sh.runIgnoreExitCode("systemctl is-enabled elasticsearch.service").exitCode, is(1)); } - assertPathsDontExist( + assertPathsDoNotExist( installation.bin, installation.lib, installation.modules, @@ -137,7 +136,7 @@ public void test30PreserveConfig() throws Exception { private void assertConfFilePreserved(String configFile) { final Path original = installation.config(configFile); final Path saved = installation.config(configFile + ".rpmsave"); - assertFalse(original + " should not exist", Files.exists(original)); - assertTrue(saved + " should exist", Files.exists(saved)); + assertThat(original, fileDoesNotExist()); + assertThat(saved, fileExists()); } } diff --git a/qa/os/src/test/java/org/elasticsearch/packaging/test/SysVInitTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/SysVInitTests.java index 94f061ac26902..f37fa308af026 100644 --- a/qa/os/src/test/java/org/elasticsearch/packaging/test/SysVInitTests.java +++ b/qa/os/src/test/java/org/elasticsearch/packaging/test/SysVInitTests.java @@ -24,8 +24,7 @@ import org.elasticsearch.packaging.util.Shell; import org.junit.BeforeClass; -import java.nio.file.Files; - +import static org.elasticsearch.packaging.util.FileExistenceMatchers.fileExists; import static org.elasticsearch.packaging.util.FileUtils.assertPathsExist; import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.equalTo; @@ -59,7 +58,7 @@ public void test10Install() throws Exception { public void test20Start() throws Exception { startElasticsearch(); - assertTrue("gc logs exist", Files.exists(installation.logs.resolve("gc.log"))); + assertThat(installation.logs.resolve("gc.log"), fileExists()); ServerUtils.runElasticsearchTests(); sh.run("service elasticsearch status"); // returns 0 exit status when ok } diff --git a/qa/os/src/test/java/org/elasticsearch/packaging/util/Archives.java b/qa/os/src/test/java/org/elasticsearch/packaging/util/Archives.java index 47d6b5bef57f3..96e7ddbd9d03e 100644 --- a/qa/os/src/test/java/org/elasticsearch/packaging/util/Archives.java +++ b/qa/os/src/test/java/org/elasticsearch/packaging/util/Archives.java @@ -29,6 +29,8 @@ import java.util.stream.Stream; import static java.util.stream.Collectors.joining; +import static org.elasticsearch.packaging.util.FileExistenceMatchers.fileDoesNotExist; +import static org.elasticsearch.packaging.util.FileExistenceMatchers.fileExists; import static org.elasticsearch.packaging.util.FileMatcher.Fileness.Directory; import static org.elasticsearch.packaging.util.FileMatcher.Fileness.File; import static org.elasticsearch.packaging.util.FileMatcher.file; @@ -48,8 +50,6 @@ import static org.hamcrest.collection.IsEmptyCollection.empty; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; /** * Installation and verification logic for archive distributions @@ -268,7 +268,7 @@ public static Shell.Result startElasticsearchWithTty(Installation installation, public static Shell.Result runElasticsearchStartCommand(Installation installation, Shell sh, String keystorePassword) { final Path pidFile = installation.home.resolve("elasticsearch.pid"); - assertFalse("Pid file doesn't exist when starting Elasticsearch", Files.exists(pidFile)); + assertThat(pidFile, fileDoesNotExist()); final Installation.Executables bin = installation.executables(); @@ -338,14 +338,14 @@ public static void assertElasticsearchStarted(Installation installation) throws final Path pidFile = installation.home.resolve("elasticsearch.pid"); ServerUtils.waitForElasticsearch(installation); - assertTrue("Starting Elasticsearch produced a pid file at " + pidFile, Files.exists(pidFile)); + assertThat("Starting Elasticsearch produced a pid file at " + pidFile, pidFile, fileExists()); String pid = slurp(pidFile).trim(); assertThat(pid, is(not(emptyOrNullString()))); } public static void stopElasticsearch(Installation installation) throws Exception { Path pidFile = installation.home.resolve("elasticsearch.pid"); - assertTrue("pid file should exist", Files.exists(pidFile)); + assertThat(pidFile, fileExists()); String pid = slurp(pidFile).trim(); assertThat(pid, is(not(emptyOrNullString()))); diff --git a/qa/os/src/test/java/org/elasticsearch/packaging/util/Docker.java b/qa/os/src/test/java/org/elasticsearch/packaging/util/Docker.java index f754d0289a6ab..3fb6e42e80fd2 100644 --- a/qa/os/src/test/java/org/elasticsearch/packaging/util/Docker.java +++ b/qa/os/src/test/java/org/elasticsearch/packaging/util/Docker.java @@ -26,7 +26,6 @@ import org.apache.http.client.fluent.Request; import org.elasticsearch.common.CheckedRunnable; -import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.attribute.PosixFileAttributes; @@ -39,6 +38,7 @@ import java.util.stream.Stream; import static java.nio.file.attribute.PosixFilePermissions.fromString; +import static org.elasticsearch.packaging.util.FileExistenceMatchers.fileExists; import static org.elasticsearch.packaging.util.FileMatcher.p644; import static org.elasticsearch.packaging.util.FileMatcher.p660; import static org.elasticsearch.packaging.util.FileMatcher.p755; @@ -156,7 +156,7 @@ private static void executeDockerRun(Distribution distribution, Map // Bind-mount any volumes if (volumes != null) { volumes.forEach((localPath, containerPath) -> { - assertTrue(localPath + " doesn't exist", Files.exists(localPath)); + assertThat(localPath, fileExists()); if (Platforms.WINDOWS == false && System.getProperty("user.name").equals("root")) { // The tests are running as root, but the process in the Docker container runs as `elasticsearch` (UID 1000), diff --git a/qa/os/src/test/java/org/elasticsearch/packaging/util/FileUtils.java b/qa/os/src/test/java/org/elasticsearch/packaging/util/FileUtils.java index 8d1dff077c3a5..5aa6b9ff60c56 100644 --- a/qa/os/src/test/java/org/elasticsearch/packaging/util/FileUtils.java +++ b/qa/os/src/test/java/org/elasticsearch/packaging/util/FileUtils.java @@ -52,10 +52,11 @@ import java.util.zip.GZIPInputStream; import java.util.zip.ZipException; +import static org.elasticsearch.packaging.util.FileExistenceMatchers.fileDoesNotExist; +import static org.elasticsearch.packaging.util.FileExistenceMatchers.fileExists; import static org.hamcrest.Matchers.emptyIterable; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertThat; /** * Wrappers and convenience methods for common filesystem operations @@ -308,8 +309,8 @@ public static Path getDistributionFile(Distribution distribution) { return distribution.path; } - public static void assertPathsExist(Path... paths) { - Arrays.stream(paths).forEach(path -> assertTrue(path + " should exist", Files.exists(path))); + public static void assertPathsExist(final Path... paths) { + Arrays.stream(paths).forEach(path -> assertThat(path, fileExists())); } public static Matcher fileWithGlobExist(String glob) throws IOException { @@ -326,8 +327,8 @@ protected Iterable featureValueOf(Path actual) { }; } - public static void assertPathsDontExist(Path... paths) { - Arrays.stream(paths).forEach(path -> assertFalse(path + " should not exist", Files.exists(path))); + public static void assertPathsDoNotExist(final Path... paths) { + Arrays.stream(paths).forEach(path -> assertThat(path, fileDoesNotExist())); } public static void deleteIfExists(Path path) { diff --git a/qa/os/src/test/java/org/elasticsearch/packaging/util/Packages.java b/qa/os/src/test/java/org/elasticsearch/packaging/util/Packages.java index b8dc221163f81..ed0799ecf8c5f 100644 --- a/qa/os/src/test/java/org/elasticsearch/packaging/util/Packages.java +++ b/qa/os/src/test/java/org/elasticsearch/packaging/util/Packages.java @@ -32,6 +32,7 @@ import java.util.regex.Pattern; import java.util.stream.Stream; +import static org.elasticsearch.packaging.util.FileExistenceMatchers.fileDoesNotExist; import static org.elasticsearch.packaging.util.FileMatcher.Fileness.Directory; import static org.elasticsearch.packaging.util.FileMatcher.Fileness.File; import static org.elasticsearch.packaging.util.FileMatcher.file; @@ -164,7 +165,7 @@ private static void verifyOssInstallation(Installation es, Distribution distribu final Result passwdResult = sh.run("getent passwd elasticsearch"); final Path homeDir = Paths.get(passwdResult.stdout.trim().split(":")[5]); - assertFalse("elasticsearch user home directory must not exist", Files.exists(homeDir)); + assertThat("elasticsearch user home directory must not exist", homeDir, fileDoesNotExist()); Stream.of( es.home,