diff --git a/windows_kext/kextinterface/protocol_test.go b/windows_kext/kextinterface/protocol_test.go index 6cf81581..cf047442 100644 --- a/windows_kext/kextinterface/protocol_test.go +++ b/windows_kext/kextinterface/protocol_test.go @@ -11,7 +11,7 @@ import ( func TestRustInfoFile(t *testing.T) { t.Parallel() - file, err := os.Open("../protocol/rust_info_test.bin") + file, err := os.Open("testdata/rust_info_test.bin") if err != nil { panic(err) } @@ -175,7 +175,7 @@ func TestRustInfoFile(t *testing.T) { func TestGenerateCommandFile(t *testing.T) { t.Parallel() - file, err := os.Create("go_command_test.bin") + file, err := os.Create("../protocol/testdata/go_command_test.bin") if err != nil { t.Errorf("failed to create file: %s", err) } diff --git a/windows_kext/kextinterface/testdata/rust_info_test.bin b/windows_kext/kextinterface/testdata/rust_info_test.bin new file mode 100644 index 00000000..3f9049a9 Binary files /dev/null and b/windows_kext/kextinterface/testdata/rust_info_test.bin differ diff --git a/windows_kext/protocol/src/command.rs b/windows_kext/protocol/src/command.rs index 53e4b81e..80c2f3ce 100644 --- a/windows_kext/protocol/src/command.rs +++ b/windows_kext/protocol/src/command.rs @@ -86,7 +86,7 @@ use std::panic; #[test] fn test_go_command_file() { - let mut file = File::open("../kextinterface/go_command_test.bin").unwrap(); + let mut file = File::open("testdata/go_command_test.bin").unwrap(); loop { let mut command: [u8; 1] = [0]; let bytes_count = file.read(&mut command).unwrap(); diff --git a/windows_kext/protocol/src/info.rs b/windows_kext/protocol/src/info.rs index 5018c511..b8eb0c79 100644 --- a/windows_kext/protocol/src/info.rs +++ b/windows_kext/protocol/src/info.rs @@ -425,7 +425,7 @@ use rand::seq::SliceRandom; #[test] fn generate_test_info_file() -> Result<(), std::io::Error> { - let mut file = File::create("rust_info_test.bin")?; + let mut file = File::create("../kextinterface/testdata/rust_info_test.bin")?; let enums = [ InfoType::LogLine, InfoType::ConnectionIpv4, diff --git a/windows_kext/protocol/testdata/go_command_test.bin b/windows_kext/protocol/testdata/go_command_test.bin new file mode 100644 index 00000000..586c70ad Binary files /dev/null and b/windows_kext/protocol/testdata/go_command_test.bin differ diff --git a/windows_kext/test_protocol.sh b/windows_kext/test_protocol.sh index 43ad5058..b3b49641 100755 --- a/windows_kext/test_protocol.sh +++ b/windows_kext/test_protocol.sh @@ -1,24 +1,8 @@ #!/bin/sh - -echo Generate test files -echo ======================== -cd protocol -cargo test info::generate_test_info_file - -cd ../kextinterface -go test -v -run TestGenerateCommandFile - -cd .. -echo ======================== echo Running tests echo ======================== cd protocol -cargo test command::test_go_command_file +cargo test cd ../kextinterface -go test -v -run TestRustInfoFile - -echo ======================== -echo Cleanup -rm go_command_test.bin -rm ../protocol/rust_info_test.bin +go test -v .