diff options
| author | Neil Fuller <nfuller@google.com> | 2014-03-12 12:00:47 +0000 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2014-04-29 09:43:34 +0100 |
| commit | a10637a26dc17501789edde0f4675e1639741f71 (patch) | |
| tree | 847cb961e33e00d078d521b9d61ce7a2ed53ee02 /harmony-tests/src/test | |
| parent | 6d4959fccde3bcddb42ca0d0bb16eef294ac09b4 (diff) | |
| download | libcore-a10637a26dc17501789edde0f4675e1639741f71.zip libcore-a10637a26dc17501789edde0f4675e1639741f71.tar.gz libcore-a10637a26dc17501789edde0f4675e1639741f71.tar.bz2 | |
1.7 interoperability changes for FileLock
Adding acquiredBy(). This method is effectively a synonym for
channel().
Change-Id: Ifa0b89debb42a7181f1f5f188ae7175970286adb
Diffstat (limited to 'harmony-tests/src/test')
2 files changed, 16 insertions, 0 deletions
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileChannelTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileChannelTest.java index 990badc..ccf5a14 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileChannelTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileChannelTest.java @@ -786,6 +786,7 @@ public class FileChannelTest extends TestCase { // shared lock, but it works on Windows & Linux. assertTrue(fileLock.isShared()); assertSame(readOnlyFileChannel, fileLock.channel()); + assertSame(readOnlyFileChannel, fileLock.acquiredBy()); assertEquals(POSITION, fileLock.position()); assertEquals(SIZE, fileLock.size()); } @@ -800,6 +801,7 @@ public class FileChannelTest extends TestCase { assertTrue(fileLock.isValid()); assertFalse(fileLock.isShared()); assertSame(writeOnlyFileChannel, fileLock.channel()); + assertSame(writeOnlyFileChannel, fileLock.acquiredBy()); assertEquals(POSITION, fileLock.position()); assertEquals(SIZE, fileLock.size()); } @@ -816,6 +818,7 @@ public class FileChannelTest extends TestCase { assertEquals(POSITION, fileLock.position()); assertEquals(SIZE, fileLock.size()); assertSame(readOnlyFileChannel, fileLock.channel()); + assertSame(readOnlyFileChannel, fileLock.acquiredBy()); } /** @@ -994,6 +997,7 @@ public class FileChannelTest extends TestCase { // shared lock, but it works on Windows & Linux. assertTrue(fileLock.isShared()); assertSame(readOnlyFileChannel, fileLock.channel()); + assertSame(readOnlyFileChannel, fileLock.acquiredBy()); assertEquals(POSITION, fileLock.position()); assertEquals(SIZE, fileLock.size()); } @@ -1008,6 +1012,7 @@ public class FileChannelTest extends TestCase { assertTrue(fileLock.isValid()); assertFalse(fileLock.isShared()); assertSame(writeOnlyFileChannel, fileLock.channel()); + assertSame(writeOnlyFileChannel, fileLock.acquiredBy()); assertEquals(POSITION, fileLock.position()); assertEquals(SIZE, fileLock.size()); } @@ -1024,6 +1029,7 @@ public class FileChannelTest extends TestCase { assertEquals(POSITION, fileLock.position()); assertEquals(SIZE, fileLock.size()); assertSame(readOnlyFileChannel, fileLock.channel()); + assertSame(readOnlyFileChannel, fileLock.acquiredBy()); } /** diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileLockTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileLockTest.java index 7e3b671..c4d372b 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileLockTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileLockTest.java @@ -75,6 +75,7 @@ public class FileLockTest extends TestCase { public void test_Constructor_Ljava_nio_channels_FileChannelJJZ() { FileLock fileLock1 = new MockFileLock(null, 0, 0, false); assertNull(fileLock1.channel()); + assertNull(fileLock1.acquiredBy()); try { new MockFileLock(readWriteChannel, -1, 0, false); @@ -107,6 +108,15 @@ public class FileLockTest extends TestCase { } /** + * @tests java.nio.channels.FileLock#acquiredBy() + */ + public void test_acquiredBy() { + assertSame(readWriteChannel, mockLock.acquiredBy()); + FileLock lock = new MockFileLock(null, 0, 10, true); + assertNull(lock.acquiredBy()); + } + + /** * @tests java.nio.channels.FileLock#position() */ public void test_position() { |