You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2014/06/10 21:35:01 UTC
[04/34] git commit: Remove setUserCodeClassLoader() from
PackagedProgram and use partial mock in respective test case
Remove setUserCodeClassLoader() from PackagedProgram and use partial mock in respective test case
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/a300e44b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/a300e44b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/a300e44b
Branch: refs/heads/release-0.5.1
Commit: a300e44bfb66fb3862e36d8700eb6180124df001
Parents: 6c4b85c
Author: uce <u....@fu-berlin.de>
Authored: Thu Jun 5 11:25:59 2014 +0200
Committer: Robert Metzger <rm...@apache.org>
Committed: Tue Jun 10 21:24:43 2014 +0200
----------------------------------------------------------------------
.../client/program/PackagedProgram.java | 6 ------
.../client/CliFrontendPackageProgramTest.java | 18 +++++++++++-------
2 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/a300e44b/stratosphere-clients/src/main/java/eu/stratosphere/client/program/PackagedProgram.java
----------------------------------------------------------------------
diff --git a/stratosphere-clients/src/main/java/eu/stratosphere/client/program/PackagedProgram.java b/stratosphere-clients/src/main/java/eu/stratosphere/client/program/PackagedProgram.java
index a0fc1b7..6e09ad4 100644
--- a/stratosphere-clients/src/main/java/eu/stratosphere/client/program/PackagedProgram.java
+++ b/stratosphere-clients/src/main/java/eu/stratosphere/client/program/PackagedProgram.java
@@ -314,12 +314,6 @@ public class PackagedProgram {
return this.userCodeClassLoader;
}
- public void setUserCodeClassLoader(ClassLoader cl) {
- this.userCodeClassLoader = cl;
- }
-
-
-
public List<File> getAllLibraries() {
List<File> libs = new ArrayList<File>(this.extractedTempLibraries.size() + 1);
libs.add(jarFile);
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/a300e44b/stratosphere-clients/src/test/java/eu/stratosphere/client/CliFrontendPackageProgramTest.java
----------------------------------------------------------------------
diff --git a/stratosphere-clients/src/test/java/eu/stratosphere/client/CliFrontendPackageProgramTest.java b/stratosphere-clients/src/test/java/eu/stratosphere/client/CliFrontendPackageProgramTest.java
index 00cda03..bc9b0d2 100644
--- a/stratosphere-clients/src/test/java/eu/stratosphere/client/CliFrontendPackageProgramTest.java
+++ b/stratosphere-clients/src/test/java/eu/stratosphere/client/CliFrontendPackageProgramTest.java
@@ -22,6 +22,8 @@ import static eu.stratosphere.client.CliFrontendTestUtils.getTestJarPath;
import static eu.stratosphere.client.CliFrontendTestUtils.pipeSystemOutToNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
@@ -236,19 +238,21 @@ public class CliFrontendPackageProgramTest {
Object result = frontend.buildProgram(line);
assertTrue(result instanceof PackagedProgram);
- PackagedProgram prog = (PackagedProgram) result;
-
- Assert.assertArrayEquals(new String[] {"some", "program"}, prog.getArguments());
- Assert.assertEquals(TEST_JAR_CLASSLOADERTEST_CLASS, prog.getMainClassName());
- prog.setUserCodeClassLoader(new ClassLoader(prog.getUserCodeClassLoader()) {
+ PackagedProgram prog = spy((PackagedProgram) result);
+
+ ClassLoader testClassLoader = new ClassLoader(prog.getUserCodeClassLoader()) {
@Override
public Class<?> loadClass(String name) throws ClassNotFoundException {
assertTrue(name.equals("org.apache.hadoop.hive.ql.io.RCFileInputFormat"));
callme[0] = true;
return String.class; // Intentionally return the wrong class.
}
- });
-
+ };
+ when(prog.getUserCodeClassLoader()).thenReturn(testClassLoader);
+
+ Assert.assertArrayEquals(new String[]{"some", "program"}, prog.getArguments());
+ Assert.assertEquals(TEST_JAR_CLASSLOADERTEST_CLASS, prog.getMainClassName());
+
Configuration c = new Configuration();
c.setString(ConfigConstants.JOB_MANAGER_IPC_ADDRESS_KEY, "devil");
Client cli = new Client(c);