Repository: ignite Updated Branches: refs/heads/ignite-1758-debug f9b1df04d -> a735872f4
ignite-1758 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a735872f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a735872f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a735872f Branch: refs/heads/ignite-1758-debug Commit: a735872f45556b8e1dbac10bbc17ffd9d4fd8ef8 Parents: f9b1df0 Author: sboikov <[email protected]> Authored: Tue Nov 10 19:11:22 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Nov 10 19:11:22 2015 +0300 ---------------------------------------------------------------------- .../testframework/junits/GridAbstractTest.java | 30 ++++++++++++++------ 1 file changed, 22 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a735872f/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 e5d0a6b..3e41979 100644 --- 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 @@ -1117,20 +1117,34 @@ public abstract class GridAbstractTest extends TestCase { cfg.setNodeId(null); - if (gridName != null && gridName.startsWith(getTestGridName()) && gridName.matches(".*\\d")) { + if (gridName != null && gridName.matches(".*\\d")) { String idStr = UUID.randomUUID().toString(); - String idxStr = String.valueOf(getTestGridIndex(gridName)); + if (gridName.startsWith(getTestGridName())) { + String idxStr = String.valueOf(getTestGridIndex(gridName)); - while (idxStr.length() < 5) - idxStr = '0' + idxStr; + while (idxStr.length() < 5) + idxStr = '0' + idxStr; - char[] chars = idStr.toCharArray(); + char[] chars = idStr.toCharArray(); - for (int i = 0; i < idxStr.length(); i++) - chars[chars.length - idxStr.length() + i] = idxStr.charAt(i); + for (int i = 0; i < idxStr.length(); i++) + chars[chars.length - idxStr.length() + i] = idxStr.charAt(i); - cfg.setNodeId(UUID.fromString(new String(chars))); + cfg.setNodeId(UUID.fromString(new String(chars))); + } + else { + char[] chars = idStr.toCharArray(); + + chars[0] = gridName.charAt(gridName.length() - 1); + chars[1] = '0'; + + chars[chars.length - 3] = '0'; + chars[chars.length - 2] = '0'; + chars[chars.length - 1] = gridName.charAt(gridName.length() - 1); + + cfg.setNodeId(UUID.fromString(new String(chars))); + } } if (isMultiJvm())
