test clean up

aws · Jul 26, 2024 · 6aa1e4e · 6aa1e4e
1 parent 38283ea
commit 6aa1e4e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/tool-openssl/md5_test.cc b/tool-openssl/md5_test.cc
@@ -23,12 +23,6 @@
 
 size_t createTempFILEpath(char buffer[PATH_MAX]);
 
-void RemoveFile(const char* path);
-
-std::string ReadFileToString(const std::string& file_path);
-
-RSA* CreateRSAKey();
-
 
 // -------------------- MD5 OpenSSL Comparison Test ---------------------------
 
@@ -71,7 +65,7 @@ const std::string MODULUS = "MD5(stdin)= ";
 // Test against OpenSSL output
 TEST_F(MD5ComparisonTest, MD5ToolCompareOpenSSL) {
   // Create input file with test string
-  std::string input_file = std::string(in_path) + "_md5_input";
+  std::string input_file = std::string(in_path);
   std::ofstream ofs(input_file);
   ofs << "AWS_LC_TEST_STRING_INPUT";
   ofs.close();

diff --git a/tool-openssl/rsa_test.cc b/tool-openssl/rsa_test.cc
@@ -26,10 +26,6 @@
 
 size_t createTempFILEpath(char buffer[PATH_MAX]);
 
-void RemoveFile(const char* path);
-
-std::string ReadFileToString(const std::string& file_path);
-
 bool CheckBoundaries(const std::string &content, const std::string &begin1, const std::string &end1, const std::string &begin2, const std::string &end2);
 
 RSA* CreateRSAKey();

diff --git a/tool-openssl/test_util.h b/tool-openssl/test_util.h
@@ -14,6 +14,7 @@
 #include <string>
 #include <iostream>
 
+
 // Helper function to trim whitespace from both ends of a string to test comparison output
 static inline std::string &trim(std::string &s) {
   s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) {
@@ -55,4 +56,13 @@ inline void RunCommandsAndCompareOutput(const std::string &tool_command, const s
   std::cout << "OpenSSL output:" << std::endl << openssl_output_str << std::endl;
 }
 
+inline void RemoveFile(const char* path) {
+  struct stat buffer;
+  if (path != nullptr && stat(path, &buffer) == 0) {
+    if (remove(path) != 0) {
+      fprintf(stderr, "Error deleting %s: %s\n", path, strerror(errno));
+    }
+  }
+}
+
 #endif //TEST_UTIL_H
diff --git a/tool-openssl/x509_test.cc b/tool-openssl/x509_test.cc
@@ -24,8 +24,6 @@
 
 size_t createTempFILEpath(char buffer[PATH_MAX]);
 
-void RemoveFile(const char* path);
-
 X509* CreateAndSignX509Certificate() {
   bssl::UniquePtr<X509> x509(X509_new());
   if (!x509) return nullptr;
@@ -58,15 +56,6 @@ X509* CreateAndSignX509Certificate() {
   return x509.release();
 }
 
-void RemoveFile(const char* path) {
-  struct stat buffer;
-  if (path != nullptr && stat(path, &buffer) == 0) {
-    if (remove(path) != 0) {
-      fprintf(stderr, "Error deleting %s: %s\n", path, strerror(errno));
-    }
-  }
-}
-
 class X509Test : public ::testing::Test {
 protected:
   void SetUp() override {