fix: cppcheck duplicated

Signed-off-by: Felipe Zipitria <[email protected]>

Author: fzipi

test/benchmark/benchmark_rules.cc

@@ -21,6 +21,7 @@
 #include "modsecurity/modsecurity.h"
 #include "modsecurity/rules_set.h"
 #include "modsecurity/transaction.h"
+#include "modsec_fixture.h"
 
 using modsecurity::ModSecurity;
 using modsecurity::RulesSet;
@@ -49,44 +50,6 @@ static const char* TEST_URI = "/api/users?id=123&name=test&action=update";
 static const char* TEST_CLIENT_IP = "203.0.113.45";
 static const char* TEST_SERVER_IP = "192.0.2.1";
 
-// Helper class to manage ModSecurity lifecycle
-class ModSecFixture {
-public:
-    ModSecurity* modsec;
-    RulesSet* rules;
-
-    ModSecFixture() {
-        modsec = new ModSecurity();
-        modsec->setConnectorInformation("ModSecurity-benchmark v1.0");
-        rules = new RulesSet();
-    }
-
-    ~ModSecFixture() {
-        delete rules;
-        delete modsec;
-    }
-
-    bool loadRules(const std::string& ruleConfig) {
-        // Create a temporary rules object for this configuration
-        RulesSet* tempRules = new RulesSet();
-        int result = tempRules->load(ruleConfig.c_str());
-
-        if (result < 0) {
-            delete tempRules;
-            return false;
-        }
-
-        // Replace old rules
-        delete rules;
-        rules = tempRules;
-        return true;
-    }
-
-    Transaction* createTransaction() {
-        return new Transaction(modsec, rules, nullptr);
-    }
-};
-
 // Helper to run a complete transaction
 static void runTransaction(Transaction* trans) {
     modsecurity::ModSecurityIntervention intervention;

test/benchmark/benchmark_template.cc

@@ -19,6 +19,7 @@
 #include "modsecurity/modsecurity.h"
 #include "modsecurity/rules_set.h"
 #include "modsecurity/transaction.h"
+#include "modsec_fixture.h"
 
 using modsecurity::ModSecurity;
 using modsecurity::RulesSet;
@@ -50,45 +51,6 @@ static const char* MY_REQUEST_BODY = R"({
     "tags": ["tag1", "tag2"]
 })";
 
-// ============================================================================
-// HELPER CLASSES (Same as benchmark_rules.cc)
-// ============================================================================
-
-class ModSecFixture {
-public:
-    ModSecurity* modsec;
-    RulesSet* rules;
-
-    ModSecFixture() {
-        modsec = new ModSecurity();
-        modsec->setConnectorInformation("ModSecurity-custom-benchmark v1.0");
-        rules = new RulesSet();
-    }
-
-    ~ModSecFixture() {
-        delete rules;
-        delete modsec;
-    }
-
-    bool loadRules(const std::string& ruleConfig) {
-        RulesSet* tempRules = new RulesSet();
-        int result = tempRules->load(ruleConfig.c_str());
-
-        if (result < 0) {
-            delete tempRules;
-            return false;
-        }
-
-        delete rules;
-        rules = tempRules;
-        return true;
-    }
-
-    Transaction* createTransaction() {
-        return new Transaction(modsec, rules, nullptr);
-    }
-};
-
 // ============================================================================
 // EXAMPLE 1: Benchmark testing a specific header
 // ============================================================================

test/benchmark/modsec_fixture.h

@@ -0,0 +1,68 @@
+/*
+ * ModSecurity, http://www.modsecurity.org/
+ * Copyright (c) 2015 - 2025 Trustwave Holdings, Inc. (http://www.trustwave.com/)
+ *
+ * You may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * If any of the files related to licensing are missing or if you have any
+ * other questions related to licensing please contact Trustwave Holdings, Inc.
+ * directly using the email address [email protected].
+ *
+ */
+
+#ifndef TEST_BENCHMARK_MODSEC_FIXTURE_H_
+#define TEST_BENCHMARK_MODSEC_FIXTURE_H_
+
+#include <string>
+#include "modsecurity/modsecurity.h"
+#include "modsecurity/rules_set.h"
+#include "modsecurity/transaction.h"
+
+// Helper class to manage ModSecurity lifecycle
+class ModSecFixture {
+ public:
+    modsecurity::ModSecurity* modsec;
+    modsecurity::RulesSet* rules;
+
+    ModSecFixture() {
+        modsec = new modsecurity::ModSecurity();
+        modsec->setConnectorInformation("ModSecurity-benchmark v1.0");
+        rules = new modsecurity::RulesSet();
+    }
+
+    ~ModSecFixture() {
+        delete rules;
+        delete modsec;
+    }
+
+    // Delete copy and move operations since we manage raw pointers
+    ModSecFixture(const ModSecFixture&) = delete;
+    ModSecFixture& operator=(const ModSecFixture&) = delete;
+    ModSecFixture(ModSecFixture&&) = delete;
+    ModSecFixture& operator=(ModSecFixture&&) = delete;
+
+    bool loadRules(const std::string& ruleConfig) {
+        // Create a temporary rules object for this configuration
+        modsecurity::RulesSet* tempRules = new modsecurity::RulesSet();
+        int result = tempRules->load(ruleConfig.c_str());
+
+        if (result < 0) {
+            delete tempRules;
+            return false;
+        }
+
+        // Replace old rules
+        delete rules;
+        rules = tempRules;
+        return true;
+    }
+
+    modsecurity::Transaction* createTransaction() {
+        return new modsecurity::Transaction(modsec, rules, nullptr);
+    }
+};
+
+#endif  // TEST_BENCHMARK_MODSEC_FIXTURE_H_