Add e2E tests for new options.

Addresses #8.

e2e/build.sbt

@@ -4,6 +4,8 @@ PB.protobufSettings
 
 PB.scalapbVersion in PB.protobufConfig := com.trueaccord.scalapb.Version.scalapbVersion
 
+PB.includePaths in PB.protobufConfig ++= Seq(file("../vendor"), file("../protobuf"))
+
 PB.javaConversions in PB.protobufConfig := true
 
 libraryDependencies ++= Seq(

e2e/src/main/protobuf/flat.proto

@@ -0,0 +1,23 @@
+package com.trueaccord.proto.e2e;
+
+import "scalapb.proto";
+
+import "one_of.proto";  // testing an import of non-flat proto
+
+option (scalapb.options) = {
+  package_name: "com.trueaccord.pb.flat"
+  flat_package: true
+};
+
+enum Priority {
+  LOW = 1;
+  MEDIUM = 2;
+  HIGH = 3;
+}
+
+message FlatTest {
+  optional int32 b = 1;
+  optional Priority priority = 2;
+  optional OneofTest one_of_msg = 3;
+}
+

e2e/src/main/protobuf/repeatables.proto

@@ -2,6 +2,8 @@ package com.trueaccord.proto.e2e;
 
 option java_outer_classname = "Reps";
 
+import "flat.proto";
+
 message RepeatablesTest {
     repeated string strings = 1;
     repeated int32 ints = 2;
@@ -11,4 +13,7 @@ message RepeatablesTest {
     message Nested {
         optional int32 nested_field = 1;
     }
+
+    // testing inclusion of a proto compiled with flat_package=true.
+    optional FlatTest flat_test = 5;
 }

e2e/src/test/scala/FlatPackageSpec.scala

@@ -0,0 +1,13 @@
+import com.trueaccord.proto.e2e.one_of._
+import com.trueaccord.pb.flat.Priority
+import com.trueaccord.pb.flat.FlatTest
+import org.scalatest._
+
+class FlatPackageSpec extends FlatSpec with MustMatchers {
+
+  "FlatTest" should "serialize and parse" in {
+    val ft = FlatTest(b=Some(4), priority=Some(Priority.MEDIUM),
+                      oneOfMsg=Some(OneofTest(a=Some(4))))
+    FlatTest.parseFrom(ft.toByteArray) must be(ft)
+  }
+}