Fix unit tests

metamx · Feb 1, 2011 · a822b61 · a822b61
1 parent 1aec3f6
commit a822b61
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/azkaban/src/unit/azkaban/jobs/builtin/JavaJobTest.java b/azkaban/src/unit/azkaban/jobs/builtin/JavaJobTest.java
@@ -50,7 +50,7 @@ public class JavaJobTest
   public static void init() {
     // get the classpath
     Properties prop = System.getProperties();
-    classPaths = prop.getProperty("java.class.path", null);
+    classPaths = String.format("'%s'", prop.getProperty("java.class.path", null));
 
     long time = (new Date()).getTime();
    inputFile = "/tmp/azkaban_input_" + time;
@@ -86,7 +86,7 @@ public void setUp() {
     props.put(AbstractProcessJob.WORKING_DIR, ".");
 
     EasyMock.expect(descriptor.getId()).andReturn("java").times(1);
-    EasyMock.expect(descriptor.getResolvedProps()).andReturn(props).times(1);
+    EasyMock.expect(descriptor.getProps()).andReturn(props).times(1);
     EasyMock.expect(descriptor.getFullPath()).andReturn(".").times(1);
 
     EasyMock.replay(descriptor);

diff --git a/azkaban/src/unit/azkaban/jobs/builtin/ProcessJobTest.java b/azkaban/src/unit/azkaban/jobs/builtin/ProcessJobTest.java
@@ -26,7 +26,7 @@ public void setUp() {
     props.put(AbstractProcessJob.WORKING_DIR, ".");
 
     EasyMock.expect(descriptor.getId()).andReturn("process").times(1);
-    EasyMock.expect(descriptor.getResolvedProps()).andReturn(props).times(1);
+    EasyMock.expect(descriptor.getProps()).andReturn(props).times(1);
     EasyMock.expect(descriptor.getFullPath()).andReturn(".").times(1);
 
     EasyMock.replay(descriptor);

diff --git a/azkaban/src/unit/azkaban/jobs/builtin/PythonJobTest.java b/azkaban/src/unit/azkaban/jobs/builtin/PythonJobTest.java
@@ -85,8 +85,7 @@ public void testPythonJob() {
     props.put("t",  "90");
 
     EasyMock.expect(descriptor.getId()).andReturn("script").times(1);
-    EasyMock.expect(descriptor.getProps()).andReturn(props).times(2);
-    EasyMock.expect(descriptor.getResolvedProps()).andReturn(props).times(1);
+    EasyMock.expect(descriptor.getProps()).andReturn(props).times(3);
     EasyMock.expect(descriptor.getFullPath()).andReturn(".").times(1);
     EasyMock.replay(descriptor);
     job = new PythonJob(descriptor);