Skip to content

Commit

Permalink
# ignite-63
Browse files Browse the repository at this point in the history
  • Loading branch information
@sboikov
sboikov committed Jan 23, 2015
1 parent 2f2b55e commit 11f8fdd
Show file tree
Hide file tree
Showing 46 changed files with 125 additions and 189 deletions.
4 changes: 2 additions & 2 deletions ...nite/testsuites/GridAopSelfTestSuite.java → ...te/testsuites/IgniteAopSelfTestSuite.java
View file
Expand Up @@ -27,7 +27,7 @@
/**
* AOP test suite.
*/
public class GridAopSelfTestSuite extends TestSuite {
public class IgniteAopSelfTestSuite extends TestSuite {
/**
* @return AOP test suite.
* @throws Exception If failed.
Expand All @@ -45,7 +45,7 @@ public static TestSuite suite() throws Exception {
suite.addTest(new TestSuite(GridExternalNonSpringAopSelfTest.class));

// Examples
System.setProperty(GG_OVERRIDE_MCAST_GRP, GridTestUtils.getNextMulticastGroup(GridAopSelfTestSuite.class));
System.setProperty(GG_OVERRIDE_MCAST_GRP, GridTestUtils.getNextMulticastGroup(IgniteAopSelfTestSuite.class));

return suite;
}
Expand Down
42 changes: 0 additions & 42 deletions modules/core/src/test/java/org/apache/ignite/testsuites/GridRichSelfTestSuite.java
View file

This file was deleted.

32 changes: 18 additions & 14 deletions ...testsuites/bamboo/GridBasicTestSuite.java → ...nite/testsuites/IgniteBasicTestSuite.java
View file
Expand Up @@ -15,14 +15,14 @@
* limitations under the License.
*/

package org.apache.ignite.testsuites.bamboo;
package org.apache.ignite.testsuites;

import junit.framework.*;
import org.apache.ignite.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.messaging.*;
import org.apache.ignite.product.*;
import org.apache.ignite.spi.*;
import org.apache.ignite.testsuites.*;
import org.apache.ignite.internal.processors.affinity.*;
import org.apache.ignite.internal.processors.closure.*;
import org.apache.ignite.internal.processors.continuous.*;
Expand All @@ -31,25 +31,29 @@
/**
* Basic test suite.
*/
public class GridBasicTestSuite extends TestSuite {
public class IgniteBasicTestSuite extends TestSuite {
/**
* @return Test suite.
* @throws Exception Thrown in case of the failure.
*/
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("Gridgain Basic Test Suite");
TestSuite suite = new TestSuite("Ignite Basic Test Suite");

suite.addTest(GridLangSelfTestSuite.suite());
suite.addTest(GridUtilSelfTestSuite.suite());
suite.addTest(GridMarshallerSelfTestSuite.suite());
suite.addTest(GridKernalSelfTestSuite.suite());
suite.addTest(GridLoadersSelfTestSuite.suite());
suite.addTest(GridRichSelfTestSuite.suite());
suite.addTest(GridExternalizableSelfTestSuite.suite());
suite.addTest(GridP2PSelfTestSuite.suite());
suite.addTest(IgniteLangSelfTestSuite.suite());
suite.addTest(IgniteUtilSelfTestSuite.suite());
suite.addTest(IgniteMarshallerSelfTestSuite.suite());
suite.addTest(IgniteKernalSelfTestSuite.suite());
suite.addTest(IgniteStartUpTestSuite.suite());
suite.addTest(IgniteExternalizableSelfTestSuite.suite());
suite.addTest(IgniteP2PSelfTestSuite.suite());

suite.addTest(new TestSuite(GridSelfTest.class));
suite.addTest(new TestSuite(GridProjectionSelfTest.class));
suite.addTest(new TestSuite(GridMessagingSelfTest.class));
suite.addTest(new TestSuite(GridMessagingNoPeerClassLoadingSelfTest.class));

if (U.isLinux() || U.isMacOs())
suite.addTest(GridIpcSharedMemorySelfTestSuite.suite());
suite.addTest(IgniteIpcSharedMemorySelfTestSuite.suite());

suite.addTestSuite(GridTopologyBuildVersionSelfTest.class);
suite.addTestSuite(GridReleaseTypeSelfTest.class);
Expand All @@ -70,7 +74,7 @@ public static TestSuite suite() throws Exception {
suite.addTestSuite(GridMessageListenSelfTest.class);

// Streamer.
suite.addTest(GridStreamerSelfTestSuite.suite());
suite.addTest(IgniteStreamerSelfTestSuite.suite());

return suite;
}
Expand Down
2 changes: 1 addition & 1 deletion ...GridCacheDataStructuresSelfTestSuite.java → ...niteCacheDataStructuresSelfTestSuite.java
View file
Expand Up @@ -26,7 +26,7 @@
/**
* Test suite for cache data structures.
*/
public class GridCacheDataStructuresSelfTestSuite extends TestSuite {
public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite {
/**
* @return Cache test suite.
* @throws Exception If failed.
Expand Down
4 changes: 2 additions & 2 deletions ...uites/GridCacheEvictionSelfTestSuite.java → ...tes/IgniteCacheEvictionSelfTestSuite.java
View file
Expand Up @@ -28,13 +28,13 @@
/**
* Test suite for cache eviction.
*/
public class GridCacheEvictionSelfTestSuite extends TestSuite {
public class IgniteCacheEvictionSelfTestSuite extends TestSuite {
/**
* @return Cache eviction test suite.
* @throws Exception If failed.
*/
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("Gridgain Cache Eviction Test Suite");
TestSuite suite = new TestSuite("Ignite Cache Eviction Test Suite");

suite.addTest(new TestSuite(GridCacheFifoEvictionPolicySelfTest.class));
suite.addTest(new TestSuite(GridCacheLruEvictionPolicySelfTest.class));
Expand Down
6 changes: 3 additions & 3 deletions ...es/bamboo/GridCacheFailoverTestSuite.java → ...tsuites/IgniteCacheFailoverTestSuite.java
View file
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.ignite.testsuites.bamboo;
package org.apache.ignite.testsuites;

import junit.framework.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.*;
Expand All @@ -25,13 +25,13 @@
/**
* Test suite.
*/
public class GridCacheFailoverTestSuite extends TestSuite {
public class IgniteCacheFailoverTestSuite extends TestSuite {
/**
* @return Gridgain Cache Group Lock Failover test suite.
* @throws Exception Thrown in case of the failure.
*/
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("Gridgain Cache Failover Test Suite");
TestSuite suite = new TestSuite("Cache Failover Test Suite");

suite.addTestSuite(GridCacheAtomicInvalidPartitionHandlingSelfTest.class);

Expand Down
2 changes: 1 addition & 1 deletion ...suites/GridCacheFullApiSelfTestSuite.java → ...ites/IgniteCacheFullApiSelfTestSuite.java
View file
Expand Up @@ -26,7 +26,7 @@
/**
* Test suite for cache API.
*/
public class GridCacheFullApiSelfTestSuite extends TestSuite {
public class IgniteCacheFullApiSelfTestSuite extends TestSuite {
/**
* @return Cache API test suite.
* @throws Exception If failed.
Expand Down
4 changes: 2 additions & 2 deletions ...ites/GridCacheGroupLockSelfTestSuite.java → ...es/IgniteCacheGroupLockSelfTestSuite.java
View file
Expand Up @@ -25,13 +25,13 @@
/**
* Group lock test suite.
*/
public class GridCacheGroupLockSelfTestSuite extends TestSuite {
public class IgniteCacheGroupLockSelfTestSuite extends TestSuite {
/**
* @return Cache API test suite.
* @throws Exception If failed.
*/
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("Ignite Cache Group Lock Test Suite");
TestSuite suite = new TestSuite("Cache Group Lock Test Suite");

// One node.
suite.addTest(new TestSuite(GridCacheGroupLockNearSelfTest.class));
Expand Down
4 changes: 2 additions & 2 deletions ...ites/GridCacheIteratorsSelfTestSuite.java → ...es/IgniteCacheIteratorsSelfTestSuite.java
View file
Expand Up @@ -25,13 +25,13 @@
/**
* Cache iterators test suite.
*/
public class GridCacheIteratorsSelfTestSuite extends TestSuite {
public class IgniteCacheIteratorsSelfTestSuite extends TestSuite {
/**
* @return Cache iterators test suite.
* @throws Exception If failed.
*/
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("Gridgain Cache Iterators Test Suite");
TestSuite suite = new TestSuite("Cache Iterators Test Suite");

suite.addTest(new TestSuite(GridCacheLocalIteratorsSelfTest.class));
suite.addTest(new TestSuite(GridCacheReplicatedIteratorsSelfTest.class));
Expand Down
4 changes: 2 additions & 2 deletions ...suites/GridCacheMetricsSelfTestSuite.java → ...ites/IgniteCacheMetricsSelfTestSuite.java
View file
Expand Up @@ -25,13 +25,13 @@
/**
* Test suite for cache metrics.
*/
public class GridCacheMetricsSelfTestSuite extends TestSuite {
public class IgniteCacheMetricsSelfTestSuite extends TestSuite {
/**
* @return Cache metrics test suite.
* @throws Exception If failed.
*/
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("Gridgain Cache Metrics Test Suite");
TestSuite suite = new TestSuite("Cache Metrics Test Suite");

// suite.addTest(new TestSuite(GridCacheLocalMetricsSelfTest.class));
suite.addTest(new TestSuite(GridCacheNearMetricsSelfTest.class));
Expand Down
4 changes: 2 additions & 2 deletions ...uites/GridCacheNearOnlySelfTestSuite.java → ...tes/IgniteCacheNearOnlySelfTestSuite.java
View file
Expand Up @@ -25,13 +25,13 @@
/**
* Test suite for near-only cache.
*/
public class GridCacheNearOnlySelfTestSuite {
public class IgniteCacheNearOnlySelfTestSuite {
/**
* @return Suite.
* @throws Exception If failed.
*/
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("Gridgain near-only cache test suite.");
TestSuite suite = new TestSuite("Near-only cache test suite.");

suite.addTest(new TestSuite(GridCacheNearOnlySelfTest.class));
suite.addTest(new TestSuite(GridCacheAtomicNearOnlySelfTest.class));
Expand Down
6 changes: 3 additions & 3 deletions .../bamboo/GridDataGridRestartTestSuite.java → ...stsuites/IgniteCacheRestartTestSuite.java
View file
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.ignite.testsuites.bamboo;
package org.apache.ignite.testsuites;

import junit.framework.*;
import org.apache.ignite.internal.processors.cache.*;
Expand All @@ -24,13 +24,13 @@
/**
* In-Memory Data Grid stability test suite on changing topology.
*/
public class GridDataGridRestartTestSuite extends TestSuite {
public class IgniteCacheRestartTestSuite extends TestSuite {
/**
* @return Suite.
* @throws Exception If failed.
*/
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("Gridgain In-Memory Data Grid Restart Test Suite");
TestSuite suite = new TestSuite("Cache Restart Test Suite");

// Common restart tests.
// TODO: GG-7419: Enable when fixed.
Expand Down
21 changes: 10 additions & 11 deletions ...tsuites/bamboo/GridDataGridTestSuite.java → ...nite/testsuites/IgniteCacheTestSuite.java
View file
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.ignite.testsuites.bamboo;
package org.apache.ignite.testsuites;

import junit.framework.*;
import org.apache.ignite.*;
Expand All @@ -26,7 +26,6 @@
import org.apache.ignite.internal.processors.cache.distributed.replicated.*;
import org.apache.ignite.internal.processors.cache.expiry.*;
import org.apache.ignite.internal.processors.cache.integration.*;
import org.apache.ignite.testsuites.*;
import org.apache.ignite.cache.store.jdbc.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.*;
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
Expand All @@ -38,7 +37,7 @@
/**
* Test suite.
*/
public class GridDataGridTestSuite extends TestSuite {
public class IgniteCacheTestSuite extends TestSuite {
/**
* @return IgniteCache test suite.
* @throws Exception Thrown in case of the failure.
Expand Down Expand Up @@ -284,15 +283,15 @@ public static TestSuite suite() throws Exception {
suite.addTestSuite(GridCacheReplicatedP2PDisabledByteArrayValuesSelfTest.class);

// Near-only cache.
suite.addTest(GridCacheNearOnlySelfTestSuite.suite());
suite.addTest(IgniteCacheNearOnlySelfTestSuite.suite());

// Test cache with daemon nodes.
suite.addTestSuite(GridCacheDaemonNodeLocalSelfTest.class);
suite.addTestSuite(GridCacheDaemonNodePartitionedSelfTest.class);
suite.addTestSuite(GridCacheDaemonNodeReplicatedSelfTest.class);

// Write-behind.
suite.addTest(GridCacheWriteBehindTestSuite.suite());
suite.addTest(IgniteCacheWriteBehindTestSuite.suite());

// Transform.
suite.addTestSuite(GridCachePartitionedTransformWriteThroughBatchUpdateSelfTest.class);
Expand All @@ -306,23 +305,23 @@ public static TestSuite suite() throws Exception {
suite.addTestSuite(GridCacheReloadSelfTest.class);

// Group locking.
suite.addTest(GridCacheGroupLockSelfTestSuite.suite());
suite.addTest(IgniteCacheGroupLockSelfTestSuite.suite());

// Full API.
suite.addTest(GridCacheFullApiSelfTestSuite.suite());
suite.addTest(IgniteCacheFullApiSelfTestSuite.suite());
suite.addTestSuite(GridCacheMixedModeSelfTest.class);

// Cache metrics.
suite.addTest(GridCacheMetricsSelfTestSuite.suite());
suite.addTest(IgniteCacheMetricsSelfTestSuite.suite());

// Eviction.
suite.addTest(GridCacheEvictionSelfTestSuite.suite());
suite.addTest(IgniteCacheEvictionSelfTestSuite.suite());

// Iterators.
suite.addTest(GridCacheIteratorsSelfTestSuite.suite());
suite.addTest(IgniteCacheIteratorsSelfTestSuite.suite());

// Add tx recovery test suite.
suite.addTest(GridCacheTxRecoverySelfTestSuite.suite());
suite.addTest(IgniteCacheTxRecoverySelfTestSuite.suite());

// Cache interceptor tests.
suite.addTest(GridCacheInterceptorSelfTestSuite.suite());
Expand Down
4 changes: 2 additions & 2 deletions ...tes/GridCacheTxRecoverySelfTestSuite.java → ...s/IgniteCacheTxRecoverySelfTestSuite.java
View file
Expand Up @@ -25,13 +25,13 @@
/**
* Tx recovery self test suite.
*/
public class GridCacheTxRecoverySelfTestSuite extends TestSuite {
public class IgniteCacheTxRecoverySelfTestSuite extends TestSuite {
/**
* @return Cache API test suite.
* @throws Exception If failed.
*/
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("Gridgain Cache tx recovery test suite");
TestSuite suite = new TestSuite("Cache tx recovery test suite");

suite.addTestSuite(GridCachePartitionedTxOriginatingNodeFailureSelfTest.class);
suite.addTestSuite(GridCachePartitionedNearDisabledTxOriginatingNodeFailureSelfTest.class);
Expand Down
4 changes: 2 additions & 2 deletions ...suites/GridCacheWriteBehindTestSuite.java → ...ites/IgniteCacheWriteBehindTestSuite.java
View file
Expand Up @@ -23,13 +23,13 @@
/**
* Test suite that contains all tests for {@link GridCacheWriteBehindStore}.
*/
public class GridCacheWriteBehindTestSuite extends TestSuite {
public class IgniteCacheWriteBehindTestSuite extends TestSuite {
/**
* @return GridGain Bamboo in-memory data grid test suite.
* @throws Exception Thrown in case of the failure.
*/
public static TestSuite suite() throws Exception {
TestSuite suite = new TestSuite("Gridgain Write-Behind Store Test Suite");
TestSuite suite = new TestSuite("Write-Behind Store Test Suite");

// Write-behind tests.
suite.addTest(new TestSuite(GridCacheWriteBehindStoreSelfTest.class));
Expand Down

0 comments on commit 11f8fdd

Please sign in to comment.