minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/274679d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/274679d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/274679d7 Branch: refs/heads/sprint-1 Commit: 274679d74cf482703e0f78493287e5253df605c5 Parents: ead7676 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Sun Feb 15 22:42:31 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Sun Feb 15 22:42:31 2015 +0300 ---------------------------------------------------------------------- .../fifoqueue/GridFifoQueueCollisionSpiSelfTest.java | 12 ++++++++---- .../GridPriorityQueueCollisionSpiSelfTest.java | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/274679d7/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiSelfTest.java index c702ac1..0e71efa 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/fifoqueue/GridFifoQueueCollisionSpiSelfTest.java @@ -33,7 +33,11 @@ public class GridFifoQueueCollisionSpiSelfTest extends GridSpiAbstractTest<FifoQ * @throws Exception If failed. */ public void testCollision0() throws Exception { - GridCollisionTestContext cntx = createContext(15, 20); + int activeCnt = 2; + + assert getSpi().getParallelJobsNumber() > activeCnt; + + GridCollisionTestContext cntx = createContext(activeCnt, getSpi().getParallelJobsNumber() - activeCnt); Collection<CollisionJobContext> activeJobs = cntx.activeJobs(); Collection<CollisionJobContext> passiveJobs = cntx.waitingJobs(); @@ -48,10 +52,10 @@ public class GridFifoQueueCollisionSpiSelfTest extends GridSpiAbstractTest<FifoQ int i = 0; for (CollisionJobContext ctx : activeJobs) { - if (i++ < 15) - assert !((GridTestCollisionJobContext)ctx).isActivated(); + if (i++ < activeCnt) + assert !((GridTestCollisionJobContext)ctx).isActivated() : i; else - assert ((GridTestCollisionJobContext)ctx).isActivated(); + assert ((GridTestCollisionJobContext)ctx).isActivated() : i; assert !((GridTestCollisionJobContext)ctx).isCanceled(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/274679d7/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java index a1565f5..40e5b28 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/collision/priorityqueue/GridPriorityQueueCollisionSpiSelfTest.java @@ -110,6 +110,8 @@ public class GridPriorityQueueCollisionSpiSelfTest extends GridSpiAbstractTest<P List<CollisionJobContext> activeJobs = makeContextList(null); List<CollisionJobContext> passiveJobs = makeContextList(null); + getSpi().setParallelJobsNumber(30); + getSpi().onCollision(new GridCollisionTestContext(activeJobs, passiveJobs)); for (CollisionJobContext ctx : passiveJobs) {
