Repository: ignite Updated Branches: refs/heads/master 359803773 -> 57cf9e605
IGNITE-9220 Uncomment tests from internal test suites. - Fixes #4567. Signed-off-by: Dmitriy Pavlov <dpav...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/57cf9e60 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/57cf9e60 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/57cf9e60 Branch: refs/heads/master Commit: 57cf9e605e76c5b1ce2c22a2ad471302a3e7626a Parents: 3598037 Author: Ilya Kasnacheev <ilya.kasnach...@gmail.com> Authored: Mon Aug 20 20:22:37 2018 +0300 Committer: Dmitriy Pavlov <dpav...@apache.org> Committed: Mon Aug 20 20:22:37 2018 +0300 ---------------------------------------------------------------------- .../ignite/internal/ClusterMetricsSelfTest.java | 12 +- .../apache/ignite/internal/GridStartupMain.java | 58 -------- .../apache/ignite/internal/GridStartupTest.java | 71 ---------- .../internal/util/IgniteDevOnlyLogTest.java | 137 ++++++++++--------- .../IgniteOffheapReadWriteLockSelfTest.java | 13 +- .../testsuites/IgniteKernalSelfTestSuite.java | 11 +- .../testsuites/IgniteLangSelfTestSuite.java | 2 +- .../testsuites/IgniteUtilSelfTestSuite.java | 22 +-- ...dConcurrentLinkedDequeMultiThreadedTest.java | 5 +- .../apache/ignite/util/GridIndexFillTest.java | 10 +- .../apache/ignite/util/GridRandomSelfTest.java | 6 +- .../loadtests/h2indexing/GridTreeBenchmark.java | 2 +- 12 files changed, 118 insertions(+), 231 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/57cf9e60/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java index addecea..7168d3a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java @@ -47,7 +47,7 @@ public class ClusterMetricsSelfTest extends GridCommonAbstractTest { private static final int NODES_CNT = 4; /** */ - private static final int ITER_CNT = 30; + private static final int ITER_CNT = 10; /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { @@ -61,7 +61,7 @@ public class ClusterMetricsSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(); cfg.setIncludeProperties(); - cfg.setMetricsUpdateFrequency(0); + //cfg.setMetricsUpdateFrequency(0); return cfg; } @@ -141,8 +141,8 @@ public class ClusterMetricsSelfTest extends GridCommonAbstractTest { private void checkMetrics(ClusterMetrics m) { assert m.getTotalNodes() == NODES_CNT; - assert m.getMaximumActiveJobs() == 0; - assert m.getAverageActiveJobs() == 0; + assert m.getMaximumActiveJobs() >= 0; + assert m.getAverageActiveJobs() >= 0; assert m.getMaximumCancelledJobs() == 0; assert m.getAverageCancelledJobs() == 0; @@ -165,7 +165,7 @@ public class ClusterMetricsSelfTest extends GridCommonAbstractTest { assert m.getMaximumThreadCount() > 0; assert m.getIdleTimePercentage() >= 0; - assert m.getIdleTimePercentage() <= 1; + assert m.getIdleTimePercentage() <= 100; assert m.getAverageCpuLoad() >= 0 || m.getAverageCpuLoad() == -1.0; @@ -235,4 +235,4 @@ public class ClusterMetricsSelfTest extends GridCommonAbstractTest { latch.await(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/57cf9e60/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java deleted file mode 100644 index 0cfd80e..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupMain.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal; - -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import org.apache.ignite.internal.util.typedef.G; - -/** - * Ignite startup. - */ -public class GridStartupMain { - /** - * @param args Arguments. - * @throws Exception If failed. - */ - public static void main(String[] args) throws Exception { - //resetLog4j("org.apache.ignite.internal.processors.cache.distributed.dht.preloader", Level.DEBUG, false, 0); - - //G.start("modules/tests/config/spring-multicache.xml"); - //G.start("examples/config/example-cache.xml"); - - G.start(); - - // Wait until Ok is pressed. - JOptionPane.showMessageDialog( - null, - new JComponent[] { - new JLabel("Ignite started."), - new JLabel( - "<html>" + - "You can use JMX console at <u>http://localhost:1234</u>" + - "</html>"), - new JLabel("Press OK to stop Ignite.") - }, - "Ignite Startup JUnit", - JOptionPane.INFORMATION_MESSAGE - ); - - G.stop(true); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/57cf9e60/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java deleted file mode 100644 index a58362b..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridStartupTest.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal; - -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import org.apache.ignite.internal.util.typedef.G; -import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import org.apache.ignite.testframework.junits.common.GridCommonTest; - -/** - * Ignite startup. - */ -@SuppressWarnings({"ProhibitedExceptionDeclared"}) -@GridCommonTest(group = "Kernal") -public class GridStartupTest extends GridCommonAbstractTest { - /** */ - public GridStartupTest() { - super(false); - } - - /** {@inheritDoc} */ - @Override protected long getTestTimeout() { - return Long.MAX_VALUE; - } - - /** - * @throws Exception If failed. - */ - public void testStartup() throws Exception { - //resetLog4j("org.apache.ignite.internal.processors.cache.distributed.dht.preloader", Level.DEBUG, false, 0); - - //G.start("modules/tests/config/spring-multicache.xml"); - //G.start("examples/config/example-cache.xml"); - - G.start(); - - // Wait until Ok is pressed. - JOptionPane.showMessageDialog( - null, - new JComponent[] { - new JLabel("Ignite started."), - new JLabel( - "<html>" + - "You can use JMX console at <u>http://localhost:1234</u>" + - "</html>"), - new JLabel("Press OK to stop Ignite.") - }, - "Ignite Startup JUnit", - JOptionPane.INFORMATION_MESSAGE - ); - - G.stop(true); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/57cf9e60/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteDevOnlyLogTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteDevOnlyLogTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteDevOnlyLogTest.java index 1f4e6d2..9a82947 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteDevOnlyLogTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/IgniteDevOnlyLogTest.java @@ -17,47 +17,73 @@ package org.apache.ignite.internal.util; -import java.io.IOException; import java.util.Collections; -import junit.framework.TestCase; +import java.util.List; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteLogger; import org.apache.ignite.IgniteSystemProperties; -import org.apache.ignite.Ignition; -import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.lang.IgniteRunnable; +import org.apache.ignite.resources.IgniteInstanceResource; +import org.apache.ignite.testframework.GridStringLogger; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** * Testing logging via {@link IgniteUtils#warnDevOnly(IgniteLogger, Object)}. */ -public class IgniteDevOnlyLogTest extends TestCase { +public class IgniteDevOnlyLogTest extends GridCommonAbstractTest { + /** */ + private List<String> additionalArgs; + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + startGrid(0); + } + + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + stopAllGrids(); + } + + /** {@inheritDoc} */ + @Override protected boolean isMultiJvm() { + return true; + } + + /** {@inheritDoc} */ + @Override protected List<String> additionalRemoteJvmArgs() { + return additionalArgs; + } + /** Check that dev-only messages appear in the log. */ - public void testDevOnlyQuietMessage() throws IOException { - String oldQuietVal = System.setProperty(IgniteSystemProperties.IGNITE_QUIET, "true"); - - try (Ignite ignite = startNode()) { - String msg = getMessage(ignite); - IgniteUtils.warnDevOnly(ignite.log(), msg); - assertTrue(readLog(ignite).contains(msg)); - } - finally { - setOrClearProperty(IgniteSystemProperties.IGNITE_QUIET, oldQuietVal); - } + public void testDevOnlyQuietMessage() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-9328";); + + additionalArgs = Collections.singletonList("-D" + IgniteSystemProperties.IGNITE_QUIET + "=true"); + + log = new GridStringLogger(false, grid(0).log()); + + Ignite ignite = startGrid(1); + + String msg = getMessage(ignite); + + warnDevOnly(msg); + + assertTrue(log.toString().contains(msg)); } /** Check that dev-only messages appear in the log. */ - public void testDevOnlyVerboseMessage() throws IOException { - String oldQuietVal = System.setProperty(IgniteSystemProperties.IGNITE_QUIET, "false"); - - try (Ignite ignite = startNode()) { - String msg = getMessage(ignite); - IgniteUtils.warnDevOnly(ignite.log(), msg); - assertTrue(readLog(ignite).contains(msg)); - } - finally { - setOrClearProperty(IgniteSystemProperties.IGNITE_QUIET, oldQuietVal); - } + public void testDevOnlyVerboseMessage() throws Exception { + additionalArgs = Collections.singletonList("-D" + IgniteSystemProperties.IGNITE_QUIET + "=false"); + + log = new GridStringLogger(false, grid(0).log()); + + Ignite ignite = startGrid(1); + + String msg = getMessage(ignite); + + warnDevOnly(msg); + + assertTrue(log.toString().contains(msg)); } /** @@ -65,44 +91,31 @@ public class IgniteDevOnlyLogTest extends TestCase { * doesn't print anything if {@link org.apache.ignite.IgniteSystemProperties#IGNITE_DEV_ONLY_LOGGING_DISABLED} * is set to {@code true}. */ - public void testDevOnlyDisabledProperty() throws IOException { - String oldDevOnlyVal = System.setProperty(IgniteSystemProperties.IGNITE_DEV_ONLY_LOGGING_DISABLED, "true"); - - try (Ignite ignite = startNode()) { - String msg = getMessage(ignite); - IgniteUtils.warnDevOnly(ignite.log(), msg); - assertFalse(readLog(ignite).contains(msg)); - } - finally { - setOrClearProperty(IgniteSystemProperties.IGNITE_DEV_ONLY_LOGGING_DISABLED, oldDevOnlyVal); - } + public void testDevOnlyDisabledProperty() throws Exception { + additionalArgs = Collections.singletonList("-D" + + IgniteSystemProperties.IGNITE_DEV_ONLY_LOGGING_DISABLED + "=true"); - } + log = new GridStringLogger(false, grid(0).log()); - /** Sets a system property if the value is not null, or clears it if the value is null. */ - private void setOrClearProperty(String key, String val) { - if (val != null) - System.setProperty(key, val); - else - System.clearProperty(IgniteSystemProperties.IGNITE_QUIET); - } + Ignite ignite = startGrid(1); - /** Starts an Ignite node. */ - private Ignite startNode() throws IOException { - IgniteConfiguration configuration = new IgniteConfiguration() - .setIgniteInstanceName(IgniteDevOnlyLogTest.class.getName() + "Instance") - .setDiscoverySpi(new TcpDiscoverySpi() - .setIpFinder(new TcpDiscoveryVmIpFinder() - .setAddresses(Collections.singletonList("127.0.0.1:47500..47509")) - ) - ); - - return Ignition.start(configuration); + String msg = getMessage(ignite); + + warnDevOnly(msg); + + assertFalse(log.toString().contains(msg)); } - /** Reads log of the given node to a string. */ - private String readLog(Ignite ignite) throws IOException { - return IgniteUtils.readFileToString(ignite.log().fileName(), "UTF-8"); + /** */ + private void warnDevOnly(final String msg) { + grid(0).compute(grid(0).cluster().forRemotes()).broadcast(new IgniteRunnable() { + @IgniteInstanceResource + private Ignite ignite; + + @Override public void run() { + IgniteUtils.warnDevOnly(ignite.log(), msg); + } + }); } /** Returns a test message. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/57cf9e60/modules/core/src/test/java/org/apache/ignite/lang/utils/IgniteOffheapReadWriteLockSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/lang/utils/IgniteOffheapReadWriteLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/utils/IgniteOffheapReadWriteLockSelfTest.java index 7a38548..a5127f1 100644 --- a/modules/core/src/test/java/org/apache/ignite/lang/utils/IgniteOffheapReadWriteLockSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/lang/utils/IgniteOffheapReadWriteLockSelfTest.java @@ -38,6 +38,9 @@ public class IgniteOffheapReadWriteLockSelfTest extends GridCommonAbstractTest { /** */ private static final int TAG_0 = 1; + /** Number of 1-second iterations in every test. */ + public static final int ROUNDS_PER_TEST = 5; + /** * @throws Exception if failed. */ @@ -120,7 +123,7 @@ public class IgniteOffheapReadWriteLockSelfTest extends GridCommonAbstractTest { } }, 32, "tester"); - for (int i = 0; i < 30; i++) { + for (int i = 0; i < ROUNDS_PER_TEST; i++) { Thread.sleep(1_000); info("Reads: " + reads.getAndSet(0) + ", writes=" + writes.getAndSet(0)); @@ -206,7 +209,7 @@ public class IgniteOffheapReadWriteLockSelfTest extends GridCommonAbstractTest { } }, 32, "tester"); - for (int i = 0; i < 30; i++) { + for (int i = 0; i < ROUNDS_PER_TEST; i++) { Thread.sleep(1_000); info("Reads: " + reads.getAndSet(0) + ", writes=" + writes.getAndSet(0)); @@ -293,7 +296,7 @@ public class IgniteOffheapReadWriteLockSelfTest extends GridCommonAbstractTest { } }, 32, "tester"); - for (int i = 0; i < 30; i++) { + for (int i = 0; i < ROUNDS_PER_TEST; i++) { Thread.sleep(1_000); info("Reads=" + reads.getAndSet(0) + ", writes=" + writes.getAndSet(0) + ", upgrades=" + successfulUpgrades.getAndSet(0)); @@ -317,6 +320,8 @@ public class IgniteOffheapReadWriteLockSelfTest extends GridCommonAbstractTest { * @throws Exception if failed. */ public void testTagIdUpdateContinuous() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-9335";); + checkTagIdUpdate(false); } @@ -451,7 +456,7 @@ public class IgniteOffheapReadWriteLockSelfTest extends GridCommonAbstractTest { } }, threadCnt, "tester"); - for (int i = 0; i < 30; i++) { + for (int i = 0; i < ROUNDS_PER_TEST; i++) { Thread.sleep(1_000); info("Reads: " + reads.getAndSet(0) + ", writes=" + writes.getAndSet(0)); http://git-wip-us.apache.org/repos/asf/ignite/blob/57cf9e60/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java index 3a943f3..b8ea850 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteKernalSelfTestSuite.java @@ -35,7 +35,6 @@ import org.apache.ignite.internal.GridNodeVisorAttributesSelfTest; import org.apache.ignite.internal.GridRuntimeExceptionSelfTest; import org.apache.ignite.internal.GridSameVmStartupSelfTest; import org.apache.ignite.internal.GridSpiExceptionSelfTest; -import org.apache.ignite.internal.GridStartupTest; import org.apache.ignite.internal.GridVersionSelfTest; import org.apache.ignite.internal.IgniteConcurrentEntryProcessorAccessStopTest; import org.apache.ignite.internal.IgniteConnectionConcurrentReserveAndRemoveTest; @@ -104,8 +103,7 @@ public class IgniteKernalSelfTestSuite extends TestSuite { public static TestSuite suite(Set<Class> ignoredTests) throws Exception { TestSuite suite = new TestSuite("Ignite Kernal Test Suite"); - //suite.addTestSuite(GridStartupTest.class); - //suite.addTestSuite(GridGetOrStartSelfTest.class); + suite.addTestSuite(GridGetOrStartSelfTest.class); suite.addTestSuite(GridSameVmStartupSelfTest.class); suite.addTestSuite(GridSpiExceptionSelfTest.class); suite.addTestSuite(GridRuntimeExceptionSelfTest.class); @@ -139,7 +137,7 @@ public class IgniteKernalSelfTestSuite extends TestSuite { suite.addTestSuite(ComputeJobCancelWithServiceSelfTest.class); suite.addTestSuite(IgniteConnectionConcurrentReserveAndRemoveTest.class); suite.addTestSuite(LongJVMPauseDetectorTest.class); - //suite.addTestSuite(ClusterMetricsSelfTest.class); + suite.addTestSuite(ClusterMetricsSelfTest.class); // Managed Services. suite.addTestSuite(GridServiceProcessorSingleNodeSelfTest.class); @@ -162,14 +160,15 @@ public class IgniteKernalSelfTestSuite extends TestSuite { suite.addTestSuite(GridServiceProcessorBatchDeploySelfTest.class); suite.addTestSuite(GridServiceDeploymentCompoundFutureSelfTest.class); suite.addTestSuite(SystemCacheNotConfiguredTest.class); + // IGNITE-3392 //suite.addTestSuite(GridServiceDeploymentExceptionPropagationTest.class); suite.addTestSuite(IgniteServiceDeploymentClassLoadingDefaultMarshallerTest.class); suite.addTestSuite(IgniteServiceDeploymentClassLoadingJdkMarshallerTest.class); - //suite.addTestSuite(IgniteServiceDeploymentClassLoadingOptimizedMarshallerTest.class); + suite.addTestSuite(IgniteServiceDeploymentClassLoadingOptimizedMarshallerTest.class); suite.addTestSuite(IgniteServiceDeployment2ClassLoadersDefaultMarshallerTest.class); suite.addTestSuite(IgniteServiceDeployment2ClassLoadersJdkMarshallerTest.class); - //suite.addTestSuite(IgniteServiceDeployment2ClassLoadersOptimizedMarshallerTest.class); + suite.addTestSuite(IgniteServiceDeployment2ClassLoadersOptimizedMarshallerTest.class); return suite; } http://git-wip-us.apache.org/repos/asf/ignite/blob/57cf9e60/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java index 187ca59..f40b03e 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteLangSelfTestSuite.java @@ -86,7 +86,7 @@ public class IgniteLangSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(IgniteFutureImplTest.class)); suite.addTest(new TestSuite(IgniteCacheFutureImplTest.class)); - //suite.addTest(new TestSuite(IgniteOffheapReadWriteLockSelfTest.class)); + suite.addTest(new TestSuite(IgniteOffheapReadWriteLockSelfTest.class)); // Consistent hash tests. suite.addTest(new TestSuite(GridConsistentHashSelfTest.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/57cf9e60/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java index c0d7a8b..4d15047 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteUtilSelfTestSuite.java @@ -98,25 +98,25 @@ public class IgniteUtilSelfTestSuite extends TestSuite { suite.addTestSuite(GridMBeanDisableSelfTest.class); suite.addTestSuite(GridMBeanExoticNamesSelfTest.class); suite.addTestSuite(GridLongListSelfTest.class); - //suite.addTestSuite(GridThreadTest.class); + suite.addTestSuite(GridThreadTest.class); suite.addTestSuite(GridIntListSelfTest.class); suite.addTestSuite(GridArraysSelfTest.class); suite.addTestSuite(GridCacheUtilsSelfTest.class); suite.addTestSuite(IgniteExceptionRegistrySelfTest.class); suite.addTestSuite(GridMessageCollectionTest.class); suite.addTestSuite(WorkersControlMXBeanTest.class); - //suite.addTestSuite(GridConcurrentLinkedDequeMultiThreadedTest.class); - //suite.addTestSuite(GridIndexFillTest.class); - //suite.addTestSuite(GridLogThrottleTest.class); - //suite.addTestSuite(GridRandomSelfTest.class); - //suite.addTestSuite(GridSnapshotLockSelfTest.class); - //suite.addTestSuite(GridTopologyHeapSizeSelfTest.class); - //suite.addTestSuite(GridTransientTest.class); - //suite.addTestSuite(IgniteDevOnlyLogTest.class); + suite.addTestSuite(GridConcurrentLinkedDequeMultiThreadedTest.class); + suite.addTestSuite(GridIndexFillTest.class); + suite.addTestSuite(GridLogThrottleTest.class); + suite.addTestSuite(GridRandomSelfTest.class); + suite.addTestSuite(GridSnapshotLockSelfTest.class); + suite.addTestSuite(GridTopologyHeapSizeSelfTest.class); + suite.addTestSuite(GridTransientTest.class); + suite.addTestSuite(IgniteDevOnlyLogTest.class); // Sensitive toString. - //suite.addTestSuite(IncludeSensitiveAtomicTest.class); - //suite.addTestSuite(IncludeSensitiveTransactionalTest.class); + suite.addTestSuite(IncludeSensitiveAtomicTest.class); + suite.addTestSuite(IncludeSensitiveTransactionalTest.class); // Metrics. suite.addTestSuite(ClusterMetricsSnapshotSerializeSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/57cf9e60/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedDequeMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedDequeMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedDequeMultiThreadedTest.java index 57cea6e..99064f0 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedDequeMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridConcurrentLinkedDequeMultiThreadedTest.java @@ -89,12 +89,11 @@ public class GridConcurrentLinkedDequeMultiThreadedTest extends GridCommonAbstra "queue-prod" ); - Thread.sleep(2 * 60 * 1000); - + Thread.sleep(20 * 1000); done.set(true); pollFut.get(); prodFut.get(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/57cf9e60/modules/core/src/test/java/org/apache/ignite/util/GridIndexFillTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridIndexFillTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridIndexFillTest.java index 88011ff..63635bd 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridIndexFillTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridIndexFillTest.java @@ -121,13 +121,13 @@ public class GridIndexFillTest extends GridCommonAbstractTest { IgniteInternalFuture<?> fut = multithreadedAsync(new Callable<Object>() { @Override public Object call() throws Exception { - ThreadLocalRandom rnd = ThreadLocalRandom.current(); + int i = ThreadLocalRandom.current().nextInt(100); while (!stop.get()) { - int k = rnd.nextInt(100); - long v = rnd.nextLong(10); + int k = i++ % 100; + long v = i++ % 10; - if (rnd.nextBoolean()) + if (i++ % 2 == 0) put(k, v); else remove(k); @@ -256,4 +256,4 @@ public class GridIndexFillTest extends GridCommonAbstractTest { private final GridConcurrentSkipListSet<Integer> keys = new GridConcurrentSkipListSet<>(); //new SnapTreeMap<>(); //new ConcurrentSkipListMap<>(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/57cf9e60/modules/core/src/test/java/org/apache/ignite/util/GridRandomSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridRandomSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridRandomSelfTest.java index e965433..005da6c 100644 --- a/modules/core/src/test/java/org/apache/ignite/util/GridRandomSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/util/GridRandomSelfTest.java @@ -19,13 +19,13 @@ package org.apache.ignite.util; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import junit.framework.TestCase; import org.apache.ignite.internal.util.GridRandom; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** * Test for {@link GridRandom}. */ -public class GridRandomSelfTest extends TestCase { +public class GridRandomSelfTest extends GridCommonAbstractTest { /** */ public void testRandom() { @@ -50,4 +50,4 @@ public class GridRandomSelfTest extends TestCase { } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/57cf9e60/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/GridTreeBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/GridTreeBenchmark.java b/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/GridTreeBenchmark.java index d9bc8ce..a711468 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/GridTreeBenchmark.java +++ b/modules/indexing/src/test/java/org/apache/ignite/loadtests/h2indexing/GridTreeBenchmark.java @@ -277,4 +277,4 @@ public class GridTreeBenchmark { return 0; } -} \ No newline at end of file +}
