#ignite-164: fix JettyRestProcessorAbstractSelfTest tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bcec7d9f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bcec7d9f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bcec7d9f Branch: refs/heads/ignite-111 Commit: bcec7d9feadbd0d1b6769148508db986d58671df Parents: e750b66 Author: ivasilinets <[email protected]> Authored: Thu Feb 5 21:32:40 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Thu Feb 5 21:32:40 2015 +0300 ---------------------------------------------------------------------- .../processors/rest/JettyRestProcessorAbstractSelfTest.java | 2 +- .../org/apache/ignite/testframework/junits/GridAbstractTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bcec7d9f/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java index c5a6b00..bf954b2 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java @@ -65,7 +65,7 @@ abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestProcessorS * @throws Exception If failed. */ private String content(Map<String, String> params) throws Exception { - String addr = "http://"; + LOC_HOST + ":" + restPort() + "/ignite?"; + String addr = "http://"; + LOC_HOST + ":" + restPort() + "/gridgain?"; for (Map.Entry<String, String> e : params.entrySet()) addr += e.getKey() + '=' + e.getValue() + '&'; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bcec7d9f/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 3068088..d7bf79a 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 @@ -96,7 +96,7 @@ public abstract class GridAbstractTest extends TestCase { static { System.setProperty(IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, "10000"); - Thread timer = new Thread(new GridTestClockTimer(), "gridgain-clock-for-tests"); + Thread timer = new Thread(new GridTestClockTimer(), "ignite-clock-for-tests"); timer.setDaemon(true);
