aboutsummaryrefslogtreecommitdiff
path: root/java/core
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2017-03-29 16:03:53 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2017-03-29 16:03:53 -0700
commit84f6954ca91e7dbe57e4c972f9ac260361beaa49 (patch)
treed361178fa5a46de2ea88334f7debbea423fdf2e6 /java/core
parentacde1651b53ddc50f0e37907acd109b2e10e5274 (diff)
downloadprotobuf-84f6954ca91e7dbe57e4c972f9ac260361beaa49.tar.gz
protobuf-84f6954ca91e7dbe57e4c972f9ac260361beaa49.tar.bz2
protobuf-84f6954ca91e7dbe57e4c972f9ac260361beaa49.zip
Fix Java build.
Diffstat (limited to 'java/core')
-rw-r--r--java/core/pom.xml5
-rw-r--r--java/core/src/test/java/com/google/protobuf/MapTest.java3
2 files changed, 7 insertions, 1 deletions
diff --git a/java/core/pom.xml b/java/core/pom.xml
index be0da5ea..79160f2e 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -34,6 +34,11 @@
<artifactId>easymockclassextension</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/java/core/src/test/java/com/google/protobuf/MapTest.java b/java/core/src/test/java/com/google/protobuf/MapTest.java
index 01b371a3..9ce5ebc9 100644
--- a/java/core/src/test/java/com/google/protobuf/MapTest.java
+++ b/java/core/src/test/java/com/google/protobuf/MapTest.java
@@ -1516,7 +1516,8 @@ public class MapTest extends TestCase {
}
try {
- builder.putAllInt32ToMessageField(newMap(4, null, 5, null));
+ builder.putAllInt32ToMessageField(
+ MapTest.<Integer, MessageValue>newMap(4, null, 5, null));
fail();
} catch (NullPointerException expected) {
}