fix merge conflicts

cinchapi · Dec 14, 2017 · 1670785 · 1670785
1 parent 113fc7d
commit 1670785
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 60 deletions.
diff --git a/concourse-integration-tests/src/test/java/com/cinchapi/concourse/CalculateAverageTest.java b/concourse-integration-tests/src/test/java/com/cinchapi/concourse/CalculateAverageTest.java
@@ -97,24 +97,6 @@ public void testAverageKeyCclTimestr() {
         Assert.assertTrue(Numbers.areEqual(expected, actual / 2));
     }
 
-    @Test
-    public void testAverageKeyCclTimestr() {
-        String key = "age";
-        client.add("name", "foo", 1);
-        client.add(key, 30, 1);
-        client.add("name", "bar", 2);
-        client.add(key, 19, 2);
-        client.add("name", "bar", 2);
-        client.add(key, 15, 2);
-        int actual = 34;
-        Timestamp timestamp = Timestamp.fromString("1 second ago");
-        Threads.sleep(1000);
-        client.add(key, 100, 2);
-        Number expected = client.calculate().average(key, "name = bar",
-                timestamp);
-        Assert.assertTrue(Numbers.areEqual(expected, actual / 2));
-    }
-
     @Test
     public void testAverageKeyCriteria() {
         String key = "age";

diff --git a/...lugin-core-tests/src/test/java/com/cinchapi/concourse/server/plugin/PluginReproTests.java b/...lugin-core-tests/src/test/java/com/cinchapi/concourse/server/plugin/PluginReproTests.java
@@ -68,20 +68,4 @@ public void testReproCON_606() {
         Assert.assertEquals("default", environment);
     }
 
-    @Test
-    public void testReproCON_605() {
-        String environment = "foo bar &!* baz";
-        client = Concourse.connect("localhost", server.getClientPort(), "admin",
-                "admin", environment);
-        Assert.assertNotEquals(environment,
-                client.invokePlugin(TestPlugin.class.getName(), "environment"));
-    }
-
-    @Test
-    public void testReproCON_606() {
-        String environment = client.invokePlugin(TestPlugin.class.getName(),
-                "environment");
-        Assert.assertEquals("default", environment);
-    }
-
 }
diff --git a/...in-core/src/test/java/com/cinchapi/concourse/server/plugin/data/TrackingMultimapTest.java b/...in-core/src/test/java/com/cinchapi/concourse/server/plugin/data/TrackingMultimapTest.java
@@ -294,13 +294,6 @@ public void testPercentKeyDataTypeWhenEmpty() {
         Assert.assertEquals(0, tmmap.percentKeyDataType(DataType.NUMBER), 0);
     }
 
-    @Test
-    public void testPercentKeyDataTypeWhenEmpty() {
-        TrackingMultimap<Object, Long> tmmap = TrackingLinkedHashMultimap
-                .create(ObjectResultDataset.OBJECT_COMPARATOR);
-        Assert.assertEquals(0, tmmap.percentKeyDataType(DataType.NUMBER), 0);
-    }
-
     /**
      * Return a random {@link Set} to use within tests.
      * 

diff --git a/concourse-server/src/main/java/com/cinchapi/concourse/server/ConcourseServer.java b/concourse-server/src/main/java/com/cinchapi/concourse/server/ConcourseServer.java
@@ -142,25 +142,6 @@ public class ConcourseServer extends BaseConcourseServer
      */
     private static final int MIN_HEAP_SIZE = 268435456; // 256 MB
 
-    /**
-     * The number of worker threads that Concourse Server uses.
-     */
-    private static final int NUM_WORKER_THREADS = 100; // This may become
-                                                       // configurable in a
-                                                       // prefs file in a
-                                                       // future release.
-
-    /**
-     * Contains the credentials used by the {@link #accessManager}. This file is
-     * typically located in the root of the server installation.
-     */
-    private static final String ACCESS_FILE = ".access";
-
-    /**
-     * The minimum heap size required to run Concourse Server.
-     */
-    private static final int MIN_HEAP_SIZE = 268435456; // 256 MB
-
     /**
      * The number of worker threads that Concourse Server uses.
      */