Skip to content

Commit f5757f3

Browse files
author
Lee Rhodes
committed
Merge branch 'MemoryMapped-force' of git@github.com:DataSketches/sketches-core.git into MemoryMapped-force
Conflicts: src/test/java/com/yahoo/sketches/memory/MemoryMappedFileTest.java Correcting MemoryMappedFileTest.java
2 parents e581262 + ba32083 commit f5757f3

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

src/test/java/com/yahoo/sketches/memory/MemoryMappedFileTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class MemoryMappedFileTest {
2525
@Test(expectedExceptions = RuntimeException.class)
2626
public void testMapException() throws Exception {
2727
File dummy = createFile("dummy.txt", "");
28-
new MemoryMappedFile(dummy, 0, dummy.length()); //zero length
28+
Memory mmf = new MemoryMappedFile(dummy, 0, dummy.length()); //zero length
2929
}
3030

3131
@SuppressWarnings("unused")
@@ -76,12 +76,11 @@ public void testMultipleUnMaps() {
7676
MemoryMappedFile mmf = new MemoryMappedFile(file, 0, file.length());
7777
mmf.freeMemory();
7878
mmf.freeMemory();
79+
fail("Failed: testMultipleUnMaps()");
7980
} catch (Exception e) {
80-
assertTrue(true);
81+
// Expected
8182
return;
8283
}
83-
fail("Failed: testMultipleUnMaps()");
84-
8584
}
8685

8786
@Test

0 commit comments

Comments
 (0)