Use examples to hack for integration tests.

Author: jmjoy

Cargo.toml

@@ -14,3 +14,9 @@ members = [
     "examples/logging",
     "tests/integration",
 ]
+
+[profile.dev]
+lto = true
+
+[profile.release]
+lto = true

examples/hello/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 = "hello_reexport"
+path = "src/_reexport.rs"
 crate-type = ["cdylib"]
 
 [dependencies]

examples/hello/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 hello::*;

phper-test/README.md

@@ -4,6 +4,12 @@ Integration test tool for [phper](https://crates.io/crates/phper).
 
 The `php-config` is needed. You can set environment `PHP_CONFIG` to specify the path.
 
+## Notice
+
+Because the `phper-test` depends on the `cdylib` to do integration test, but now `cargo test` don't build `cdylib` in `[lib]`, so you must call `cargo build` before `cargo test`.
+
+Maybe, when the feature [artifact-dependencies](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#artifact-dependencies) becomes stable, or the [issue](https://github.com/rust-lang/cargo/issues/8628) be solved, you don't have to call `cargo build` in advance, but I think it will be a long long stage.
+
 ## License
 
 [MulanPSL-2.0](https://github.com/jmjoy/phper/blob/master/LICENSE).

phper-test/src/cli.rs

@@ -37,6 +37,25 @@ pub fn test_php_scripts(exe_path: impl AsRef<Path>, scripts: &[&dyn AsRef<Path>]
     test_php_scripts_with_condition(exe_path, &*scripts);
 }
 
+/// Check your extension by executing the php script, if the all executing
+/// return success, than the test is pass.
+///
+/// - `exec_path` is the path of the make executable, which will be used to
+///   detect the path of
+/// extension lib.
+///
+/// - `scripts` is the path of your php test scripts.
+///
+/// See [example hello integration test](https://github.com/jmjoy/phper/blob/master/examples/hello/tests/integration.rs).
+pub fn test_php_scripts_with_lib(lib_path: impl AsRef<Path>, scripts: &[&dyn AsRef<Path>]) {
+    let condition = |output: Output| output.status.success();
+    let scripts = scripts
+        .iter()
+        .map(|s| (*s, &condition as _))
+        .collect::<Vec<_>>();
+    test_php_scripts_with_condition_and_lib(lib_path, &*scripts);
+}
+
 /// Script and condition pair.
 pub type ScriptCondition<'a> = (&'a dyn AsRef<Path>, &'a dyn Fn(Output) -> bool);
 
@@ -54,8 +73,14 @@ pub type ScriptCondition<'a> = (&'a dyn AsRef<Path>, &'a dyn Fn(Output) -> bool)
 pub fn test_php_scripts_with_condition(
     exe_path: impl AsRef<Path>, scripts: &[ScriptCondition<'_>],
 ) {
-    let context = Context::get_global();
     let lib_path = utils::get_lib_path(exe_path);
+    test_php_scripts_with_condition_and_lib(lib_path, scripts)
+}
+
+pub fn test_php_scripts_with_condition_and_lib(
+    lib_path: impl AsRef<Path>, scripts: &[ScriptCondition<'_>],
+) {
+    let context = Context::get_global();
     let tmp_php_ini_file = context.create_tmp_php_ini_file(&lib_path);
 
     for (script, condition) in scripts {

phper-test/src/fpm.rs

@@ -27,7 +27,7 @@ use tokio::{io, net::TcpStream, runtime::Handle, task::block_in_place};
 static FPM_HANDLE: OnceCell<Mutex<FpmHandle>> = OnceCell::new();
 
 struct FpmHandle {
-    exe_path: PathBuf,
+    lib_path: PathBuf,
     fpm_child: Child,
     php_ini_file: ManuallyDrop<NamedTempFile>,
     fpm_conf_file: ManuallyDrop<NamedTempFile>,
@@ -36,6 +36,13 @@ struct FpmHandle {
 /// Start php-fpm process and tokio runtime.
 pub fn setup(exe_path: impl AsRef<Path>) {
     let exe_path = exe_path.as_ref();
+    let lib_path = utils::get_lib_path(exe_path);
+    setup_lib(lib_path)
+}
+
+/// Start php-fpm process and tokio runtime.
+pub fn setup_lib(lib_path: impl AsRef<Path>) {
+    let lib_path = lib_path.as_ref().to_owned();
 
     let handle = FPM_HANDLE.get_or_init(|| {
         // shutdown hook.
@@ -55,7 +62,6 @@ pub fn setup(exe_path: impl AsRef<Path>) {
 
         // Run php-fpm.
         let context = Context::get_global();
-        let lib_path = utils::get_lib_path(exe_path);
         let php_fpm = context.find_php_fpm().unwrap();
         let php_ini_file = context.create_tmp_php_ini_file(&lib_path);
         let fpm_conf_file = context.create_tmp_fpm_conf_file();
@@ -77,14 +83,14 @@ pub fn setup(exe_path: impl AsRef<Path>) {
         // fs::remove_file("/tmp/.php-fpm.log").unwrap();
 
         Mutex::new(FpmHandle {
-            exe_path: exe_path.into(),
+            lib_path: lib_path.clone(),
             fpm_child: child,
             php_ini_file: ManuallyDrop::new(php_ini_file),
             fpm_conf_file: ManuallyDrop::new(fpm_conf_file),
         })
     });
 
-    assert_eq!(&handle.lock().unwrap().exe_path, exe_path);
+    assert_eq!(handle.lock().unwrap().lib_path, &*lib_path);
 }
 
 extern "C" fn teardown() {

phper-test/src/lib.rs

@@ -17,4 +17,4 @@ mod context;
 #[cfg(feature = "fpm")]
 #[cfg_attr(docsrs, doc(cfg(feature = "fpm")))]
 pub mod fpm;
-mod utils;
+pub mod utils;

phper-test/src/utils.rs

@@ -18,7 +18,7 @@ use std::{
     time::Duration,
 };
 
-pub fn execute_command<S: AsRef<OsStr> + Debug>(argv: &[S]) -> String {
+pub(crate) fn execute_command<S: AsRef<OsStr> + Debug>(argv: &[S]) -> String {
     let mut command = Command::new(&argv[0]);
     command.args(&argv[1..]);
     let output = command
@@ -28,7 +28,9 @@ pub fn execute_command<S: AsRef<OsStr> + Debug>(argv: &[S]) -> String {
     String::from_utf8(output).unwrap().trim().to_owned()
 }
 
-pub fn spawn_command<S: AsRef<OsStr> + Debug>(argv: &[S], wait_time: Option<Duration>) -> Child {
+pub(crate) fn spawn_command<S: AsRef<OsStr> + Debug>(
+    argv: &[S], wait_time: Option<Duration>,
+) -> Child {
     let mut command = Command::new(&argv[0]);
     let child = command
         .args(&argv[1..])
@@ -58,6 +60,14 @@ pub fn spawn_command<S: AsRef<OsStr> + Debug>(argv: &[S], wait_time: Option<Dura
 }
 
 pub fn get_lib_path(exe_path: impl AsRef<Path>) -> PathBuf {
+    get_lib_path_inner(exe_path, false)
+}
+
+pub fn get_lib_path_by_example(exe_path: impl AsRef<Path>) -> PathBuf {
+    get_lib_path_inner(exe_path, true)
+}
+
+fn get_lib_path_inner(exe_path: impl AsRef<Path>, use_example: bool) -> PathBuf {
     let exe_path = exe_path.as_ref();
     let exe_stem = exe_path
         .file_stem()
@@ -78,5 +88,9 @@ pub fn get_lib_path(exe_path: impl AsRef<Path>) -> PathBuf {
     #[cfg(target_os = "windows")]
     ext_name.push(".dll");
 
-    target_dir.join(ext_name)
+    if use_example {
+        target_dir.join("examples").join(ext_name)
+    } else {
+        target_dir.join(ext_name)
+    }
 }

phper/src/errors.rs

@@ -121,7 +121,7 @@ pub struct TypeError {
 }
 
 #[derive(Debug, thiserror::Error, crate::Throwable, Constructor)]
-#[error("must be of type {expect_type}, {actual_type} given")]
+#[error("type error: must be of type {expect_type}, {actual_type} given")]
 #[throwable_class("TypeError")]
 pub struct ExpectTypeError {
     expect_type: TypeInfo,

phper/src/types.rs

@@ -150,6 +150,18 @@ impl Display for TypeInfo {
             "null"
         } else if self.is_bool() {
             "bool"
+        } else if self.is_long() {
+            "int"
+        } else if self.is_double() {
+            "float"
+        } else if self.is_string() {
+            "string"
+        } else if self.is_array() {
+            "array"
+        } else if self.is_object() {
+            "object"
+        } else if self.is_resource() {
+            "resource"
         } else {
             "unknown"
         };