opendev/gerrit
Code Issues Proposed changes

Merge "Remove unnecessary PathSubject"

Browse Source
This commit is contained in:
Edwin Kempin
2018-06-04 08:14:24 +00:00
committed by Gerrit Code Review
parent 2056f09818 5b49d8643b
commit 5bb7982c4e
2 changed files with 11 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
java/com/google/gerrit/extensions/common/testing/PathSubject.java
View File

@@ -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);
}
}

23
javatests/com/google/gerrit/server/config/SitePathsTest.java
View File

@@ -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 @@ public class SitePathsTest extends GerritBaseTests {
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 @@ public class SitePathsTest extends GerritBaseTests {
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 @@ public class SitePathsTest extends GerritBaseTests {
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 @@ public class SitePathsTest extends GerritBaseTests {
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 {