flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [2/3] git commit: [FLINK-1077] Fix unstable test CliFrontendPackageProgramTest
Date Tue, 23 Sep 2014 23:48:22 GMT
[FLINK-1077] Fix unstable test CliFrontendPackageProgramTest


Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/bd4197ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/bd4197ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/bd4197ec

Branch: refs/heads/master
Commit: bd4197ec053d82606fac7ddd2f1a7fee8a804e52
Parents: d3ef531
Author: Stephan Ewen <sewen@apache.org>
Authored: Wed Sep 24 00:12:27 2014 +0200
Committer: Stephan Ewen <sewen@apache.org>
Committed: Wed Sep 24 00:36:51 2014 +0200

----------------------------------------------------------------------
 .../flink/client/CliFrontendPackageProgramTest.java  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/bd4197ec/flink-clients/src/test/java/org/apache/flink/client/CliFrontendPackageProgramTest.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/test/java/org/apache/flink/client/CliFrontendPackageProgramTest.java
b/flink-clients/src/test/java/org/apache/flink/client/CliFrontendPackageProgramTest.java
index 97ca131..31df1f7 100644
--- a/flink-clients/src/test/java/org/apache/flink/client/CliFrontendPackageProgramTest.java
+++ b/flink-clients/src/test/java/org/apache/flink/client/CliFrontendPackageProgramTest.java
@@ -25,7 +25,6 @@ import static org.apache.flink.client.CliFrontendTestUtils.getNonJarFilePath;
 import static org.apache.flink.client.CliFrontendTestUtils.getTestJarPath;
 import static org.apache.flink.client.CliFrontendTestUtils.pipeSystemOutToNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
@@ -233,7 +232,7 @@ public class CliFrontendPackageProgramTest {
 	 */
 	@Test
 	public void testPlanWithExternalClass() throws CompilerException, ProgramInvocationException
{
-		final Boolean callme[] = { false }; // create a final object reference, to be able to change
its val later
+		final boolean[] callme = { false }; // create a final object reference, to be able to change
its val later
 		try {
 			String[] parameters = {getTestJarPath(), "-c", TEST_JAR_CLASSLOADERTEST_CLASS , "some",
"program"};
 			CommandLine line = new PosixParser().parse(CliFrontend.getProgramSpecificOptions(new Options()),
parameters, false);
@@ -247,9 +246,12 @@ public class CliFrontendPackageProgramTest {
 			ClassLoader testClassLoader = new ClassLoader(prog.getUserCodeClassLoader()) {
 				@Override
 				public Class<?> loadClass(String name) throws ClassNotFoundException {
-					assertEquals("org.apache.hadoop.hive.ql.io.RCFileInputFormat", name);
-					callme[0] = true;
-					return String.class; // Intentionally return the wrong class.
+					if ("org.apache.hadoop.hive.ql.io.RCFileInputFormat".equals(name)) {
+						callme[0] = true;
+						return String.class; // Intentionally return the wrong class.
+					} else {
+						return super.loadClass(name);
+					}
 				}
 			};
 			when(prog.getUserCodeClassLoader()).thenReturn(testClassLoader);
@@ -262,7 +264,8 @@ public class CliFrontendPackageProgramTest {
 			Client cli = new Client(c, getClass().getClassLoader());
 			
 			cli.getOptimizedPlanAsJson(prog, 666);
-		} catch(ProgramInvocationException pie) {
+		}
+		catch(ProgramInvocationException pie) {
 			assertTrue("Classloader was not called", callme[0]);
 			// class not found exception is expected as some point
 			if( ! ( pie.getCause() instanceof ClassNotFoundException ) ) {


Mime
View raw message