You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2019/07/12 19:05:30 UTC
[flink] 03/10: [hotfix] [tests] Checkstyle fixes and minor code
cleanup in ResourceProfileTest and ResourceSpecTest
This is an automated email from the ASF dual-hosted git repository.
sewen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit c5072dfd17aa8340c66a29e5b8f402d80cd6bb76
Author: Stephan Ewen <se...@apache.org>
AuthorDate: Thu Jul 11 16:15:51 2019 +0200
[hotfix] [tests] Checkstyle fixes and minor code cleanup in ResourceProfileTest and ResourceSpecTest
---
.../api/common/operators/ResourceSpecTest.java | 17 +++++------
.../types/ResourceProfileTest.java | 33 ++++++++++++----------
2 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/operators/ResourceSpecTest.java b/flink-core/src/test/java/org/apache/flink/api/common/operators/ResourceSpecTest.java
old mode 100644
new mode 100755
index 5f1e7d1..c6aa04b
--- a/flink-core/src/test/java/org/apache/flink/api/common/operators/ResourceSpecTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/operators/ResourceSpecTest.java
@@ -18,13 +18,14 @@
package org.apache.flink.api.common.operators;
-import org.apache.flink.util.InstantiationUtil;
+import org.apache.flink.core.testutils.CommonTestUtils;
import org.apache.flink.util.TestLogger;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
/**
@@ -80,8 +81,8 @@ public class ResourceSpecTest extends TestLogger {
public void testEquals() throws Exception {
ResourceSpec rs1 = ResourceSpec.newBuilder().setCpuCores(1.0).setHeapMemoryInMB(100).build();
ResourceSpec rs2 = ResourceSpec.newBuilder().setCpuCores(1.0).setHeapMemoryInMB(100).build();
- assertTrue(rs1.equals(rs2));
- assertTrue(rs2.equals(rs1));
+ assertEquals(rs1, rs2);
+ assertEquals(rs2, rs1);
ResourceSpec rs3 = ResourceSpec.newBuilder().
setCpuCores(1.0).
@@ -93,14 +94,14 @@ public class ResourceSpecTest extends TestLogger {
setHeapMemoryInMB(100).
setGPUResource(1).
build();
- assertFalse(rs3.equals(rs4));
+ assertNotEquals(rs3, rs4);
ResourceSpec rs5 = ResourceSpec.newBuilder().
setCpuCores(1.0).
setHeapMemoryInMB(100).
setGPUResource(2.2).
build();
- assertTrue(rs3.equals(rs5));
+ assertEquals(rs3, rs5);
}
@Test
@@ -119,7 +120,7 @@ public class ResourceSpecTest extends TestLogger {
setHeapMemoryInMB(100).
setGPUResource(1).
build();
- assertFalse(rs3.hashCode() == rs4.hashCode());
+ assertNotEquals(rs3.hashCode(), rs4.hashCode());
ResourceSpec rs5 = ResourceSpec.newBuilder().
setCpuCores(1.0).
@@ -152,8 +153,8 @@ public class ResourceSpecTest extends TestLogger {
setHeapMemoryInMB(100).
setGPUResource(1.1).
build();
- byte[] buffer = InstantiationUtil.serializeObject(rs1);
- ResourceSpec rs2 = InstantiationUtil.deserializeObject(buffer, ClassLoader.getSystemClassLoader());
+
+ ResourceSpec rs2 = CommonTestUtils.createCopySerializable(rs1);
assertEquals(rs1, rs2);
}
}
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/types/ResourceProfileTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/types/ResourceProfileTest.java
old mode 100644
new mode 100755
index f80234b..b608ca1
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/types/ResourceProfileTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/types/ResourceProfileTest.java
@@ -27,9 +27,13 @@ import java.util.Collections;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+/**
+ * Tests for the {@link ResourceProfile}.
+ */
public class ResourceProfileTest {
@Test
@@ -81,7 +85,7 @@ public class ResourceProfileTest {
public void testEquals() throws Exception {
ResourceSpec rs1 = ResourceSpec.newBuilder().setCpuCores(1.0).setHeapMemoryInMB(100).build();
ResourceSpec rs2 = ResourceSpec.newBuilder().setCpuCores(1.0).setHeapMemoryInMB(100).build();
- assertTrue(ResourceProfile.fromResourceSpec(rs1, 0).equals(ResourceProfile.fromResourceSpec(rs2, 0)));
+ assertEquals(ResourceProfile.fromResourceSpec(rs1, 0), ResourceProfile.fromResourceSpec(rs2, 0));
ResourceSpec rs3 = ResourceSpec.newBuilder().
setCpuCores(1.0).
@@ -93,14 +97,14 @@ public class ResourceProfileTest {
setHeapMemoryInMB(100).
setGPUResource(1.1).
build();
- assertFalse(ResourceProfile.fromResourceSpec(rs3, 0).equals(ResourceProfile.fromResourceSpec(rs4, 0)));
+ assertNotEquals(ResourceProfile.fromResourceSpec(rs3, 0), ResourceProfile.fromResourceSpec(rs4, 0));
ResourceSpec rs5 = ResourceSpec.newBuilder().
setCpuCores(1.0).
setHeapMemoryInMB(100).
setGPUResource(2.2).
build();
- assertTrue(ResourceProfile.fromResourceSpec(rs3, 100).equals(ResourceProfile.fromResourceSpec(rs5, 100)));
+ assertEquals(ResourceProfile.fromResourceSpec(rs3, 100), ResourceProfile.fromResourceSpec(rs5, 100));
ResourceProfile rp1 = new ResourceProfile(1.0, 100, 100, 100, 100, 100, Collections.emptyMap());
ResourceProfile rp2 = new ResourceProfile(1.1, 100, 100, 100, 100, 100, Collections.emptyMap());
@@ -111,13 +115,13 @@ public class ResourceProfileTest {
ResourceProfile rp7 = new ResourceProfile(1.0, 100, 100, 100, 100, 110, Collections.emptyMap());
ResourceProfile rp8 = new ResourceProfile(1.0, 100, 100, 100, 100, 100, Collections.emptyMap());
- assertFalse(rp1.equals(rp2));
- assertFalse(rp1.equals(rp3));
- assertFalse(rp1.equals(rp4));
- assertFalse(rp1.equals(rp5));
- assertFalse(rp1.equals(rp6));
- assertFalse(rp1.equals(rp7));
- assertTrue(rp1.equals(rp8));
+ assertNotEquals(rp1, rp2);
+ assertNotEquals(rp1, rp3);
+ assertNotEquals(rp1, rp4);
+ assertNotEquals(rp1, rp5);
+ assertNotEquals(rp1, rp6);
+ assertNotEquals(rp1, rp7);
+ assertEquals(rp1, rp8);
}
@Test
@@ -142,7 +146,6 @@ public class ResourceProfileTest {
assertEquals(1, ResourceProfile.fromResourceSpec(rs3, 0).compareTo(ResourceProfile.fromResourceSpec(rs4, 0)));
assertEquals(-1, ResourceProfile.fromResourceSpec(rs4, 0).compareTo(ResourceProfile.fromResourceSpec(rs3, 0)));
-
ResourceSpec rs5 = ResourceSpec.newBuilder().
setCpuCores(1.0).
setHeapMemoryInMB(100).
@@ -194,11 +197,11 @@ public class ResourceProfileTest {
@Test
public void testMergeWithOverflow() throws Exception {
- final double LARGE_DOUBLE = Double.MAX_VALUE - 1.0;
- final int LARGE_INTEGER = Integer.MAX_VALUE - 100;
+ final double largeDouble = Double.MAX_VALUE - 1.0;
+ final int largeInteger = Integer.MAX_VALUE - 100;
ResourceProfile rp1 = new ResourceProfile(3.0, 300, 300, 300, 300, 300, Collections.emptyMap());
- ResourceProfile rp2 = new ResourceProfile(LARGE_DOUBLE, LARGE_INTEGER, LARGE_INTEGER, LARGE_INTEGER, LARGE_INTEGER, LARGE_INTEGER, Collections.emptyMap());
+ ResourceProfile rp2 = new ResourceProfile(largeDouble, largeInteger, largeInteger, largeInteger, largeInteger, largeInteger, Collections.emptyMap());
assertEquals(ResourceProfile.ANY, rp2.merge(rp2));
assertEquals(ResourceProfile.ANY, rp2.merge(rp1));
@@ -220,7 +223,7 @@ public class ResourceProfileTest {
assertEquals(rp5, rp4.subtract(rp1));
try {
- ResourceProfile ignored = rp1.subtract(rp2);
+ rp1.subtract(rp2);
fail("The subtract should failed due to trying to subtract a larger resource");
} catch (IllegalArgumentException ex) {
// Ignore ex.