svn commit: r1554360 - in /hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase: client/TestAdmin.java master/TestAssignmentManager.java master/TestSplitLogManager.java

[larsh]

Author: larsh
Date: Tue Dec 31 02:55:48 2013
New Revision: 1554360

URL: http://svn.apache.org/r1554360
Log:
Some test fixes

Modified:
    
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
    
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
    
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java

Modified: 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java?rev=1554360&r1=1554359&r2=1554360&view=diff
==============================================================================
--- 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
 (original)
+++ 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
 Tue Dec 31 02:55:48 2013
@@ -71,8 +71,10 @@ import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.junit.runners.MethodSorters;
 
 
 /**
@@ -80,6 +82,7 @@ import org.junit.experimental.categories
  * Spins up the minicluster once at test start and then takes it down 
afterward.
  * Add any testing of HBaseAdmin functionality here.
  */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @Category(LargeTests.class)
 public class TestAdmin {
   final Log LOG = LogFactory.getLog(getClass());

Modified: 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java?rev=1554360&r1=1554359&r2=1554360&view=diff
==============================================================================
--- 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
 (original)
+++ 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
 Tue Dec 31 02:55:48 2013
@@ -71,8 +71,10 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.junit.runners.MethodSorters;
 import org.mockito.Mockito;
 import org.mockito.internal.util.reflection.Whitebox;
 
@@ -82,6 +84,7 @@ import com.google.protobuf.ServiceExcept
 /**
  * Test {@link AssignmentManager}
  */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @Category(MediumTests.class)
 public class TestAssignmentManager {
   private static final HBaseTestingUtility HTU = new HBaseTestingUtility();

Modified: 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
URL: 
http://svn.apache.org/viewvc/hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java?rev=1554360&r1=1554359&r2=1554360&view=diff
==============================================================================
--- 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
 (original)
+++ 
hbase/tags/0.94.15-junit-4.11/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
 Tue Dec 31 02:55:48 2013
@@ -27,7 +27,6 @@ import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
 
 import junit.framework.Assert;
-
 import static org.junit.Assert.*;
 
 import org.apache.commons.logging.Log;
@@ -50,10 +49,13 @@ import org.apache.zookeeper.KeeperExcept
 import org.apache.zookeeper.ZooDefs.Ids;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.junit.runners.MethodSorters;
 import org.mockito.Mockito;
 
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @Category(MediumTests.class)
 public class TestSplitLogManager {
   private static final Log LOG = LogFactory.getLog(TestSplitLogManager.class);