[jbosscache-commits] JBoss Cache SVN: r7414 - in core/trunk/src/test/java/org/jboss/cache: multiplexer and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-01-08 12:09:05 -0500 (Thu, 08 Jan 2009)
New Revision: 7414

Added:
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/MvccBuddy3NodesWithFailoverTest.java
   core/trunk/src/test/java/org/jboss/cache/multiplexer/MultiplexerBuddy3NodesWithFailoverTest.java
Removed:
   core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationFailoverTest.java
   core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyReplicationFailoverTest.java
Log:
renamed tests for consistency

Deleted: core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationFailoverTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationFailoverTest.java	2009-01-08 17:05:35 UTC (rev 7413)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationFailoverTest.java	2009-01-08 17:09:05 UTC (rev 7414)
@@ -1,15 +0,0 @@
-package org.jboss.cache.buddyreplication.mvcc;
-
-import org.jboss.cache.config.Configuration.NodeLockingScheme;
-import org.jboss.cache.buddyreplication.Buddy3NodesWithFailoverTest;
-import org.testng.annotations.Test;
-
- at Test(groups = {"functional", "mvcc"}, testName = "buddyreplication.mvcc.Buddy3NodesWithFailoverTest")
-public class BuddyReplicationFailoverTest extends Buddy3NodesWithFailoverTest
-{
-   @Override
-   protected NodeLockingScheme getNonOptimisticLockingScheme()
-   {
-      return NodeLockingScheme.MVCC;
-   }
-}

Copied: core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/MvccBuddy3NodesWithFailoverTest.java (from rev 7409, core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/BuddyReplicationFailoverTest.java)
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/MvccBuddy3NodesWithFailoverTest.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/MvccBuddy3NodesWithFailoverTest.java	2009-01-08 17:09:05 UTC (rev 7414)
@@ -0,0 +1,15 @@
+package org.jboss.cache.buddyreplication.mvcc;
+
+import org.jboss.cache.config.Configuration.NodeLockingScheme;
+import org.jboss.cache.buddyreplication.Buddy3NodesWithFailoverTest;
+import org.testng.annotations.Test;
+
+ at Test(groups = {"functional", "mvcc"}, testName = "buddyreplication.mvcc.MvccBuddy3NodesWithFailoverTest")
+public class MvccBuddy3NodesWithFailoverTest extends Buddy3NodesWithFailoverTest
+{
+   @Override
+   protected NodeLockingScheme getNonOptimisticLockingScheme()
+   {
+      return NodeLockingScheme.MVCC;
+   }
+}


Property changes on: core/trunk/src/test/java/org/jboss/cache/buddyreplication/mvcc/MvccBuddy3NodesWithFailoverTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Deleted: core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyReplicationFailoverTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyReplicationFailoverTest.java	2009-01-08 17:05:35 UTC (rev 7413)
+++ core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyReplicationFailoverTest.java	2009-01-08 17:09:05 UTC (rev 7414)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jboss.cache.multiplexer;
-
-import org.jboss.cache.Cache;
-import org.jboss.cache.buddyreplication.Buddy3NodesWithFailoverTest;
-import static org.testng.AssertJUnit.assertTrue;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-
-/**
- * Repeats the superclass tests, but with the multiplexer enabled.
- *
- * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
- * @version $Revision$
- */
- at Test(groups={"functional", "jgroups"}, enabled = true, testName = "multiplexer.Buddy3NodesWithFailoverTest")
-public class BuddyReplicationFailoverTest extends Buddy3NodesWithFailoverTest
-{
-   private ThreadLocal<MultiplexerTestHelper> muxHelperTL = new ThreadLocal<MultiplexerTestHelper>();
-
-   @BeforeMethod(alwaysRun = true)
-   public void setUp() throws Exception
-   {
-      muxHelperTL.set(new MultiplexerTestHelper());
-   }
-
-   @AfterMethod(alwaysRun = true)
-   public void tearDown() throws Exception
-   {
-      try
-      {
-         super.tearDown();
-      }
-      finally
-      {
-         if (muxHelperTL.get() != null)
-            muxHelperTL.get().tearDown();
-         muxHelperTL.set(null);
-      }
-   }
-
-   @Override
-   protected void configureMultiplexer(Cache cache) throws Exception
-   {
-      muxHelperTL.get().configureCacheForMux(cache);
-   }
-
-   @Override
-   protected void validateMultiplexer(Cache cache)
-   {
-      assertTrue("Cache is using multiplexer", cache.getConfiguration().isUsingMultiplexer());
-   }
-
-}

Copied: core/trunk/src/test/java/org/jboss/cache/multiplexer/MultiplexerBuddy3NodesWithFailoverTest.java (from rev 7409, core/trunk/src/test/java/org/jboss/cache/multiplexer/BuddyReplicationFailoverTest.java)
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/multiplexer/MultiplexerBuddy3NodesWithFailoverTest.java	                        (rev 0)
+++ core/trunk/src/test/java/org/jboss/cache/multiplexer/MultiplexerBuddy3NodesWithFailoverTest.java	2009-01-08 17:09:05 UTC (rev 7414)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jboss.cache.multiplexer;
+
+import org.jboss.cache.Cache;
+import org.jboss.cache.buddyreplication.Buddy3NodesWithFailoverTest;
+import static org.testng.AssertJUnit.assertTrue;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+
+/**
+ * Repeats the superclass tests, but with the multiplexer enabled.
+ *
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision$
+ */
+ at Test(groups={"functional", "jgroups"}, enabled = true, testName = "multiplexer.MultiplexerBuddy3NodesWithFailoverTest")
+public class MultiplexerBuddy3NodesWithFailoverTest extends Buddy3NodesWithFailoverTest
+{
+   private ThreadLocal<MultiplexerTestHelper> muxHelperTL = new ThreadLocal<MultiplexerTestHelper>();
+
+   @BeforeMethod(alwaysRun = true)
+   public void setUp() throws Exception
+   {
+      muxHelperTL.set(new MultiplexerTestHelper());
+   }
+
+   @AfterMethod(alwaysRun = true)
+   public void tearDown() throws Exception
+   {
+      try
+      {
+         super.tearDown();
+      }
+      finally
+      {
+         if (muxHelperTL.get() != null)
+            muxHelperTL.get().tearDown();
+         muxHelperTL.set(null);
+      }
+   }
+
+   @Override
+   protected void configureMultiplexer(Cache cache) throws Exception
+   {
+      muxHelperTL.get().configureCacheForMux(cache);
+   }
+
+   @Override
+   protected void validateMultiplexer(Cache cache)
+   {
+      assertTrue("Cache is using multiplexer", cache.getConfiguration().isUsingMultiplexer());
+   }
+
+}


Property changes on: core/trunk/src/test/java/org/jboss/cache/multiplexer/MultiplexerBuddy3NodesWithFailoverTest.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF