Repository: ignite Updated Branches: refs/heads/ignite-7708 69d67f01b -> af17e63df
IGNITE-7708 Debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/af17e63d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/af17e63d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/af17e63d Branch: refs/heads/ignite-7708 Commit: af17e63df5542e005344249e77b419c8ba1915a9 Parents: 69d67f0 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Tue Apr 17 11:21:51 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Tue Apr 17 11:21:51 2018 +0300 ---------------------------------------------------------------------- .../ConfigVariationsTestSuiteBuilder.java | 6 +++--- .../testframework/junits/GridAbstractTest.java | 22 +++++++++++++------- .../IgniteConfigVariationsAbstractTest.java | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/af17e63d/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsTestSuiteBuilder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsTestSuiteBuilder.java b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsTestSuiteBuilder.java index 94e56c9..a2a4a96 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsTestSuiteBuilder.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsTestSuiteBuilder.java @@ -225,15 +225,15 @@ public class ConfigVariationsTestSuiteBuilder { boolean startCache = i == 0; boolean stopCache = i + 1 == testedNodeCnt; - System.out.println("Building multi-node test suite [clsSuffix=" + cfg.description() + - ", testedNode=" + i + ", stopNodes=" + stopNodes + ']'); - VariationsTestsConfig cfg0 = new VariationsTestsConfig( cfg.configurationFactory(), cfg.description() + "-node-" + i, stopNodes, startCache, stopCache, cfg.cacheStartMode(), cfg.gridCount(), i, withClients, !skipWaitParMapExchange); + System.out.println("Building multi-node test suite [clsSuffix=" + cfg0.description() + + ", testedNode=" + i + ", stopNodes=" + stopNodes + ']'); + suite.addTest(new IgniteConfigVariationsTestSuite(cls, cfg0)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/af17e63d/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index d3999be..2e2cc98 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -574,9 +574,8 @@ public abstract class GridAbstractTest extends TestCase { TestCounters cntrs = getTestCounters(); - if (isDebug()) - info("Test counters [numOfTests=" + cntrs.getNumberOfTests() + ", started=" + cntrs.getStarted() + - ", stopped=" + cntrs.getStopped() + ']'); + info("Test counters [numOfTests=" + cntrs.getNumberOfTests() + ", started=" + cntrs.getStarted() + + ", stopped=" + cntrs.getStopped() + ']'); if (cntrs.isReset()) { info("Resetting test counters."); @@ -1680,7 +1679,7 @@ public abstract class GridAbstractTest extends TestCase { TestCounters cntrs = getTestCounters(); info("Test counters [numOfTests=" + cntrs.getNumberOfTests() + ", started=" + cntrs.getStarted() + - ", stopped=" + cntrs.getStopped() + ']'); + ", stopped=" + cntrs.getStopped() + ", test=" + this + ']'); try { afterTest(); @@ -2501,16 +2500,25 @@ public abstract class GridAbstractTest extends TestCase { if (numOfTests == -1) { GridAbstractTest this0 = GridAbstractTest.this; + info("Counting the number of tests in the test: " + GridAbstractTest.this + " " + this0.testDescription()); + int cnt; - if (this0.forceTestCnt) + if (this0.forceTestCnt) { cnt = this0.testCnt; + + info("Number of tests is enforced: " + this0.testCnt); + } else { cnt = 0; - for (Method m : this0.getClass().getMethods()) - if (m.getName().startsWith("test") && Modifier.isPublic(m.getModifiers())) + for (Method m : this0.getClass().getMethods()) { + if (m.getName().startsWith("test") && Modifier.isPublic(m.getModifiers())) { + info("Counting test method: " + m.getName()); + cnt++; + } + } } numOfTests = cnt; http://git-wip-us.apache.org/repos/asf/ignite/blob/af17e63d/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java index f1ca8f8..c4862bb 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java @@ -176,7 +176,7 @@ public abstract class IgniteConfigVariationsAbstractTest extends GridCommonAbstr if (testsCfg.withClients()) resCfg.setClientMode(expectedClient(igniteInstanceName)); - info("Creating cache configuration [instanceName=" + igniteInstanceName + ", cfg=" + cfg + ']'); + info("Creating configuration [instanceName=" + igniteInstanceName + ", cfg=" + cfg + ']'); return resCfg; }
