svn commit: r1377162 - in /incubator/oozie/trunk: core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java release-log.txt

[vi...@apache.org]

Author: virag
Date: Sat Aug 25 00:27:22 2012
New Revision: 1377162

URL: http://svn.apache.org/viewvc?rev=1377162&view=rev
Log:
OOZIE-969 Unit tests in TestStatusTransitService failing due to change in CoordKillX (mona via virag)

Modified:
    incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
    incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java
    incubator/oozie/trunk/release-log.txt

Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java?rev=1377162&r1=1377161&r2=1377162&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java Sat Aug 25 00:27:22 2012
@@ -28,7 +28,7 @@ import org.apache.oozie.command.wf.KillX
 import org.apache.oozie.command.CommandException;
 import org.apache.oozie.command.KillTransitionXCommand;
 import org.apache.oozie.command.PreconditionException;
-import org.apache.oozie.executor.jpa.BulkUpdateInsertJPAExecutor;
+import org.apache.oozie.executor.jpa.BulkUpdateInsertForCoordActionStatusJPAExecutor;
 import org.apache.oozie.executor.jpa.CoordJobGetActionsNotCompletedJPAExecutor;
 import org.apache.oozie.executor.jpa.CoordJobGetJPAExecutor;
 import org.apache.oozie.executor.jpa.JPAExecutorException;
@@ -160,7 +160,7 @@ public class CoordKillXCommand extends K
     @Override
     public void performWrites() throws CommandException {
         try {
-            jpaService.execute(new BulkUpdateInsertJPAExecutor(updateList, null));
+            jpaService.execute(new BulkUpdateInsertForCoordActionStatusJPAExecutor(updateList, null));
         }
         catch (JPAExecutorException e) {
             throw new CommandException(e);

Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java?rev=1377162&r1=1377161&r2=1377162&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java Sat Aug 25 00:27:22 2012
@@ -198,7 +198,7 @@ public class TestStatusTransitService ex
         assertEquals(CoordinatorJob.Status.KILLED, coordJob.getStatus());
         assertEquals(CoordinatorAction.Status.KILLED, coordAction.getStatus());
         assertEquals(WorkflowJob.Status.KILLED, wfJob.getStatus());
-        //assertEquals(false, coordAction.isPending());
+        assertEquals(false, coordAction.isPending());
 
         Runnable runnable = new StatusTransitRunnable();
         runnable.run();
@@ -215,7 +215,7 @@ public class TestStatusTransitService ex
         });
 
         coordJob = jpaService.execute(coordJobGetCmd);
-        //assertEquals(false, coordJob.isPending());
+        assertEquals(false, coordJob.isPending());
     }
 
     /**

Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1377162&r1=1377161&r2=1377162&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Sat Aug 25 00:27:22 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.3.0 release (trunk - unreleased)
 
+OOZIE-969 Unit tests in TestStatusTransitService failing due to change in CoordKillX (mona via virag)
 OOZIE-965 Allow the timezone attribute in coordinator jobs to use a format like GMT-#### (rkanter via tucu)
 OOZIE-848 Bulk Monitoring API - Consolidated view of jobs (mona via virag)
 OOZIE-934 Exception reporting during Services startup is inadequate (mona via virag)