Use examples to hack for integration tests.

Author: jmjoy

examples/hello/Cargo.toml

@@ -14,7 +14,7 @@ crate-type = ["lib", "cdylib"]
 
 # This example is hack to used for integration tests.
 [[example]]
-name = "hello_reexport"
+name = "hello"
 path = "src/_reexport.rs"
 crate-type = ["cdylib"]
 

examples/hello/tests/integration.rs

@@ -8,13 +8,13 @@
 // NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 // See the Mulan PSL v2 for more details.
 
-use phper_test::cli::test_php_scripts;
+use phper_test::{cli::{test_php_scripts, test_php_scripts_with_lib}, utils::get_lib_path_by_example};
 use std::{env, path::Path};
 
 #[test]
 fn test_php() {
-    test_php_scripts(
-        env!("CARGO_BIN_EXE_hello"),
+    test_php_scripts_with_lib(
+        get_lib_path_by_example(env!("CARGO_BIN_EXE_hello")),
         &[&Path::new(env!("CARGO_MANIFEST_DIR"))
             .join("tests")
             .join("php")

examples/http-client/Cargo.toml

@@ -10,6 +10,12 @@ license = "MulanPSL-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
+crate-type = ["lib", "cdylib"]
+
+# This example is hack to used for integration tests.
+[[example]]
+name = "http-client"
+path = "src/_reexport.rs"
 crate-type = ["cdylib"]
 
 [dependencies]

examples/http-client/src/_reexport.rs

@@ -0,0 +1,11 @@
+// Copyright (c) 2019 jmjoy
+// PHPER is licensed under Mulan PSL v2.
+// You can use this software according to the terms and conditions of the Mulan
+// PSL v2. You may obtain a copy of Mulan PSL v2 at:
+//          http://license.coscl.org.cn/MulanPSL2
+// THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY
+// KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+// NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+// See the Mulan PSL v2 for more details.
+
+pub use http_client::*;

examples/http-client/tests/integration.rs

@@ -8,13 +8,13 @@
 // NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 // See the Mulan PSL v2 for more details.
 
-use phper_test::cli::test_php_scripts;
+use phper_test::{cli::{test_php_scripts, test_php_scripts_with_lib}, utils::get_lib_path_by_example};
 use std::{env, path::Path};
 
 #[test]
 fn test_php() {
-    test_php_scripts(
-        env!("CARGO_BIN_EXE_http-client"),
+    test_php_scripts_with_lib(
+        get_lib_path_by_example(env!("CARGO_BIN_EXE_http-client")),
         &[&Path::new(env!("CARGO_MANIFEST_DIR"))
             .join("tests")
             .join("php")

examples/http-server/Cargo.toml

@@ -10,6 +10,12 @@ license = "MulanPSL-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
+crate-type = ["lib", "cdylib"]
+
+# This example is hack to used for integration tests.
+[[example]]
+name = "http-server"
+path = "src/_reexport.rs"
 crate-type = ["cdylib"]
 
 [dependencies]

examples/http-server/src/_reexport.rs

@@ -0,0 +1,11 @@
+// Copyright (c) 2019 jmjoy
+// PHPER is licensed under Mulan PSL v2.
+// You can use this software according to the terms and conditions of the Mulan
+// PSL v2. You may obtain a copy of Mulan PSL v2 at:
+//          http://license.coscl.org.cn/MulanPSL2
+// THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY
+// KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+// NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+// See the Mulan PSL v2 for more details.
+
+pub use http_server::*;

examples/http-server/src/server.rs

@@ -50,7 +50,7 @@ pub fn make_server_class() -> StatefulClass<Option<Builder<AddrIncoming>>> {
         |this, arguments| {
             let host = arguments[0].expect_z_str()?;
             let port = arguments[1].expect_long()?;
-            this.set_property("host", host);
+            this.set_property("host", host.to_owned());
             this.set_property("port", port);
             let addr = format!("{}:{}", host.to_str()?, port).parse::<SocketAddr>()?;
             let builder = Server::bind(&addr);

examples/http-server/tests/integration.rs

@@ -9,15 +9,15 @@
 // See the Mulan PSL v2 for more details.
 
 use hyper::header::CONTENT_TYPE;
-use phper_test::cli::test_long_term_php_script_with_condition;
+use phper_test::{cli::{test_long_term_php_script_with_condition, test_long_term_php_script_with_condition_and_lib}, utils::get_lib_path_by_example};
 use reqwest::Client;
 use std::{env, path::Path, thread::sleep, time::Duration};
 use tokio::runtime;
 
 #[test]
 fn test_php() {
-    test_long_term_php_script_with_condition(
-        env!("CARGO_BIN_EXE_http-server"),
+    test_long_term_php_script_with_condition_and_lib(
+get_lib_path_by_example(env!("CARGO_BIN_EXE_http-server")),
         Path::new(env!("CARGO_MANIFEST_DIR"))
             .join("tests")
             .join("php")

examples/logging/Cargo.toml

@@ -10,6 +10,12 @@ license = "MulanPSL-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
+crate-type = ["lib", "cdylib"]
+
+# This example is hack to used for integration tests.
+[[example]]
+name = "logging"
+path = "src/_reexport.rs"
 crate-type = ["cdylib"]
 
 [dependencies]