Merge pull request #138 from sebright/test-with-maven

Starts building tests with Maven.

5 files changed, 25 insertions, 9 deletions

diff --git a/core/pom.xml b/core/pom.xml
index 9d286cef..655e4118 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,6 +23,22 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-testCompile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+            <configuration>
+              <!--
+              Don't build the tests, because they currently create a circular
+              dependency between the 'core' and 'core_impl' directories.
+              -->
+              <skip>true</skip>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -62,4 +78,4 @@
       </build>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/core/src/test/java/com/google/instrumentation/stats/ViewTest.java b/core/src/test/java/com/google/instrumentation/stats/ViewTest.java
index 5a057918..7a1dd483 100644
--- a/core/src/test/java/com/google/instrumentation/stats/ViewTest.java
+++ b/core/src/test/java/com/google/instrumentation/stats/ViewTest.java
@@ -47,7 +47,7 @@ public final class ViewTest {
     final DistributionViewDescriptor viewDescriptor =
         DistributionViewDescriptor.create(
             name, description, measurementDescriptor, aggregationDescriptor, tagKeys);
-    List<DistributionAggregation> aggregations = Arrays.asList(
+    final List<DistributionAggregation> aggregations = Arrays.asList(
         DistributionAggregation.create(5, 5.0, 15.0, Range.create(1.0, 5.0), tags1,
             Arrays.asList(1L, 1L, 1L, 1L, 1L)),
         DistributionAggregation.create(10, 5.0, 30.0, Range.create(1.0, 5.0), tags2,
diff --git a/core/src/test/java/com/google/instrumentation/trace/SamplersTest.java b/core/src/test/java/com/google/instrumentation/trace/SamplersTest.java
index d8b83667..954983b2 100644
--- a/core/src/test/java/com/google/instrumentation/trace/SamplersTest.java
+++ b/core/src/test/java/com/google/instrumentation/trace/SamplersTest.java
@@ -40,7 +40,7 @@ public class SamplersTest {
                     traceId,
                     spanId,
                     "Another name",
-                    Collections.emptyList()))
+                    Collections.<Span>emptyList()))
         .isTrue();
     // Untraced parent.
     assertThat(
@@ -51,7 +51,7 @@ public class SamplersTest {
                     traceId,
                     spanId,
                     "Yet another name",
-                    Collections.emptyList()))
+                    Collections.<Span>emptyList()))
         .isTrue();
   }
 
@@ -76,7 +76,7 @@ public class SamplersTest {
                     traceId,
                     spanId,
                     "bar",
-                    Collections.emptyList()))
+                    Collections.<Span>emptyList()))
         .isFalse();
     // Untraced parent.
     assertThat(
@@ -87,7 +87,7 @@ public class SamplersTest {
                     traceId,
                     spanId,
                     "quux",
-                    Collections.emptyList()))
+                    Collections.<Span>emptyList()))
         .isFalse();
   }
 
diff --git a/core/src/test/java/com/google/instrumentation/trace/SpanBuilderTest.java b/core/src/test/java/com/google/instrumentation/trace/SpanBuilderTest.java
index 56679585..cce15c0e 100644
--- a/core/src/test/java/com/google/instrumentation/trace/SpanBuilderTest.java
+++ b/core/src/test/java/com/google/instrumentation/trace/SpanBuilderTest.java
@@ -116,7 +116,7 @@ public class SpanBuilderTest {
 
   @Test
   public void startRootSpanWithOptions() {
-    List<Span> parentList = Arrays.asList(BlankSpan.INSTANCE);
+    List<Span> parentList = Arrays.<Span>asList(BlankSpan.INSTANCE);
     StartSpanOptions startSpanOptions = new StartSpanOptions();
     startSpanOptions.setParentLinks(parentList);
     startSpanOptions.setSampler(Samplers.neverSample());
diff --git a/core/src/test/java/com/google/instrumentation/trace/StartSpanOptionsTest.java b/core/src/test/java/com/google/instrumentation/trace/StartSpanOptionsTest.java
index 314789a8..82278616 100644
--- a/core/src/test/java/com/google/instrumentation/trace/StartSpanOptionsTest.java
+++ b/core/src/test/java/com/google/instrumentation/trace/StartSpanOptionsTest.java
@@ -27,7 +27,7 @@ import org.junit.runners.JUnit4;
 /** Unit tests for {@link StartSpanOptions}. */
 @RunWith(JUnit4.class)
 public class StartSpanOptionsTest {
-  private final List<Span> singleParentList = Arrays.asList(BlankSpan.INSTANCE);
+  private final List<Span> singleParentList = Arrays.<Span>asList(BlankSpan.INSTANCE);
 
   @Test
   public void defaultOptions() {
@@ -81,7 +81,7 @@ public class StartSpanOptionsTest {
   @Test
   public void setParentLinks_MultipleParents() {
     StartSpanOptions options = new StartSpanOptions();
-    options.setParentLinks(Arrays.asList(BlankSpan.INSTANCE, BlankSpan.INSTANCE));
+    options.setParentLinks(Arrays.<Span>asList(BlankSpan.INSTANCE, BlankSpan.INSTANCE));
     assertThat(options.getStartTime()).isNull();
     assertThat(options.getSampler()).isNull();
     assertThat(options.getParentLinks().size()).isEqualTo(2);