ISPN-2914 Some tests are not picked up by Surefire - part2

* Some tests are renamed according to Maven Conventions.
* The test names in @test annotation are fixed according to TestNameVerifier class.

cachestore/hbase/src/test/java/org/infinispan/loaders/hbase/HBaseCacheStoreStandaloneTest.java

@@ -36,7 +36,7 @@
 import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.Test;
 
-@Test(groups = "manual", testName = "loaders.hbase.HBaseCacheStoreTestStandalone")
+@Test(groups = "manual", testName = "loaders.hbase.HBaseCacheStoreStandaloneTest")
 public class HBaseCacheStoreStandaloneTest extends SingleCacheManagerTest {
 
    private static final boolean USE_EMBEDDED = true;

cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/NonStringKeyStateTransferTest.java

@@ -36,7 +36,7 @@
  * @author Mircea.Markus@jboss.com
  * @since 4.1
  */
-@Test(groups = "functional", testName = "jdbc.stringbased.NonStringKeyStateTransferTest")
+@Test(groups = "functional", testName = "loaders.jdbc.stringbased.NonStringKeyStateTransferTest")
 public class NonStringKeyStateTransferTest extends AbstractCacheTest {
 
    public void testReplicatedStateTransfer() {

cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreWrapperTest.java

@@ -42,7 +42,7 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-@Test(testName = "loaders.remote.RemoteCacheStoreMixedAccessTest", groups="functional")
+@Test(testName = "loaders.remote.RemoteCacheStoreWrapperTest", groups="functional")
 public class RemoteCacheStoreWrapperTest extends AbstractInfinispanTest {
 
    private HotRodServer sourceServer;

cdi/extension/src/test/java/org/infinispan/cdi/test/distexec/DistributedExecutorCDITest.java

@@ -44,7 +44,7 @@
  * 
  * @author Vladimir Blagojevic 
  */
-@Test(enabled = true, groups = "functional", testName = "distexec.DistributedExecutorTest")
+@Test(enabled = true, groups = "functional", testName = "cdi.test.distexec.DistributedExecutorCDITest")
 public class DistributedExecutorCDITest extends MultipleCacheManagersArquillianTest {
 
    DistributedExecutorTest delegate;

cdi/extension/src/test/java/org/infinispan/cdi/test/distexec/WordCountMapReduceCDITest.java

@@ -50,7 +50,7 @@
  * 
  * @author Vladimir Blagojevic
  */
-@Test(enabled = true, groups = "functional", testName = "distexec.WordCountMapReduceCDITest")
+@Test(enabled = true, groups = "functional", testName = "cdi.test.distexec.WordCountMapReduceCDITest")
 public class WordCountMapReduceCDITest extends MultipleCacheManagersArquillianTest {
 
    BaseWordCountMapReduceTest delegate;

client/hotrod-client/src/test/java/org/infinispan/client/hotrod/marshall/ApacheAvroMarshallerTest.java

@@ -33,7 +33,7 @@
 import java.util.Map;
 import java.util.Set;
 
-@Test(groups = "functional", testName = "client.hotrod.ApacheAvroMarshallerTest")
+@Test(groups = "functional", testName = "client.hotrod.marshall.ApacheAvroMarshallerTest")
 public class ApacheAvroMarshallerTest {
 
    private final ApacheAvroMarshaller marshaller = new ApacheAvroMarshaller();

client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/DistributionRetryTest.java

@@ -49,7 +49,7 @@
  * @author Mircea.Markus@jboss.com
  * @since 4.1
  */
-@Test(testName = "hotrod.retry.DistributionRetryTest", groups = "functional")
+@Test(testName = "client.hotrod.retry.DistributionRetryTest", groups = "functional")
 public class DistributionRetryTest extends AbstractRetryTest {
 
    @Override

client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/ReplicationRetryTest.java

@@ -39,7 +39,7 @@
  * @author Mircea.Markus@jboss.com
  * @since 4.1
  */
-@Test (testName = "client.hotrod.ReplicationRetryTest", groups = "functional")
+@Test (testName = "client.hotrod.retry.ReplicationRetryTest", groups = "functional")
 public class ReplicationRetryTest extends AbstractRetryTest {
 
    public void testGet() {

client/hotrod-client/src/test/java/org/infinispan/client/hotrod/stress/ClientConsistentHashPerfTest.java

@@ -41,7 +41,7 @@
  * @author Dan Berindei
  * @since 5.3
  */
-@Test(groups = "profiling", testName = "client.hotrod.ClientConsistentHashPerfTest")
+@Test(groups = "profiling", testName = "client.hotrod.stress.ClientConsistentHashPerfTest")
 public class ClientConsistentHashPerfTest extends MultiHotRodServersTest {
 
    private static final int NUM_SERVERS = 64;

core/src/test/java/org/infinispan/config/ProgrammaticNameSetConfig.java → core/src/test/java/org/infinispan/config/ProgrammaticNameSetConfigTest.java

@@ -36,8 +36,9 @@
  * @author Mircea Markus
  * @since 4.2
  */
-@Test (groups = "functional", testName = "config.ProgrammaticNameSetConfig")
-public class ProgrammaticNameSetConfig extends SingleCacheManagerTest {
+@Test (groups = "functional", testName = "config.ProgrammaticNameSetConfigTest", enabled = false,
+       description = "Disabled as this functionality is not working for Old API and for New API it is useless.")
+public class ProgrammaticNameSetConfigTest extends SingleCacheManagerTest {
 
    @Override
    protected EmbeddedCacheManager createCacheManager() throws Exception {

core/src/test/java/org/infinispan/container/versioning/SimpleConditionalOperationsWriteSkewTest.java

@@ -29,7 +29,7 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 
-@Test(groups = "functional", testName = "api.SimpleConditionalOperationsWriteSkewTest")
+@Test(groups = "functional", testName = "container.versioning.SimpleConditionalOperationsWriteSkewTest")
 public class SimpleConditionalOperationsWriteSkewTest extends MultipleCacheManagersTest {
 
    protected ConfigurationBuilder getConfig() {

core/src/test/java/org/infinispan/distexec/mapreduce/BookStoreAsBinarySearchTest.java

@@ -1,3 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2012 Red Hat Inc. and/or its affiliates and other
+ * contributors as indicated by the @author tags. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.configuration.cache.CacheMode;
@@ -10,7 +32,7 @@
  *
  * @author Anna Manukyan
  */
-@Test(groups = "functional", testName = "distexec.BookStoreAsBinarySearchTest")
+@Test(groups = "functional", testName = "distexec.mapreduce.BookStoreAsBinarySearchTest")
 public class BookStoreAsBinarySearchTest extends BookSearchTest {
 
    @Override

core/src/test/java/org/infinispan/distexec/mapreduce/BookStoreAsBinaryWithCacheLoaderSearchTest.java

@@ -1,3 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2012 Red Hat Inc. and/or its affiliates and other
+ * contributors as indicated by the @author tags. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.configuration.cache.CacheMode;
@@ -14,7 +36,7 @@
  *
  * @author Anna Manukyan
  */
-@Test(groups = "functional", testName = "distexec.BookStoreAsBinaryWithCacheLoaderSearchTest")
+@Test(groups = "functional", testName = "distexec.mapreduce.BookStoreAsBinaryWithCacheLoaderSearchTest")
 public class BookStoreAsBinaryWithCacheLoaderSearchTest extends BookSearchTest {
 
    @Override

core/src/test/java/org/infinispan/distexec/mapreduce/DistributedFourNodesMapReduceTest.java

@@ -35,7 +35,7 @@
  * @author Vladimir Blagojevic
  * @since 5.2
  */
-@Test(groups = "functional", testName = "distexec.DistributedFourNodesMapReduceTest")
+@Test(groups = "functional", testName = "distexec.mapreduce.DistributedFourNodesMapReduceTest")
 public class DistributedFourNodesMapReduceTest extends BaseWordCountMapReduceTest {
 
    @Override

core/src/test/java/org/infinispan/distexec/mapreduce/DistributedSharedCacheFourNodesMapReduceTest.java

@@ -35,7 +35,7 @@
  * @author Vladimir Blagojevic
  * @since 5.2
  */
-@Test(groups = "functional", testName = "distexec.DistributedSharedCacheFourNodesMapReduceTest")
+@Test(groups = "functional", testName = "distexec.mapreduce.DistributedSharedCacheFourNodesMapReduceTest")
 public class DistributedSharedCacheFourNodesMapReduceTest extends BaseWordCountMapReduceTest {
 
    @Override

core/src/test/java/org/infinispan/distexec/mapreduce/DistributedSharedCacheTwoNodesMapReduceTest.java

@@ -35,7 +35,7 @@
  * @author Vladimir Blagojevic
  * @since 5.2
  */
-@Test(groups = "functional", testName = "distexec.DistributedSharedCacheTwoNodesMapReduceTest")
+@Test(groups = "functional", testName = "distexec.mapreduce.DistributedSharedCacheTwoNodesMapReduceTest")
 public class DistributedSharedCacheTwoNodesMapReduceTest extends BaseWordCountMapReduceTest {
 
    @Override

core/src/test/java/org/infinispan/distexec/mapreduce/DistributedTwoNodesMapReduceTest.java

@@ -33,7 +33,7 @@
  * @author Vladimir Blagojevic
  * @since 5.2
  */
-@Test(groups = "functional", testName = "distexec.DistributedTwoNodesMapReduceTest")
+@Test(groups = "functional", testName = "distexec.mapreduce.DistributedTwoNodesMapReduceTest")
 public class DistributedTwoNodesMapReduceTest extends BaseWordCountMapReduceTest {
 
    @Override

core/src/test/java/org/infinispan/distexec/mapreduce/SimpleBookSearchTest.java

@@ -1,3 +1,25 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2012 Red Hat Inc. and/or its affiliates and other
+ * contributors as indicated by the @author tags. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.infinispan.distexec.mapreduce;
 
 import org.infinispan.configuration.cache.CacheMode;
@@ -9,7 +31,7 @@
  *
  * @author Anna Manukyan
  */
-@Test(groups = "functional", testName = "distexec.SimpleBookSearchTest")
+@Test(groups = "functional", testName = "distexec.mapreduce.SimpleBookSearchTest")
 public class SimpleBookSearchTest extends BookSearchTest {
 
    @Override

core/src/test/java/org/infinispan/distexec/mapreduce/SimpleFourNodesMapReduceTest.java

@@ -32,7 +32,7 @@
  * @author Vladimir Blagojevic
  * @since 5.0
  */
-@Test(groups = "functional", testName = "distexec.SimpleFourNodesMapReduceTest")
+@Test(groups = "functional", testName = "distexec.mapreduce.SimpleFourNodesMapReduceTest")
 public class SimpleFourNodesMapReduceTest extends BaseWordCountMapReduceTest {
 
    @Override

core/src/test/java/org/infinispan/distexec/mapreduce/SimpleTwoNodesMapReduceTest.java

@@ -54,7 +54,7 @@
  * @author Vladimir Blagojevic
  * @since 5.0
  */
-@Test(groups = "functional", testName = "distexec.SimpleTwoNodesMapReduceTest")
+@Test(groups = "functional", testName = "distexec.mapreduce.SimpleTwoNodesMapReduceTest")
 public class SimpleTwoNodesMapReduceTest extends BaseWordCountMapReduceTest {
 
 

core/src/test/java/org/infinispan/distexec/mapreduce/TopologyAwareTwoNodesMapReduceTest.java

@@ -29,7 +29,7 @@
  *
  * @author Anna Manukyan
  */
-@Test(groups = "functional", testName = "distexec.TopologyAwareTwoNodesMapReduceTest")
+@Test(groups = "functional", testName = "distexec.mapreduce.TopologyAwareTwoNodesMapReduceTest")
 public class TopologyAwareTwoNodesMapReduceTest extends SimpleTwoNodesMapReduceTest {
 
    @Override

core/src/test/java/org/infinispan/distexec/mapreduce/TwoNodesWithCacheLoaderMapReduceTest.java

@@ -35,7 +35,7 @@
  * @author Vladimir Blagojevic
  * @since 5.2
  */
-@Test(groups = "functional", testName = "distexec.TwoNodesWithCacheLoaderMapReduceTest")
+@Test(groups = "functional", testName = "distexec.mapreduce.TwoNodesWithCacheLoaderMapReduceTest")
 public class TwoNodesWithCacheLoaderMapReduceTest extends BaseWordCountMapReduceTest {
 
    @Override

core/src/test/java/org/infinispan/distexec/mapreduce/TwoNodesWithCacheStoreMapReduceTest.java

@@ -41,7 +41,7 @@
  * @author Vladimir Blagojevic
  * @since 5.2
  */
-@Test(groups = "functional", testName = "distexec.TwoNodesWithCacheStoreMapReduceTest")
+@Test(groups = "functional", testName = "distexec.mapreduce.TwoNodesWithCacheStoreMapReduceTest")
 public class TwoNodesWithCacheStoreMapReduceTest extends BaseWordCountMapReduceTest {
 
    @Override

core/src/test/java/org/infinispan/distribution/DisabledL1WithRetValsNonConcurrentTest.java

@@ -21,7 +21,7 @@
 
 import org.testng.annotations.Test;
 
-@Test(groups = "functional", testName = "DisabledL1WithRetValsNonConcurrentTest")
+@Test(groups = "functional", testName = "distribution.DisabledL1WithRetValsNonConcurrentTest")
 public class DisabledL1WithRetValsNonConcurrentTest extends DisabledL1WithRetValsTest {
 
    public DisabledL1WithRetValsNonConcurrentTest() {

core/src/test/java/org/infinispan/distribution/PessimisticDistSyncTxCacheStoreSharedTest.java

@@ -42,7 +42,7 @@
  * @author Thomas Fromm
  * @since 5.1
  */
-@Test(groups = "functional", testName = "loaders.PessimisticDistSyncTxCacheStoreSharedTest")
+@Test(groups = "functional", testName = "distribution.PessimisticDistSyncTxCacheStoreSharedTest")
 public class PessimisticDistSyncTxCacheStoreSharedTest extends MultipleCacheManagersTest {
 
    private ConfigurationBuilder getCB(){

core/src/test/java/org/infinispan/distribution/ch/DefaultConsistentHashFactoryTest.java

@@ -44,7 +44,7 @@
  * @author Dan Berindei
  * @since 5.2
  */
-@Test(groups = "unit", testName = "ch.DefaultConsistentHashFactoryTest")
+@Test(groups = "unit", testName = "distribution.ch.DefaultConsistentHashFactoryTest")
 public class DefaultConsistentHashFactoryTest extends AbstractInfinispanTest {
 
    private int iterationCount = 0;

core/src/test/java/org/infinispan/distribution/ch/SyncConsistentHashFactoryTest.java

@@ -30,7 +30,7 @@
  * @author Dan Berindei
  * @since 5.2
  */
-@Test(groups = "unit", testName = "ch.SyncConsistentHashFactoryTest")
+@Test(groups = "unit", testName = "distribution.ch.SyncConsistentHashFactoryTest")
 public class SyncConsistentHashFactoryTest extends DefaultConsistentHashFactoryTest {
    @Override
    protected ConsistentHashFactory createConsistentHashFactory() {

core/src/test/java/org/infinispan/distribution/groups/GroupsChFunctionalTest.java

@@ -36,7 +36,7 @@
  * @author Pete Muir
  * @since 5.0
  */
-@Test(groups = "functional", testName = "distribution.GroupsChFunctionalTest")
+@Test(groups = "functional", testName = "distribution.groups.GroupsChFunctionalTest")
 @CleanupAfterMethod
 public class GroupsChFunctionalTest extends DistSyncFuncTest {
 

core/src/test/java/org/infinispan/distribution/groups/GroupsDistAsyncFuncTest.java

@@ -32,7 +32,7 @@
  * @author Pete Muir
  * @since 5.0
  */
-@Test (groups = "functional", testName = "distribution.GroupsDistAsyncFuncTest")
+@Test (groups = "functional", testName = "distribution.groups.GroupsDistAsyncFuncTest")
 public class GroupsDistAsyncFuncTest extends DistAsyncFuncTest {
 
    public GroupsDistAsyncFuncTest() {

core/src/test/java/org/infinispan/distribution/groups/GroupsDistAsyncNonConcurrentFuncTest.java

@@ -21,7 +21,7 @@
 
 import org.testng.annotations.Test;
 
-@Test(groups = "functional", testName = "distribution.GroupsDistAsyncNonConcurrentFuncTest")
+@Test(groups = "functional", testName = "distribution.groups.GroupsDistAsyncNonConcurrentFuncTest")
 public class GroupsDistAsyncNonConcurrentFuncTest extends GroupsDistAsyncFuncTest {
    public GroupsDistAsyncNonConcurrentFuncTest() {
       supportConcurrentWrites = false;

core/src/test/java/org/infinispan/distribution/groups/GroupsDistSyncUnsafeFuncTest.java

@@ -32,7 +32,7 @@
  * @author Pete Muir
  * @since 5.0
  */
-@Test(testName="distribution.GroupsDistSyncUnsafeFuncTest", groups = "functional")
+@Test(testName="distribution.groups.GroupsDistSyncUnsafeFuncTest", groups = "functional")
 public class GroupsDistSyncUnsafeFuncTest extends DistSyncUnsafeFuncTest {
 
    public GroupsDistSyncUnsafeFuncTest() {

core/src/test/java/org/infinispan/distribution/rehash/DataLossOnJoinOneOwner2Test.java

@@ -21,7 +21,7 @@
 
 import org.testng.annotations.Test;
 
-@Test(groups="functional", testName = "DataLossOnJoinOneOwner2Test")
+@Test(groups="functional", testName = "distribution.rehash.DataLossOnJoinOneOwner2Test")
 public class DataLossOnJoinOneOwner2Test extends DataLossOnJoinOneOwnerTest {
    public DataLossOnJoinOneOwner2Test() {
       supportsConcurrentUpdates = false;

core/src/test/java/org/infinispan/distribution/rehash/RehashAfterJoinWithPreloadNotConcurrentTest.java

@@ -21,7 +21,7 @@
 
 import org.testng.annotations.Test;
 
-@Test(groups = "functional", testName = "distribution.RehashAfterJoinWithPreloadNotConcurrentTest")
+@Test(groups = "functional", testName = "distribution.rehash.RehashAfterJoinWithPreloadNotConcurrentTest")
 public class RehashAfterJoinWithPreloadNotConcurrentTest extends RehashAfterJoinWithPreloadTest {
    public RehashAfterJoinWithPreloadNotConcurrentTest() {
       supportsConcurrentUpdates = false;

core/src/test/java/org/infinispan/distribution/rehash/RehashCompletedOnJoinNotConcurrentTest.java

@@ -21,7 +21,7 @@
 
 import org.testng.annotations.Test;
 
-@Test(groups = "functional", testName = "distribution.RehashCompletedOnJoinNotConcurrentTest")
+@Test(groups = "functional", testName = "distribution.rehash.RehashCompletedOnJoinNotConcurrentTest")
 public class RehashCompletedOnJoinNotConcurrentTest extends RehashCompletedOnJoinTest {
 
    public RehashCompletedOnJoinNotConcurrentTest() {

core/src/test/java/org/infinispan/distribution/rehash/RehashStressTest.java

@@ -46,7 +46,7 @@
 /**
  * @author esalter
  */
-@Test(groups = "stress", testName = "org.infinispan.RehashStressTest")
+@Test(groups = "stress", testName = "distribution.rehash.RehashStressTest")
 public class RehashStressTest extends AbstractInfinispanTest {
 
     @AfterMethod(alwaysRun = true)