From 6ebe6f6357d6a630b74cbc2f36e5ede542b16fde Mon Sep 17 00:00:00 2001
From: Lucio Franco <luciofranco14@gmail.com>
Date: Wed, 23 Oct 2019 14:49:17 -0400
Subject: [PATCH] Move wellknown test into tests dir

---
 Cargo.toml                                       |  2 ++
 tests/wellknown/Cargo.toml                       | 16 ++++++++++++++++
 tests/wellknown/build.rs                         |  3 +++
 .../wellknown/proto}/wellknown.proto             |  0
 tests/wellknown/src/lib.rs                       |  3 +++
 tonic-build/tests/wellknown.rs                   | 12 ------------
 6 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 tests/wellknown/Cargo.toml
 create mode 100644 tests/wellknown/build.rs
 rename {tonic-build/tests/protos => tests/wellknown/proto}/wellknown.proto (100%)
 create mode 100644 tests/wellknown/src/lib.rs
 delete mode 100644 tonic-build/tests/wellknown.rs

diff --git a/Cargo.toml b/Cargo.toml
index 1edf317b6..a0febc44e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,5 +4,7 @@ members = [
     "tonic-build",
     "tonic-examples",
     "tonic-interop",
+
     "tests/same_name",
+    "tests/wellknown",
 ]
diff --git a/tests/wellknown/Cargo.toml b/tests/wellknown/Cargo.toml
new file mode 100644
index 000000000..3e321dabb
--- /dev/null
+++ b/tests/wellknown/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "wellknown"
+version = "0.1.0"
+authors = ["Lucio Franco <luciofranco14@gmail.com>"]
+edition = "2018"
+publish = false
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+tonic = { path = "../../tonic" }
+bytes = "0.4"
+prost = "0.5"
+
+[build-dependencies]
+tonic-build = { path = "../../tonic-build" }
diff --git a/tests/wellknown/build.rs b/tests/wellknown/build.rs
new file mode 100644
index 000000000..b3952daff
--- /dev/null
+++ b/tests/wellknown/build.rs
@@ -0,0 +1,3 @@
+fn main() {
+    tonic_build::compile_protos("proto/wellknown.proto").unwrap();
+}
diff --git a/tonic-build/tests/protos/wellknown.proto b/tests/wellknown/proto/wellknown.proto
similarity index 100%
rename from tonic-build/tests/protos/wellknown.proto
rename to tests/wellknown/proto/wellknown.proto
diff --git a/tests/wellknown/src/lib.rs b/tests/wellknown/src/lib.rs
new file mode 100644
index 000000000..169ed0c3e
--- /dev/null
+++ b/tests/wellknown/src/lib.rs
@@ -0,0 +1,3 @@
+pub mod pb {
+    tonic::include_proto!("wellknown");
+}
diff --git a/tonic-build/tests/wellknown.rs b/tonic-build/tests/wellknown.rs
deleted file mode 100644
index 51aa89647..000000000
--- a/tonic-build/tests/wellknown.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-#[test]
-fn wellknown() {
-    let tmp = std::env::temp_dir();
-    tonic_build::configure()
-        .out_dir(tmp)
-        .format(false)
-        .type_attribute(".", "#[derive(Serialize, Deserialize)]")
-        .type_attribute(".", "#[serde(rename_all = \"camelCase\")]")
-        .field_attribute("in", "#[serde(rename = \"in\")]")
-        .compile(&["tests/protos/wellknown.proto"], &["tests/protos"])
-        .unwrap();
-}