Merge "Remove unnecessary PathSubject"
diff --git a/java/com/google/gerrit/extensions/common/testing/PathSubject.java b/java/com/google/gerrit/extensions/common/testing/PathSubject.java
deleted file mode 100644
index 0b6917c..0000000
--- a/java/com/google/gerrit/extensions/common/testing/PathSubject.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.gerrit.extensions.common.testing;
-
-import static com.google.common.truth.Truth.assertAbout;
-
-import com.google.common.truth.FailureMetadata;
-import com.google.common.truth.Subject;
-import java.nio.file.Path;
-
-public class PathSubject extends Subject<PathSubject, Path> {
- private PathSubject(FailureMetadata failureMetadata, Path path) {
- super(failureMetadata, path);
- }
-
- public static PathSubject assertThat(Path path) {
- return assertAbout(PathSubject::new).that(path);
- }
-}
diff --git a/javatests/com/google/gerrit/server/config/SitePathsTest.java b/javatests/com/google/gerrit/server/config/SitePathsTest.java
index 058a497..853db27 100644
--- a/javatests/com/google/gerrit/server/config/SitePathsTest.java
+++ b/javatests/com/google/gerrit/server/config/SitePathsTest.java
@@ -15,8 +15,8 @@
package com.google.gerrit.server.config;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth8.assertThat;
-import com.google.gerrit.extensions.common.testing.PathSubject;
import com.google.gerrit.server.util.HostPlatform;
import com.google.gerrit.testing.GerritBaseTests;
import java.io.IOException;
@@ -32,8 +32,8 @@
final Path root = random();
final SitePaths site = new SitePaths(root);
assertThat(site.isNew).isTrue();
- PathSubject.assertThat(site.site_path).isEqualTo(root);
- PathSubject.assertThat(site.etc_dir).isEqualTo(root.resolve("etc"));
+ assertThat(site.site_path).isEqualTo(root);
+ assertThat(site.etc_dir).isEqualTo(root.resolve("etc"));
}
@Test
@@ -44,7 +44,7 @@
final SitePaths site = new SitePaths(root);
assertThat(site.isNew).isTrue();
- PathSubject.assertThat(site.site_path).isEqualTo(root);
+ assertThat(site.site_path).isEqualTo(root);
} finally {
Files.delete(root);
}
@@ -60,7 +60,7 @@
final SitePaths site = new SitePaths(root);
assertThat(site.isNew).isFalse();
- PathSubject.assertThat(site.site_path).isEqualTo(root);
+ assertThat(site.site_path).isEqualTo(root);
} finally {
Files.delete(txt);
Files.delete(root);
@@ -84,16 +84,15 @@
final Path root = random();
final SitePaths site = new SitePaths(root);
- PathSubject.assertThat(site.resolve(null)).isNull();
- PathSubject.assertThat(site.resolve("")).isNull();
+ assertThat(site.resolve(null)).isNull();
+ assertThat(site.resolve("")).isNull();
- PathSubject.assertThat(site.resolve("a")).isNotNull();
- PathSubject.assertThat(site.resolve("a"))
- .isEqualTo(root.resolve("a").toAbsolutePath().normalize());
+ assertThat(site.resolve("a")).isNotNull();
+ assertThat(site.resolve("a")).isEqualTo(root.resolve("a").toAbsolutePath().normalize());
final String pfx = HostPlatform.isWin32() ? "C:/" : "/";
- PathSubject.assertThat(site.resolve(pfx + "a")).isNotNull();
- PathSubject.assertThat(site.resolve(pfx + "a")).isEqualTo(Paths.get(pfx + "a"));
+ assertThat(site.resolve(pfx + "a")).isNotNull();
+ assertThat(site.resolve(pfx + "a")).isEqualTo(Paths.get(pfx + "a"));
}
private static Path random() throws IOException {
