Move all the tests out of test packages.

No one seems to want to do this, including my own IDE.

Author: codahale

metrics-core/src/main/java/com/yammer/metrics/LongAdder.java

@@ -8,8 +8,8 @@
 
 package com.yammer.metrics;
 
-import java.util.concurrent.atomic.AtomicLong;
 import java.io.Serializable;
+import java.util.concurrent.atomic.AtomicLong;
 
 // CHECKSTYLE:OFF
 /**

metrics-core/src/main/java/com/yammer/metrics/Snapshot.java

@@ -1,8 +1,11 @@
 package com.yammer.metrics;
 
-import java.io.*;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
 import java.nio.charset.Charset;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
 
 import static java.lang.Math.floor;
 

metrics-core/src/test/java/com/yammer/metrics/tests/CachedGaugeTest.java metrics-core/src/test/java/com/yammer/metrics/CachedGaugeTest.java

@@ -1,7 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.CachedGauge;
-import com.yammer.metrics.Gauge;
 import org.junit.Test;
 
 import java.util.concurrent.TimeUnit;

metrics-core/src/test/java/com/yammer/metrics/tests/ClockTest.java metrics-core/src/test/java/com/yammer/metrics/ClockTest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.Clock;
 import org.junit.Test;
 
 import java.lang.management.ManagementFactory;

metrics-core/src/test/java/com/yammer/metrics/tests/ConsoleReporterTest.java metrics-core/src/test/java/com/yammer/metrics/ConsoleReporterTest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.*;
 import org.junit.Before;
 import org.junit.Test;
 

metrics-core/src/test/java/com/yammer/metrics/tests/CounterTest.java metrics-core/src/test/java/com/yammer/metrics/CounterTest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.Counter;
 import org.junit.Test;
 
 import static org.fest.assertions.api.Assertions.assertThat;

metrics-core/src/test/java/com/yammer/metrics/tests/CsvReporterTest.java metrics-core/src/test/java/com/yammer/metrics/CsvReporterTest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.*;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;

metrics-core/src/test/java/com/yammer/metrics/tests/DerivativeGaugeTest.java metrics-core/src/test/java/com/yammer/metrics/DerivativeGaugeTest.java

@@ -1,7 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.DerivativeGauge;
-import com.yammer.metrics.Gauge;
 import org.junit.Test;
 
 import static org.fest.assertions.api.Assertions.assertThat;

metrics-core/src/test/java/com/yammer/metrics/tests/EWMATest.java metrics-core/src/test/java/com/yammer/metrics/EWMATest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.EWMA;
 import org.junit.Test;
 
 import java.util.concurrent.TimeUnit;

metrics-core/src/test/java/com/yammer/metrics/tests/ExponentiallyDecayingReservoirTest.java metrics-core/src/test/java/com/yammer/metrics/ExponentiallyDecayingReservoirTest.java

@@ -1,8 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.Clock;
-import com.yammer.metrics.ExponentiallyDecayingReservoir;
-import com.yammer.metrics.Snapshot;
 import org.junit.Test;
 
 import java.util.concurrent.TimeUnit;

metrics-core/src/test/java/com/yammer/metrics/tests/HistogramTest.java metrics-core/src/test/java/com/yammer/metrics/HistogramTest.java

@@ -1,8 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.Histogram;
-import com.yammer.metrics.Reservoir;
-import com.yammer.metrics.Snapshot;
 import org.junit.Test;
 
 import static org.fest.assertions.api.Assertions.assertThat;

metrics-core/src/test/java/com/yammer/metrics/tests/JmxAttributeGaugeTest.java metrics-core/src/test/java/com/yammer/metrics/JmxAttributeGaugeTest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.JmxAttributeGauge;
 import org.junit.Test;
 
 import javax.management.AttributeNotFoundException;

metrics-core/src/test/java/com/yammer/metrics/tests/JmxReporterTest.java metrics-core/src/test/java/com/yammer/metrics/JmxReporterTest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -12,9 +11,7 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import static org.fest.assertions.api.Assertions.assertThat;
-import static org.fest.assertions.api.Assertions.entry;
-import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown;
+import static org.fest.assertions.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 public class JmxReporterTest {

metrics-core/src/test/java/com/yammer/metrics/tests/JvmAttributeGaugeSetTest.java metrics-core/src/test/java/com/yammer/metrics/JvmAttributeGaugeSetTest.java

@@ -1,7 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.Gauge;
-import com.yammer.metrics.JvmAttributeGaugeSet;
 import org.junit.Before;
 import org.junit.Test;
 

metrics-core/src/test/java/com/yammer/metrics/tests/MeterTest.java metrics-core/src/test/java/com/yammer/metrics/MeterTest.java

@@ -1,7 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.Clock;
-import com.yammer.metrics.Meter;
 import org.junit.Before;
 import org.junit.Test;
 

metrics-core/src/test/java/com/yammer/metrics/tests/MetricFilterTest.java metrics-core/src/test/java/com/yammer/metrics/MetricFilterTest.java

@@ -1,7 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.Metric;
-import com.yammer.metrics.MetricFilter;
 import org.junit.Test;
 
 import static org.fest.assertions.api.Assertions.assertThat;

metrics-core/src/test/java/com/yammer/metrics/tests/MetricRegistryListenerTest.java metrics-core/src/test/java/com/yammer/metrics/MetricRegistryListenerTest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.*;
 import org.junit.Test;
 
 import static org.mockito.Mockito.mock;

metrics-core/src/test/java/com/yammer/metrics/tests/MetricRegistryTest.java metrics-core/src/test/java/com/yammer/metrics/MetricRegistryTest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.*;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -324,7 +323,7 @@ public void elidesEmptyStringsFromNames() throws Exception {
     @Test
     public void concatenatesClassNamesWithStringsToFormADottedName() throws Exception {
         assertThat(name(MetricRegistryTest.class, "one", "two"))
-                .isEqualTo("com.yammer.metrics.tests.MetricRegistryTest.one.two");
+                .isEqualTo("com.yammer.metrics.MetricRegistryTest.one.two");
     }
 
     @Test
@@ -337,6 +336,6 @@ public String getValue() {
         };
 
         assertThat(name(g.getClass(), "one", "two"))
-                .isEqualTo("com.yammer.metrics.tests.MetricRegistryTest$5.one.two");
+                .isEqualTo("com.yammer.metrics.MetricRegistryTest$5.one.two");
     }
 }

metrics-core/src/test/java/com/yammer/metrics/tests/RatioGaugeTest.java metrics-core/src/test/java/com/yammer/metrics/RatioGaugeTest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.RatioGauge;
 import org.junit.Test;
 
 import static org.fest.assertions.api.Assertions.assertThat;

metrics-core/src/test/java/com/yammer/metrics/tests/ScheduledReporterTest.java metrics-core/src/test/java/com/yammer/metrics/ScheduledReporterTest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

metrics-core/src/test/java/com/yammer/metrics/tests/Slf4jReporterTest.java metrics-core/src/test/java/com/yammer/metrics/Slf4jReporterTest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.*;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.Marker;
@@ -9,9 +8,7 @@
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 public class Slf4jReporterTest {
     private final Logger logger = mock(Logger.class);

metrics-core/src/test/java/com/yammer/metrics/tests/SlidingTimeWindowReservoirTest.java metrics-core/src/test/java/com/yammer/metrics/SlidingTimeWindowReservoirTest.java

@@ -1,7 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.Clock;
-import com.yammer.metrics.SlidingTimeWindowReservoir;
 import org.junit.Test;
 
 import java.util.concurrent.TimeUnit;

metrics-core/src/test/java/com/yammer/metrics/tests/SlidingWindowReservoirTest.java metrics-core/src/test/java/com/yammer/metrics/SlidingWindowReservoirTest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.SlidingWindowReservoir;
 import org.junit.Test;
 
 import static org.fest.assertions.api.Assertions.assertThat;

metrics-core/src/test/java/com/yammer/metrics/tests/SnapshotTest.java metrics-core/src/test/java/com/yammer/metrics/SnapshotTest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.Snapshot;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;

metrics-core/src/test/java/com/yammer/metrics/tests/TimerTest.java metrics-core/src/test/java/com/yammer/metrics/TimerTest.java

@@ -1,9 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.Clock;
-import com.yammer.metrics.Reservoir;
-import com.yammer.metrics.Snapshot;
-import com.yammer.metrics.Timer;
 import org.junit.Test;
 
 import java.util.concurrent.Callable;

metrics-core/src/test/java/com/yammer/metrics/tests/UniformReservoirTest.java metrics-core/src/test/java/com/yammer/metrics/UniformReservoirTest.java

@@ -1,7 +1,5 @@
-package com.yammer.metrics.tests;
+package com.yammer.metrics;
 
-import com.yammer.metrics.Snapshot;
-import com.yammer.metrics.UniformReservoir;
 import org.junit.Test;
 
 import static org.fest.assertions.api.Assertions.assertThat;

metrics-core/src/test/java/com/yammer/metrics/benchmarks/ReservoirBenchmark.java

@@ -2,9 +2,10 @@
 
 import com.google.caliper.Runner;
 import com.google.caliper.SimpleBenchmark;
-import com.yammer.metrics.*;
 import com.yammer.metrics.ExponentiallyDecayingReservoir;
+import com.yammer.metrics.SlidingTimeWindowReservoir;
 import com.yammer.metrics.SlidingWindowReservoir;
+import com.yammer.metrics.UniformReservoir;
 
 import java.util.concurrent.TimeUnit;
 

metrics-ehcache/src/test/java/com/yammer/metrics/ehcache/tests/InstrumentedEhcacheTest.java metrics-ehcache/src/test/java/com/yammer/metrics/ehcache/InstrumentedEhcacheTest.java

@@ -1,8 +1,7 @@
-package com.yammer.metrics.ehcache.tests;
+package com.yammer.metrics.ehcache;
 
 import com.yammer.metrics.MetricRegistry;
 import com.yammer.metrics.Timer;
-import com.yammer.metrics.ehcache.InstrumentedEhcache;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Ehcache;

metrics-ganglia/src/test/java/com/yammer/metrics/ganglia/tests/GangliaReporterTest.java metrics-ganglia/src/test/java/com/yammer/metrics/ganglia/GangliaReporterTest.java

@@ -1,7 +1,6 @@
-package com.yammer.metrics.ganglia.tests;
+package com.yammer.metrics.ganglia;
 
 import com.yammer.metrics.*;
-import com.yammer.metrics.ganglia.GangliaReporter;
 import info.ganglia.gmetric4j.gmetric.GMetric;
 import info.ganglia.gmetric4j.gmetric.GMetricSlope;
 import info.ganglia.gmetric4j.gmetric.GMetricType;

metrics-graphite/src/test/java/com/yammer/metrics/graphite/tests/GraphiteReporterTest.java metrics-graphite/src/test/java/com/yammer/metrics/graphite/GraphiteReporterTest.java

@@ -1,8 +1,6 @@
-package com.yammer.metrics.graphite.tests;
+package com.yammer.metrics.graphite;
 
 import com.yammer.metrics.*;
-import com.yammer.metrics.graphite.Graphite;
-import com.yammer.metrics.graphite.GraphiteReporter;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InOrder;

metrics-graphite/src/test/java/com/yammer/metrics/graphite/tests/GraphiteTest.java metrics-graphite/src/test/java/com/yammer/metrics/graphite/GraphiteTest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.graphite.tests;
+package com.yammer.metrics.graphite;
 
-import com.yammer.metrics.graphite.Graphite;
 import org.junit.Before;
 import org.junit.Test;
 

metrics-healthchecks/src/test/java/com/yammer/metrics/health/tests/HealthCheckRegistryTest.java metrics-healthchecks/src/test/java/com/yammer/metrics/health/HealthCheckRegistryTest.java

@@ -1,7 +1,5 @@
-package com.yammer.metrics.health.tests;
+package com.yammer.metrics.health;
 
-import com.yammer.metrics.health.HealthCheck;
-import com.yammer.metrics.health.HealthCheckRegistry;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -11,9 +9,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import static org.fest.assertions.api.Assertions.assertThat;
-import static org.fest.assertions.api.Assertions.entry;
-import static org.fest.assertions.api.Assertions.failBecauseExceptionWasNotThrown;
+import static org.fest.assertions.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

metrics-healthchecks/src/test/java/com/yammer/metrics/health/tests/HealthCheckTest.java metrics-healthchecks/src/test/java/com/yammer/metrics/health/HealthCheckTest.java

@@ -1,6 +1,5 @@
-package com.yammer.metrics.health.tests;
+package com.yammer.metrics.health;
 
-import com.yammer.metrics.health.HealthCheck;
 import org.junit.Test;
 
 import static org.fest.assertions.api.Assertions.assertThat;

metrics-healthchecks/src/test/java/com/yammer/metrics/health/jvm/tests/ThreadDeadlockHealthCheckTest.java metrics-healthchecks/src/test/java/com/yammer/metrics/health/jvm/ThreadDeadlockHealthCheckTest.java

@@ -1,7 +1,6 @@
-package com.yammer.metrics.health.jvm.tests;
+package com.yammer.metrics.health.jvm;
 
 import com.yammer.metrics.health.HealthCheck;
-import com.yammer.metrics.health.jvm.ThreadDeadlockHealthCheck;
 import com.yammer.metrics.jvm.ThreadDeadlockDetector;
 import org.junit.Test;
 

metrics-httpclient/src/test/java/com/yammer/metrics/httpclient/tests/InstrumentedHttpClientTest.java metrics-httpclient/src/test/java/com/yammer/metrics/httpclient/InstrumentedHttpClientTest.java

@@ -1,8 +1,6 @@
-package com.yammer.metrics.httpclient.tests;
+package com.yammer.metrics.httpclient;
 
 import com.yammer.metrics.MetricRegistry;
-import com.yammer.metrics.httpclient.InstrumentedClientConnManager;
-import com.yammer.metrics.httpclient.InstrumentedHttpClient;
 import org.apache.http.client.HttpClient;
 import org.junit.Test;
 

metrics-jdbi/src/test/java/com/yammer/metrics/jdbi/tests/InstrumentedTimingCollectorTest.java metrics-jdbi/src/test/java/com/yammer/metrics/jdbi/InstrumentedTimingCollectorTest.java

@@ -1,8 +1,7 @@
-package com.yammer.metrics.jdbi.tests;
+package com.yammer.metrics.jdbi;
 
 import com.yammer.metrics.MetricRegistry;
 import com.yammer.metrics.Timer;
-import com.yammer.metrics.jdbi.InstrumentedTimingCollector;
 import com.yammer.metrics.jdbi.strategies.NameStrategies;
 import com.yammer.metrics.jdbi.strategies.ShortNameStrategy;
 import com.yammer.metrics.jdbi.strategies.SmartNameStrategy;

metrics-jersey/src/test/java/com/yammer/metrics/jersey/tests/SingletonMetricsJerseyTest.java metrics-jersey/src/test/java/com/yammer/metrics/jersey/SingletonMetricsJerseyTest.java

@@ -1,4 +1,4 @@
-package com.yammer.metrics.jersey.tests;
+package com.yammer.metrics.jersey;
 
 import com.sun.jersey.api.container.MappableContainerException;
 import com.sun.jersey.api.core.DefaultResourceConfig;
@@ -8,8 +8,7 @@
 import com.yammer.metrics.Meter;
 import com.yammer.metrics.MetricRegistry;
 import com.yammer.metrics.Timer;
-import com.yammer.metrics.jersey.InstrumentedResourceMethodDispatchAdapter;
-import com.yammer.metrics.jersey.tests.resources.InstrumentedResource;
+import com.yammer.metrics.jersey.resources.InstrumentedResource;
 import org.junit.Test;
 
 import java.io.IOException;

metrics-jersey/src/test/java/com/yammer/metrics/jersey/tests/resources/InstrumentedResource.java metrics-jersey/src/test/java/com/yammer/metrics/jersey/resources/InstrumentedResource.java

@@ -1,4 +1,4 @@
-package com.yammer.metrics.jersey.tests.resources;
+package com.yammer.metrics.jersey.resources;
 
 import com.yammer.metrics.annotation.ExceptionMetered;
 import com.yammer.metrics.annotation.Metered;