Author: kamrul
Date: Tue Apr 10 23:31:25 2012
New Revision: 1312041
URL: http://svn.apache.org/viewvc?rev=1312041&view=rev
Log:
OOZIE-804 TestDecisionActionExecutor failing due to uninitialized conf.(virag
via Mohammad)
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/action/decision/TestDecisionActionExecutor.java
incubator/oozie/branches/branch-3.2/release-log.txt
Modified:
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/action/decision/TestDecisionActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/action/decision/TestDecisionActionExecutor.java?rev=1312041&r1=1312040&r2=1312041&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/action/decision/TestDecisionActionExecutor.java
(original)
+++
incubator/oozie/branches/branch-3.2/core/src/test/java/org/apache/oozie/action/decision/TestDecisionActionExecutor.java
Tue Apr 10 23:31:25 2012
@@ -140,64 +140,69 @@ public class TestDecisionActionExecutor
}
public void testDecision() throws Exception {
- ActionExecutor decision = new DecisionActionExecutor();
+ new Services().init();
+ try {
+ ActionExecutor decision = new DecisionActionExecutor();
- assertEquals(DecisionActionExecutor.ACTION_TYPE, decision.getType());
+ assertEquals(DecisionActionExecutor.ACTION_TYPE,
decision.getType());
- WorkflowActionBean action = new WorkflowActionBean();
- action.setConf("<switch xmlns='uri:oozie:workflow:0.1'>" +
+ WorkflowActionBean action = new WorkflowActionBean();
+ action.setConf("<switch xmlns='uri:oozie:workflow:0.1'>" +
"<case to='a'>true</case>" +
"<case to='b'>true</case>" +
"<case to='c'>false</case>" +
"<default to='d'/></switch>");
- decision.start(new Context(action), action);
- assertEquals(WorkflowAction.Status.DONE, action.getStatus());
- decision.end(new Context(action), action);
- assertEquals(WorkflowAction.Status.OK, action.getStatus());
- assertEquals("a", action.getExternalStatus());
+ decision.start(new Context(action), action);
+ assertEquals(WorkflowAction.Status.DONE, action.getStatus());
+ decision.end(new Context(action), action);
+ assertEquals(WorkflowAction.Status.OK, action.getStatus());
+ assertEquals("a", action.getExternalStatus());
- action.setConf("<switch xmlns='uri:oozie:workflow:0.1'>" +
+ action.setConf("<switch xmlns='uri:oozie:workflow:0.1'>" +
"<case to='a'>false</case>" +
"<case to='b'>true</case>" +
"<case to='c'>false</case>" +
"<default to='d'/></switch>");
- decision.start(new Context(action), action);
- assertEquals(WorkflowAction.Status.DONE, action.getStatus());
- decision.end(new Context(action), action);
- assertEquals(WorkflowAction.Status.OK, action.getStatus());
- assertEquals("b", action.getExternalStatus());
-
+ decision.start(new Context(action), action);
+ assertEquals(WorkflowAction.Status.DONE, action.getStatus());
+ decision.end(new Context(action), action);
+ assertEquals(WorkflowAction.Status.OK, action.getStatus());
+ assertEquals("b", action.getExternalStatus());
- action.setConf("<switch xmlns='uri:oozie:workflow:0.1'>" +
+ action.setConf("<switch xmlns='uri:oozie:workflow:0.1'>" +
"<case to='a'>false</case>" +
"<case to='b'>false</case>" +
"<case to='c'>false</case>" +
"<default to='d'/></switch>");
- decision.start(new Context(action), action);
- assertEquals(WorkflowAction.Status.DONE, action.getStatus());
- decision.end(new Context(action), action);
- assertEquals(WorkflowAction.Status.OK, action.getStatus());
- assertEquals("d", action.getExternalStatus());
+ decision.start(new Context(action), action);
+ assertEquals(WorkflowAction.Status.DONE, action.getStatus());
+ decision.end(new Context(action), action);
+ assertEquals(WorkflowAction.Status.OK, action.getStatus());
+ assertEquals("d", action.getExternalStatus());
- try {
- action.setConf("<wrong>" +
+ try {
+ action.setConf("<wrong>" +
"<case to='a'>false</case>" +
"<case to='b'>false</case>" +
"<case to='c'>false</case>" +
"<default to='d'/></switch>");
- decision.start(new Context(action), action);
- fail();
- }
- catch (ActionExecutorException ex) {
- assertEquals(ActionExecutorException.ErrorType.FAILED,
ex.getErrorType());
- assertEquals(DecisionActionExecutor.XML_ERROR, ex.getErrorCode());
+ decision.start(new Context(action), action);
+ fail();
+ }
+ catch (ActionExecutorException ex) {
+ assertEquals(ActionExecutorException.ErrorType.FAILED,
ex.getErrorType());
+ assertEquals(DecisionActionExecutor.XML_ERROR,
ex.getErrorCode());
+ }
+ catch (Exception ex) {
+ fail();
+ }
}
- catch (Exception ex) {
- fail();
+ finally {
+ Services.get().destroy();
}
}
}
Modified: incubator/oozie/branches/branch-3.2/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.2/release-log.txt?rev=1312041&r1=1312040&r2=1312041&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.2/release-log.txt (original)
+++ incubator/oozie/branches/branch-3.2/release-log.txt Tue Apr 10 23:31:25 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-804 TestDecisionActionExecutor failing due to uninitialized conf.(virag
via Mohammad)
OOZIE-805 TestCoordSubmitX failing.(Virag via Mohammad)
OOZIE-803 UP Remove HadoopAccessorService createFileSystem() method that takes
config only (tucu)
OOZIE-802 Add minicluster config as hadoop-site.xml for testcases (tucu)