You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/08/02 12:46:57 UTC
[6/7] flink git commit: [FLINK-7311][tests] refrain from using
fail(Exception#getMessage())
[FLINK-7311][tests] refrain from using fail(Exception#getMessage())
This closes #4446.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e83217bd
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e83217bd
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e83217bd
Branch: refs/heads/master
Commit: e83217bd3205768cc6dbdeead3f7334ce409f6a2
Parents: 223b7b7
Author: Nico Kruber <ni...@data-artisans.com>
Authored: Mon Jul 31 14:36:56 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Wed Aug 2 14:46:15 2017 +0200
----------------------------------------------------------------------
.../flink/core/memory/CrossSegmentTypeTest.java | 124 +-
.../core/memory/EndiannessAccessChecks.java | 24 +-
.../core/memory/HeapMemorySegmentTest.java | 34 +-
.../memory/HybridOffHeapMemorySegmentTest.java | 50 +-
.../memory/HybridOnHeapMemorySegmentTest.java | 48 +-
.../core/memory/MemorySegmentTestBase.java | 3585 +++++++++---------
.../memory/MemorySegmentUndersizedTest.java | 61 +-
.../memory/OperationsOnFreedSegmentTest.java | 200 +-
8 files changed, 1927 insertions(+), 2199 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/e83217bd/flink-core/src/test/java/org/apache/flink/core/memory/CrossSegmentTypeTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/core/memory/CrossSegmentTypeTest.java b/flink-core/src/test/java/org/apache/flink/core/memory/CrossSegmentTypeTest.java
index 724a366..0e3fed5 100644
--- a/flink-core/src/test/java/org/apache/flink/core/memory/CrossSegmentTypeTest.java
+++ b/flink-core/src/test/java/org/apache/flink/core/memory/CrossSegmentTypeTest.java
@@ -37,31 +37,25 @@ public class CrossSegmentTypeTest {
@Test
public void testCompareBytesMixedSegments() {
- try {
- MemorySegment[] segs1 = {
- new HeapMemorySegment(new byte[pageSize]),
- new HybridMemorySegment(new byte[pageSize]),
- new HybridMemorySegment(ByteBuffer.allocateDirect(pageSize))
- };
-
- MemorySegment[] segs2 = {
- new HeapMemorySegment(new byte[pageSize]),
- new HybridMemorySegment(new byte[pageSize]),
- new HybridMemorySegment(ByteBuffer.allocateDirect(pageSize))
- };
-
- Random rnd = new Random();
-
- for (MemorySegment seg1 : segs1) {
- for (MemorySegment seg2 : segs2) {
- testCompare(seg1, seg2, rnd);
- }
+ MemorySegment[] segs1 = {
+ new HeapMemorySegment(new byte[pageSize]),
+ new HybridMemorySegment(new byte[pageSize]),
+ new HybridMemorySegment(ByteBuffer.allocateDirect(pageSize))
+ };
+
+ MemorySegment[] segs2 = {
+ new HeapMemorySegment(new byte[pageSize]),
+ new HybridMemorySegment(new byte[pageSize]),
+ new HybridMemorySegment(ByteBuffer.allocateDirect(pageSize))
+ };
+
+ Random rnd = new Random();
+
+ for (MemorySegment seg1 : segs1) {
+ for (MemorySegment seg2 : segs2) {
+ testCompare(seg1, seg2, rnd);
}
}
- catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
}
private void testCompare(MemorySegment seg1, MemorySegment seg2, Random random) {
@@ -107,33 +101,27 @@ public class CrossSegmentTypeTest {
@Test
public void testSwapBytesMixedSegments() {
- try {
- final int HALF_SIZE = pageSize / 2;
-
- MemorySegment[] segs1 = {
- new HeapMemorySegment(new byte[pageSize]),
- new HybridMemorySegment(new byte[pageSize]),
- new HybridMemorySegment(ByteBuffer.allocateDirect(pageSize))
- };
-
- MemorySegment[] segs2 = {
- new HeapMemorySegment(new byte[HALF_SIZE]),
- new HybridMemorySegment(new byte[HALF_SIZE]),
- new HybridMemorySegment(ByteBuffer.allocateDirect(HALF_SIZE))
- };
-
- Random rnd = new Random();
-
- for (MemorySegment seg1 : segs1) {
- for (MemorySegment seg2 : segs2) {
- testSwap(seg1, seg2, rnd, HALF_SIZE);
- }
+ final int HALF_SIZE = pageSize / 2;
+
+ MemorySegment[] segs1 = {
+ new HeapMemorySegment(new byte[pageSize]),
+ new HybridMemorySegment(new byte[pageSize]),
+ new HybridMemorySegment(ByteBuffer.allocateDirect(pageSize))
+ };
+
+ MemorySegment[] segs2 = {
+ new HeapMemorySegment(new byte[HALF_SIZE]),
+ new HybridMemorySegment(new byte[HALF_SIZE]),
+ new HybridMemorySegment(ByteBuffer.allocateDirect(HALF_SIZE))
+ };
+
+ Random rnd = new Random();
+
+ for (MemorySegment seg1 : segs1) {
+ for (MemorySegment seg2 : segs2) {
+ testSwap(seg1, seg2, rnd, HALF_SIZE);
}
}
- catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
}
private void testSwap(MemorySegment seg1, MemorySegment seg2, Random random, int smallerSize) {
@@ -169,31 +157,25 @@ public class CrossSegmentTypeTest {
@Test
public void testCopyMixedSegments() {
- try {
- MemorySegment[] segs1 = {
- new HeapMemorySegment(new byte[pageSize]),
- new HybridMemorySegment(new byte[pageSize]),
- new HybridMemorySegment(ByteBuffer.allocateDirect(pageSize))
- };
-
- MemorySegment[] segs2 = {
- new HeapMemorySegment(new byte[pageSize]),
- new HybridMemorySegment(new byte[pageSize]),
- new HybridMemorySegment(ByteBuffer.allocateDirect(pageSize))
- };
-
- Random rnd = new Random();
-
- for (MemorySegment seg1 : segs1) {
- for (MemorySegment seg2 : segs2) {
- testCopy(seg1, seg2, rnd);
- }
+ MemorySegment[] segs1 = {
+ new HeapMemorySegment(new byte[pageSize]),
+ new HybridMemorySegment(new byte[pageSize]),
+ new HybridMemorySegment(ByteBuffer.allocateDirect(pageSize))
+ };
+
+ MemorySegment[] segs2 = {
+ new HeapMemorySegment(new byte[pageSize]),
+ new HybridMemorySegment(new byte[pageSize]),
+ new HybridMemorySegment(ByteBuffer.allocateDirect(pageSize))
+ };
+
+ Random rnd = new Random();
+
+ for (MemorySegment seg1 : segs1) {
+ for (MemorySegment seg2 : segs2) {
+ testCopy(seg1, seg2, rnd);
}
}
- catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
}
private void testCopy(MemorySegment seg1, MemorySegment seg2, Random random) {
http://git-wip-us.apache.org/repos/asf/flink/blob/e83217bd/flink-core/src/test/java/org/apache/flink/core/memory/EndiannessAccessChecks.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/core/memory/EndiannessAccessChecks.java b/flink-core/src/test/java/org/apache/flink/core/memory/EndiannessAccessChecks.java
index 4c92234..c06562a 100644
--- a/flink-core/src/test/java/org/apache/flink/core/memory/EndiannessAccessChecks.java
+++ b/flink-core/src/test/java/org/apache/flink/core/memory/EndiannessAccessChecks.java
@@ -28,35 +28,17 @@ public class EndiannessAccessChecks {
@Test
public void testHeapSegment() {
- try {
- testBigAndLittleEndianAccessUnaligned(new HeapMemorySegment(new byte[11111]));
- }
- catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ testBigAndLittleEndianAccessUnaligned(new HeapMemorySegment(new byte[11111]));
}
@Test
public void testHybridOnHeapSegment() {
- try {
- testBigAndLittleEndianAccessUnaligned(new HybridMemorySegment(new byte[11111]));
- }
- catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ testBigAndLittleEndianAccessUnaligned(new HybridMemorySegment(new byte[11111]));
}
@Test
public void testHybridOffHeapSegment() {
- try {
- testBigAndLittleEndianAccessUnaligned(new HybridMemorySegment(ByteBuffer.allocateDirect(11111)));
- }
- catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ testBigAndLittleEndianAccessUnaligned(new HybridMemorySegment(ByteBuffer.allocateDirect(11111)));
}
private void testBigAndLittleEndianAccessUnaligned(MemorySegment segment) {
http://git-wip-us.apache.org/repos/asf/flink/blob/e83217bd/flink-core/src/test/java/org/apache/flink/core/memory/HeapMemorySegmentTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/core/memory/HeapMemorySegmentTest.java b/flink-core/src/test/java/org/apache/flink/core/memory/HeapMemorySegmentTest.java
index d7a5b03..b2c16d9 100644
--- a/flink-core/src/test/java/org/apache/flink/core/memory/HeapMemorySegmentTest.java
+++ b/flink-core/src/test/java/org/apache/flink/core/memory/HeapMemorySegmentTest.java
@@ -45,27 +45,21 @@ public class HeapMemorySegmentTest extends MemorySegmentTestBase {
@Test
public void testHeapSegmentSpecifics() {
- try {
- final byte[] buffer = new byte[411];
- HeapMemorySegment seg = new HeapMemorySegment(buffer);
-
- assertFalse(seg.isFreed());
- assertFalse(seg.isOffHeap());
- assertEquals(buffer.length, seg.size());
- assertTrue(buffer == seg.getArray());
+ final byte[] buffer = new byte[411];
+ HeapMemorySegment seg = new HeapMemorySegment(buffer);
- ByteBuffer buf1 = seg.wrap(1, 2);
- ByteBuffer buf2 = seg.wrap(3, 4);
+ assertFalse(seg.isFreed());
+ assertFalse(seg.isOffHeap());
+ assertEquals(buffer.length, seg.size());
+ assertTrue(buffer == seg.getArray());
- assertTrue(buf1 != buf2);
- assertEquals(1, buf1.position());
- assertEquals(3, buf1.limit());
- assertEquals(3, buf2.position());
- assertEquals(7, buf2.limit());
- }
- catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ ByteBuffer buf1 = seg.wrap(1, 2);
+ ByteBuffer buf2 = seg.wrap(3, 4);
+
+ assertTrue(buf1 != buf2);
+ assertEquals(1, buf1.position());
+ assertEquals(3, buf1.limit());
+ assertEquals(3, buf2.position());
+ assertEquals(7, buf2.limit());
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/e83217bd/flink-core/src/test/java/org/apache/flink/core/memory/HybridOffHeapMemorySegmentTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/core/memory/HybridOffHeapMemorySegmentTest.java b/flink-core/src/test/java/org/apache/flink/core/memory/HybridOffHeapMemorySegmentTest.java
index b09697e..cf2d023 100644
--- a/flink-core/src/test/java/org/apache/flink/core/memory/HybridOffHeapMemorySegmentTest.java
+++ b/flink-core/src/test/java/org/apache/flink/core/memory/HybridOffHeapMemorySegmentTest.java
@@ -48,37 +48,31 @@ public class HybridOffHeapMemorySegmentTest extends MemorySegmentTestBase {
@Test
public void testHybridHeapSegmentSpecifics() {
- try {
- final ByteBuffer buffer = ByteBuffer.allocateDirect(411);
- HybridMemorySegment seg = new HybridMemorySegment(buffer);
-
- assertFalse(seg.isFreed());
- assertTrue(seg.isOffHeap());
- assertEquals(buffer.capacity(), seg.size());
- assertTrue(buffer == seg.getOffHeapBuffer());
-
- try {
- seg.getArray();
- fail("should throw an exception");
- }
- catch (IllegalStateException e) {
- // expected
- }
+ final ByteBuffer buffer = ByteBuffer.allocateDirect(411);
+ HybridMemorySegment seg = new HybridMemorySegment(buffer);
- ByteBuffer buf1 = seg.wrap(1, 2);
- ByteBuffer buf2 = seg.wrap(3, 4);
+ assertFalse(seg.isFreed());
+ assertTrue(seg.isOffHeap());
+ assertEquals(buffer.capacity(), seg.size());
+ assertTrue(buffer == seg.getOffHeapBuffer());
- assertTrue(buf1 != buffer);
- assertTrue(buf2 != buffer);
- assertTrue(buf1 != buf2);
- assertEquals(1, buf1.position());
- assertEquals(3, buf1.limit());
- assertEquals(3, buf2.position());
- assertEquals(7, buf2.limit());
+ try {
+ seg.getArray();
+ fail("should throw an exception");
}
- catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
+ catch (IllegalStateException e) {
+ // expected
}
+
+ ByteBuffer buf1 = seg.wrap(1, 2);
+ ByteBuffer buf2 = seg.wrap(3, 4);
+
+ assertTrue(buf1 != buffer);
+ assertTrue(buf2 != buffer);
+ assertTrue(buf1 != buf2);
+ assertEquals(1, buf1.position());
+ assertEquals(3, buf1.limit());
+ assertEquals(3, buf2.position());
+ assertEquals(7, buf2.limit());
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/e83217bd/flink-core/src/test/java/org/apache/flink/core/memory/HybridOnHeapMemorySegmentTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/core/memory/HybridOnHeapMemorySegmentTest.java b/flink-core/src/test/java/org/apache/flink/core/memory/HybridOnHeapMemorySegmentTest.java
index 55d333e..711326f 100644
--- a/flink-core/src/test/java/org/apache/flink/core/memory/HybridOnHeapMemorySegmentTest.java
+++ b/flink-core/src/test/java/org/apache/flink/core/memory/HybridOnHeapMemorySegmentTest.java
@@ -48,35 +48,29 @@ public class HybridOnHeapMemorySegmentTest extends MemorySegmentTestBase {
@Test
public void testHybridHeapSegmentSpecifics() {
- try {
- final byte[] buffer = new byte[411];
- HybridMemorySegment seg = new HybridMemorySegment(buffer);
+ final byte[] buffer = new byte[411];
+ HybridMemorySegment seg = new HybridMemorySegment(buffer);
+
+ assertFalse(seg.isFreed());
+ assertFalse(seg.isOffHeap());
+ assertEquals(buffer.length, seg.size());
+ assertTrue(buffer == seg.getArray());
- assertFalse(seg.isFreed());
- assertFalse(seg.isOffHeap());
- assertEquals(buffer.length, seg.size());
- assertTrue(buffer == seg.getArray());
-
- try {
- seg.getOffHeapBuffer();
- fail("should throw an exception");
- }
- catch (IllegalStateException e) {
- // expected
- }
-
- ByteBuffer buf1 = seg.wrap(1, 2);
- ByteBuffer buf2 = seg.wrap(3, 4);
-
- assertTrue(buf1 != buf2);
- assertEquals(1, buf1.position());
- assertEquals(3, buf1.limit());
- assertEquals(3, buf2.position());
- assertEquals(7, buf2.limit());
+ try {
+ seg.getOffHeapBuffer();
+ fail("should throw an exception");
}
- catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
+ catch (IllegalStateException e) {
+ // expected
}
+
+ ByteBuffer buf1 = seg.wrap(1, 2);
+ ByteBuffer buf2 = seg.wrap(3, 4);
+
+ assertTrue(buf1 != buf2);
+ assertEquals(1, buf1.position());
+ assertEquals(3, buf1.limit());
+ assertEquals(3, buf2.position());
+ assertEquals(7, buf2.limit());
}
}