Make tests use commons-codec for Base64 instead of javax.xml.bind.Dat…

…atypeConverter

Fixes #466

.travis.yml

@@ -1,6 +1,7 @@
 language: scala
 sudo: required
 dist: trusty
+jdk: oraclejdk9
 
 scala:
 - 2.10.7

build.sbt

@@ -97,7 +97,8 @@ lazy val runtime = crossProject(JSPlatform, JVMPlatform, NativePlatform)
     name := "scalapb-runtime",
     libraryDependencies ++= Seq(
       "com.lihaoyi" %%% "fastparse" % "1.0.0",
-      "com.lihaoyi" %%% "utest" % "0.6.4" % "test"
+      "com.lihaoyi" %%% "utest" % "0.6.4" % "test",
+      "commons-codec" % "commons-codec" % "1.11" % "test",
     ),
     testFrameworks += new TestFramework("utest.runner.Framework"),
     unmanagedResourceDirectories in Compile += baseDirectory.value / "../../protobuf",

scalapb-runtime/jvm/src/test/scala/scalapb/EncodingSpec.scala

@@ -2,6 +2,7 @@ package scalapb
 
 import org.scalatest._
 import org.scalatest.prop.GeneratorDrivenPropertyChecks
+import org.apache.commons.codec.binary.Base64
 
 class EncodingSpec extends PropSpec with GeneratorDrivenPropertyChecks with Matchers {
   property("fromBase64 is the inverse of toBase64") {
@@ -12,13 +13,13 @@ class EncodingSpec extends PropSpec with GeneratorDrivenPropertyChecks with Matc
 
   property("fromBase64 is compatible with javax.printBase64") {
     forAll { b: Array[Byte] =>
-      Encoding.fromBase64(javax.xml.bind.DatatypeConverter.printBase64Binary(b)) should be(b)
+      Encoding.fromBase64(Base64.encodeBase64String(b)) should be(b)
     }
   }
 
   property("toBase64 is compatible with javax.parseBase64") {
     forAll { b: Array[Byte] =>
-      javax.xml.bind.DatatypeConverter.parseBase64Binary(Encoding.toBase64(b)) should be(b)
+      Base64.decodeBase64(Encoding.toBase64(b)) should be(b)
     }
   }
 }