Use examples to hack for integration tests.

jmjoy · jmjoy · commit 28fa2fa14bb2 · 2022-06-25T15:32:20.000+08:00
diff --git a/examples/hello/Cargo.toml b/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"]
 
diff --git a/examples/hello/tests/integration.rs b/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")
diff --git a/examples/http-client/Cargo.toml b/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]
diff --git a/examples/http-client/src/_reexport.rs b/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::*;
diff --git a/examples/http-client/tests/integration.rs b/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")
diff --git a/examples/http-server/Cargo.toml b/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]
diff --git a/examples/http-server/src/_reexport.rs b/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::*;
diff --git a/examples/http-server/src/server.rs b/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);
diff --git a/examples/http-server/tests/integration.rs b/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")
diff --git a/examples/logging/Cargo.toml b/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]
diff --git a/examples/logging/src/_reexport.rs b/examples/logging/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 logging::*;
diff --git a/examples/logging/tests/integration.rs b/examples/logging/tests/integration.rs
@@ -8,7 +8,7 @@
 // NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 // See the Mulan PSL v2 for more details.
 
-use phper_test::cli::test_php_scripts_with_condition;
+use phper_test::{cli::{test_php_scripts_with_condition, test_php_scripts_with_condition_and_lib}, utils::get_lib_path_by_example};
 use std::{env, path::Path, str};
 
 #[test]
@@ -17,8 +17,8 @@ fn test_php() {
         .join("tests")
         .join("php");
 
-    test_php_scripts_with_condition(
-        env!("CARGO_BIN_EXE_logging"),
+    test_php_scripts_with_condition_and_lib(
+    get_lib_path_by_example(env!("CARGO_BIN_EXE_logging")),
         &[
             (&base_dir.join("test_php_say.php"), &|output| {
                 let stdout = str::from_utf8(&output.stdout).unwrap();
diff --git a/phper-test/src/cli.rs b/phper-test/src/cli.rs
@@ -127,8 +127,17 @@ pub fn test_long_term_php_script_with_condition(
     exe_path: impl AsRef<Path>, script: impl AsRef<Path>,
     condition: impl FnOnce(&Child) + UnwindSafe,
 ) {
-    let context = Context::get_global();
     let lib_path = utils::get_lib_path(exe_path);
+    test_long_term_php_script_with_condition_and_lib(lib_path, script, condition)
+}
+
+/// Check your extension by executing the long term php script such as http
+/// server, if the all your specified checkers are pass, than the test is pass.
+pub fn test_long_term_php_script_with_condition_and_lib(
+    lib_path: impl AsRef<Path>, script: impl AsRef<Path>,
+    condition: impl FnOnce(&Child) + UnwindSafe,
+) {
+    let context = Context::get_global();
     let tmp_php_ini_file = context.create_tmp_php_ini_file(lib_path);
     let mut command = context.create_command_with_tmp_php_ini_args(&tmp_php_ini_file, script);
     let mut child = command.spawn().unwrap();
diff --git a/phper/src/values.rs b/phper/src/values.rs
@@ -448,12 +448,6 @@ impl From<String> for ZVal {
     }
 }
 
-impl From<&ZStr> for ZVal {
-    fn from(s: &ZStr) -> Self {
-        ZVal::from(s.to_bytes())
-    }
-}
-
 impl From<ZString> for ZVal {
     fn from(s: ZString) -> Self {
         unsafe {
@@ -464,19 +458,6 @@ impl From<ZString> for ZVal {
     }
 }
 
-impl From<&ZArr> for ZVal {
-    fn from(arr: &ZArr) -> Self {
-        unsafe {
-            let mut val = MaybeUninit::<ZVal>::uninit();
-            phper_zval_arr(
-                val.as_mut_ptr().cast(),
-                zend_array_dup(arr.as_ptr() as *mut _),
-            );
-            val.assume_init()
-        }
-    }
-}
-
 impl From<ZArray> for ZVal {
     fn from(arr: ZArray) -> Self {
         unsafe {
