aboutsummaryrefslogtreecommitdiff
path: root/jimfs/src/test/java
diff options
context:
space:
mode:
authorkak <kak@google.com>2015-02-03 12:44:12 -0800
committerColin Decker <cgdecker@google.com>2015-02-18 17:02:06 -0500
commitfb1e643792a0e4453b10197b2b16daa48a63f25a (patch)
tree6438e18dda0da8ae0e1ab581c1c3a758340462ca /jimfs/src/test/java
parent386a2fb1569b81a31e245e88e4792607bfaee980 (diff)
downloadjimfs-fb1e643792a0e4453b10197b2b16daa48a63f25a.tar.gz
Cleanup usages of deprecated Truth APIs.
Tested: TAP --sample for global presubmit queue [] ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=85451232
Diffstat (limited to 'jimfs/src/test/java')
-rw-r--r--jimfs/src/test/java/com/google/common/jimfs/JimfsUnixLikeFileSystemTest.java14
-rw-r--r--jimfs/src/test/java/com/google/common/jimfs/JimfsWindowsLikeFileSystemTest.java20
-rw-r--r--jimfs/src/test/java/com/google/common/jimfs/PathTypeTest.java6
-rw-r--r--jimfs/src/test/java/com/google/common/jimfs/UnixPathTypeTest.java6
-rw-r--r--jimfs/src/test/java/com/google/common/jimfs/WindowsPathTypeTest.java16
5 files changed, 31 insertions, 31 deletions
diff --git a/jimfs/src/test/java/com/google/common/jimfs/JimfsUnixLikeFileSystemTest.java b/jimfs/src/test/java/com/google/common/jimfs/JimfsUnixLikeFileSystemTest.java
index e00d98c..7ac350b 100644
--- a/jimfs/src/test/java/com/google/common/jimfs/JimfsUnixLikeFileSystemTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/JimfsUnixLikeFileSystemTest.java
@@ -291,13 +291,13 @@ public class JimfsUnixLikeFileSystemTest extends AbstractJimfsIntegrationTest {
@Test
public void testPaths_toUri() {
- assertThat(path("/").toUri()).is(URI.create("jimfs://unix/"));
- assertThat(path("/foo").toUri()).is(URI.create("jimfs://unix/foo"));
- assertThat(path("/foo/bar").toUri()).is(URI.create("jimfs://unix/foo/bar"));
- assertThat(path("foo").toUri()).is(URI.create("jimfs://unix/work/foo"));
- assertThat(path("foo/bar").toUri()).is(URI.create("jimfs://unix/work/foo/bar"));
- assertThat(path("").toUri()).is(URI.create("jimfs://unix/work"));
- assertThat(path("./../.").toUri()).is(URI.create("jimfs://unix/work/./../."));
+ assertThat(path("/").toUri()).isEqualTo(URI.create("jimfs://unix/"));
+ assertThat(path("/foo").toUri()).isEqualTo(URI.create("jimfs://unix/foo"));
+ assertThat(path("/foo/bar").toUri()).isEqualTo(URI.create("jimfs://unix/foo/bar"));
+ assertThat(path("foo").toUri()).isEqualTo(URI.create("jimfs://unix/work/foo"));
+ assertThat(path("foo/bar").toUri()).isEqualTo(URI.create("jimfs://unix/work/foo/bar"));
+ assertThat(path("").toUri()).isEqualTo(URI.create("jimfs://unix/work"));
+ assertThat(path("./../.").toUri()).isEqualTo(URI.create("jimfs://unix/work/./../."));
}
@Test
diff --git a/jimfs/src/test/java/com/google/common/jimfs/JimfsWindowsLikeFileSystemTest.java b/jimfs/src/test/java/com/google/common/jimfs/JimfsWindowsLikeFileSystemTest.java
index b9aacbc..224b1ad 100644
--- a/jimfs/src/test/java/com/google/common/jimfs/JimfsWindowsLikeFileSystemTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/JimfsWindowsLikeFileSystemTest.java
@@ -212,23 +212,23 @@ public class JimfsWindowsLikeFileSystemTest extends AbstractJimfsIntegrationTest
@Test
public void testPaths_toUri() {
- assertThat(fs.getPath("C:\\").toUri()).is(URI.create("jimfs://win/C:/"));
- assertThat(fs.getPath("C:\\foo").toUri()).is(URI.create("jimfs://win/C:/foo"));
- assertThat(fs.getPath("C:\\foo\\bar").toUri()).is(URI.create("jimfs://win/C:/foo/bar"));
- assertThat(fs.getPath("foo").toUri()).is(URI.create("jimfs://win/C:/work/foo"));
- assertThat(fs.getPath("foo\\bar").toUri()).is(URI.create("jimfs://win/C:/work/foo/bar"));
- assertThat(fs.getPath("").toUri()).is(URI.create("jimfs://win/C:/work"));
- assertThat(fs.getPath(".\\..\\.").toUri()).is(URI.create("jimfs://win/C:/work/./../."));
+ assertThat(fs.getPath("C:\\").toUri()).isEqualTo(URI.create("jimfs://win/C:/"));
+ assertThat(fs.getPath("C:\\foo").toUri()).isEqualTo(URI.create("jimfs://win/C:/foo"));
+ assertThat(fs.getPath("C:\\foo\\bar").toUri()).isEqualTo(URI.create("jimfs://win/C:/foo/bar"));
+ assertThat(fs.getPath("foo").toUri()).isEqualTo(URI.create("jimfs://win/C:/work/foo"));
+ assertThat(fs.getPath("foo\\bar").toUri()).isEqualTo(URI.create("jimfs://win/C:/work/foo/bar"));
+ assertThat(fs.getPath("").toUri()).isEqualTo(URI.create("jimfs://win/C:/work"));
+ assertThat(fs.getPath(".\\..\\.").toUri()).isEqualTo(URI.create("jimfs://win/C:/work/./../."));
}
@Test
public void testPaths_toUri_unc() {
assertThat(fs.getPath("\\\\host\\share\\").toUri())
- .is(URI.create("jimfs://win//host/share/"));
+ .isEqualTo(URI.create("jimfs://win//host/share/"));
assertThat(fs.getPath("\\\\host\\share\\foo").toUri())
- .is(URI.create("jimfs://win//host/share/foo"));
+ .isEqualTo(URI.create("jimfs://win//host/share/foo"));
assertThat(fs.getPath("\\\\host\\share\\foo\\bar").toUri())
- .is(URI.create("jimfs://win//host/share/foo/bar"));
+ .isEqualTo(URI.create("jimfs://win//host/share/foo/bar"));
}
@Test
diff --git a/jimfs/src/test/java/com/google/common/jimfs/PathTypeTest.java b/jimfs/src/test/java/com/google/common/jimfs/PathTypeTest.java
index 19ea9a0..3528c70 100644
--- a/jimfs/src/test/java/com/google/common/jimfs/PathTypeTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/PathTypeTest.java
@@ -68,18 +68,18 @@ public class PathTypeTest {
@Test
public void testToUri() {
URI fileUri = type.toUri(fileSystemUri, "$", ImmutableList.of("foo", "bar"));
- assertThat(fileUri.toString()).is("jimfs://foo/$/foo/bar");
+ assertThat(fileUri.toString()).isEqualTo("jimfs://foo/$/foo/bar");
assertThat(fileUri.getPath()).isEqualTo("/$/foo/bar");
URI rootUri = type.toUri(fileSystemUri, "$", ImmutableList.<String>of());
- assertThat(rootUri.toString()).is("jimfs://foo/$");
+ assertThat(rootUri.toString()).isEqualTo("jimfs://foo/$");
assertThat(rootUri.getPath()).isEqualTo("/$");
}
@Test
public void testToUri_escaping() {
URI fileUri = type.toUri(fileSystemUri, "$", ImmutableList.of("foo", "bar baz"));
- assertThat(fileUri.toString()).is("jimfs://foo/$/foo/bar%20baz");
+ assertThat(fileUri.toString()).isEqualTo("jimfs://foo/$/foo/bar%20baz");
assertThat(fileUri.getRawPath()).isEqualTo("/$/foo/bar%20baz");
assertThat(fileUri.getPath()).isEqualTo("/$/foo/bar baz");
}
diff --git a/jimfs/src/test/java/com/google/common/jimfs/UnixPathTypeTest.java b/jimfs/src/test/java/com/google/common/jimfs/UnixPathTypeTest.java
index 6d6c3d2..ac135a6 100644
--- a/jimfs/src/test/java/com/google/common/jimfs/UnixPathTypeTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/UnixPathTypeTest.java
@@ -59,18 +59,18 @@ public class UnixPathTypeTest {
@Test
public void testUnix_toUri() {
URI fileUri = PathType.unix().toUri(fileSystemUri, "/", ImmutableList.of("foo", "bar"));
- assertThat(fileUri.toString()).is("jimfs://foo/foo/bar");
+ assertThat(fileUri.toString()).isEqualTo("jimfs://foo/foo/bar");
assertThat(fileUri.getPath()).isEqualTo("/foo/bar");
URI rootUri = PathType.unix().toUri(fileSystemUri, "/", ImmutableList.<String>of());
- assertThat(rootUri.toString()).is("jimfs://foo/");
+ assertThat(rootUri.toString()).isEqualTo("jimfs://foo/");
assertThat(rootUri.getPath()).isEqualTo("/");
}
@Test
public void testUnix_toUri_escaping() {
URI uri = PathType.unix().toUri(fileSystemUri, "/", ImmutableList.of("foo bar"));
- assertThat(uri.toString()).is("jimfs://foo/foo%20bar");
+ assertThat(uri.toString()).isEqualTo("jimfs://foo/foo%20bar");
assertThat(uri.getRawPath()).isEqualTo("/foo%20bar");
assertThat(uri.getPath()).isEqualTo("/foo bar");
}
diff --git a/jimfs/src/test/java/com/google/common/jimfs/WindowsPathTypeTest.java b/jimfs/src/test/java/com/google/common/jimfs/WindowsPathTypeTest.java
index 3d18285..f685d04 100644
--- a/jimfs/src/test/java/com/google/common/jimfs/WindowsPathTypeTest.java
+++ b/jimfs/src/test/java/com/google/common/jimfs/WindowsPathTypeTest.java
@@ -127,7 +127,7 @@ public class WindowsPathTypeTest {
windows.parsePath("//host");
fail();
} catch (InvalidPathException expected) {
- assertThat(expected.getInput()).is("//host");
+ assertThat(expected.getInput()).isEqualTo("//host");
assertThat(expected.getReason()).isEqualTo("UNC path is missing sharename");
}
}
@@ -162,11 +162,11 @@ public class WindowsPathTypeTest {
@Test
public void testWindows_toUri_normal() {
URI fileUri = PathType.windows().toUri(fileSystemUri, "C:\\", ImmutableList.of("foo", "bar"));
- assertThat(fileUri.toString()).is("jimfs://foo/C:/foo/bar");
+ assertThat(fileUri.toString()).isEqualTo("jimfs://foo/C:/foo/bar");
assertThat(fileUri.getPath()).isEqualTo("/C:/foo/bar");
URI rootUri = PathType.windows().toUri(fileSystemUri, "C:\\", ImmutableList.<String>of());
- assertThat(rootUri.toString()).is("jimfs://foo/C:/");
+ assertThat(rootUri.toString()).isEqualTo("jimfs://foo/C:/");
assertThat(rootUri.getPath()).isEqualTo("/C:/");
}
@@ -174,20 +174,20 @@ public class WindowsPathTypeTest {
public void testWindows_toUri_unc() {
URI fileUri = PathType.windows()
.toUri(fileSystemUri, "\\\\host\\share\\", ImmutableList.of("foo", "bar"));
- assertThat(fileUri.toString()).is("jimfs://foo//host/share/foo/bar");
- assertThat(fileUri.getPath()).is("//host/share/foo/bar");
+ assertThat(fileUri.toString()).isEqualTo("jimfs://foo//host/share/foo/bar");
+ assertThat(fileUri.getPath()).isEqualTo("//host/share/foo/bar");
URI rootUri = PathType.windows()
.toUri(fileSystemUri, "\\\\host\\share\\", ImmutableList.<String>of());
- assertThat(rootUri.toString()).is("jimfs://foo//host/share/");
- assertThat(rootUri.getPath()).is("//host/share/");
+ assertThat(rootUri.toString()).isEqualTo("jimfs://foo//host/share/");
+ assertThat(rootUri.getPath()).isEqualTo("//host/share/");
}
@Test
public void testWindows_toUri_escaping() {
URI uri = PathType.windows()
.toUri(fileSystemUri, "C:\\", ImmutableList.of("Users", "foo", "My Documents"));
- assertThat(uri.toString()).is("jimfs://foo/C:/Users/foo/My%20Documents");
+ assertThat(uri.toString()).isEqualTo("jimfs://foo/C:/Users/foo/My%20Documents");
assertThat(uri.getRawPath()).isEqualTo("/C:/Users/foo/My%20Documents");
assertThat(uri.getPath()).isEqualTo("/C:/Users/foo/My Documents");
}