You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/30 10:24:27 UTC
[1/2] incubator-ignite git commit: # ignite fixed tests methods
calculation
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1 9996c90ea -> d3d678709
# ignite fixed tests methods calculation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/310f8e87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/310f8e87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/310f8e87
Branch: refs/heads/ignite-1
Commit: 310f8e872f7355e80785c8ee622f0feeecfc12c1
Parents: 6fd75f9
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 30 12:22:36 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 30 12:22:36 2014 +0300
----------------------------------------------------------------------
.../org/gridgain/testframework/junits/GridAbstractTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/310f8e87/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
index 922acc4..5900c12 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
@@ -88,7 +88,7 @@ public abstract class GridAbstractTest extends TestCase {
static {
System.setProperty(IgniteSystemProperties.GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE, "10000");
-
+
Thread timer = new Thread(new GridTestClockTimer(), "gridgain-clock-for-tests");
timer.setDaemon(true);
@@ -1402,7 +1402,8 @@ public abstract class GridAbstractTest extends TestCase {
int cnt = 0;
for (Method m : GridAbstractTest.this.getClass().getMethods())
- if (m.getDeclaringClass().getName().startsWith("org.gridgain")) {
+ if (m.getDeclaringClass().getName().startsWith("org.gridgain") ||
+ m.getDeclaringClass().getName().startsWith("org.apache.ignite")) {
if (m.getName().startsWith("test") && Modifier.isPublic(m.getModifiers()))
cnt++;
}
[2/2] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d3d67870
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d3d67870
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d3d67870
Branch: refs/heads/ignite-1
Commit: d3d678709b1db1d7195a47040a92fa7dcf22ef44
Parents: 9996c90 310f8e8
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 30 12:23:22 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 30 12:23:22 2014 +0300
----------------------------------------------------------------------
.../org/gridgain/testframework/junits/GridAbstractTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3d67870/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------