accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [10/12] git commit: ACCUMULO-3213 Fix up SimpleGarbageCollectorTest
Date Fri, 31 Oct 2014 21:27:09 GMT
ACCUMULO-3213 Fix up SimpleGarbageCollectorTest


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3900b21
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3900b21
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d3900b21

Branch: refs/heads/1.6
Commit: d3900b21c79e1258c6a540fba866efef0ba8cd86
Parents: 43cee41
Author: Josh Elser <elserj@apache.org>
Authored: Fri Oct 31 16:03:59 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Oct 31 16:03:59 2014 -0400

----------------------------------------------------------------------
 .../accumulo/gc/SimpleGarbageCollectorTest.java | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3900b21/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
----------------------------------------------------------------------
diff --git a/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
b/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
index 672aee2..192a858 100644
--- a/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
@@ -16,6 +16,18 @@
  */
 package org.apache.accumulo.gc;
 
+import static org.apache.accumulo.gc.SimpleGarbageCollector.CANDIDATE_MEMORY_PERCENTAGE;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 import java.io.FileNotFoundException;
 
 import org.apache.accumulo.core.client.Instance;
@@ -24,9 +36,6 @@ import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.security.Credentials;
 import org.apache.accumulo.core.security.thrift.TCredentials;
 import org.apache.accumulo.gc.SimpleGarbageCollector.Opts;
-
-import static org.apache.accumulo.gc.SimpleGarbageCollector.CANDIDATE_MEMORY_PERCENTAGE;
-
 import org.apache.accumulo.server.fs.VolumeManager;
 import org.apache.accumulo.trace.thrift.TInfo;
 import org.apache.hadoop.fs.Path;
@@ -34,17 +43,6 @@ import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-
 public class SimpleGarbageCollectorTest {
   private VolumeManager volMgr;
   private Instance instance;
@@ -76,6 +74,7 @@ public class SimpleGarbageCollectorTest {
     expect(systemConfig.getTimeInMillis(Property.GC_CYCLE_DELAY)).andReturn(20000L);
     expect(systemConfig.getCount(Property.GC_DELETE_THREADS)).andReturn(2).times(2);
     expect(systemConfig.getBoolean(Property.GC_TRASH_IGNORE)).andReturn(false);
+    expect(systemConfig.getBoolean(Property.GC_FILE_ARCHIVE)).andReturn(false);
     replay(systemConfig);
     return systemConfig;
   }
@@ -123,6 +122,7 @@ public class SimpleGarbageCollectorTest {
     expect(systemConfig.getTimeInMillis(Property.GC_CYCLE_START)).andReturn(1000L);
     expect(systemConfig.getTimeInMillis(Property.GC_CYCLE_DELAY)).andReturn(20000L);
     expect(systemConfig.getCount(Property.GC_DELETE_THREADS)).andReturn(2);
+    expect(systemConfig.getBoolean(Property.GC_FILE_ARCHIVE)).andReturn(false);
     expect(systemConfig.getBoolean(Property.GC_TRASH_IGNORE)).andReturn(true);
     replay(systemConfig);
     gc.init(volMgr, instance, credentials, systemConfig);


Mime
View raw message