Refactor SignatureValidator and reduce interface headers

[platform/core/security/cert-svc.git] / tests / vcore / TestEnv.cpp

diff --git a/tests/vcore/TestEnv.cpp b/tests/vcore/TestEnv.cpp
index 678c1f9..8249446 100644 (file)
--- a/tests/vcore/TestEnv.cpp
+++ b/tests/vcore/TestEnv.cpp
@@ -13,31 +13,20 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#include <vcore/WrtSignatureValidator.h>
-
 #include "TestEnv.h"
 
-#define WRTSIGNATURE_ERRORDESCRIBE(name) case ValidationCore::WrtSignatureValidator::name: return #name
-const char *wrtValidatorErrorToString(int error)
+#define SIGNATURE_ERRORDESCRIBE(name) case ValidationCore::SignatureValidator::name: return #name
+const char *validatorErrorToString(ValidationCore::SignatureValidator::Result error)
 {
     switch (error) {
-        WRTSIGNATURE_ERRORDESCRIBE(SIGNATURE_VALID);
-        WRTSIGNATURE_ERRORDESCRIBE(SIGNATURE_INVALID);
-        WRTSIGNATURE_ERRORDESCRIBE(SIGNATURE_VERIFIED);
-        WRTSIGNATURE_ERRORDESCRIBE(SIGNATURE_DISREGARD);
-        WRTSIGNATURE_ERRORDESCRIBE(SIGNATURE_REVOKED);
-        WRTSIGNATURE_ERRORDESCRIBE(SIGNATURE_INVALID_CERT_CHAIN);
-        WRTSIGNATURE_ERRORDESCRIBE(SIGNATURE_INVALID_DISTRIBUTOR_CERT);
-        WRTSIGNATURE_ERRORDESCRIBE(SIGNATURE_INVALID_SDK_DEFAULT_AUTHOR_CERT);
-        WRTSIGNATURE_ERRORDESCRIBE(SIGNATURE_IN_DISTRIBUTOR_CASE_AUTHOR_CERT);
-        WRTSIGNATURE_ERRORDESCRIBE(SIGNATURE_INVALID_CERT_TIME);
-        WRTSIGNATURE_ERRORDESCRIBE(SIGNATURE_NO_DEVICE_PROFILE);
-        WRTSIGNATURE_ERRORDESCRIBE(SIGNATURE_INVALID_DEVICE_UNIQUE_ID);
-        WRTSIGNATURE_ERRORDESCRIBE(SIGNATURE_INVALID_NO_HASH_FILE);
-        WRTSIGNATURE_ERRORDESCRIBE(SIGNATURE_INVALID_HASH_SIGNATURE);
+        SIGNATURE_ERRORDESCRIBE(SIGNATURE_VALID);
+        SIGNATURE_ERRORDESCRIBE(SIGNATURE_INVALID);
+        SIGNATURE_ERRORDESCRIBE(SIGNATURE_VERIFIED);
+        SIGNATURE_ERRORDESCRIBE(SIGNATURE_DISREGARD);
+        SIGNATURE_ERRORDESCRIBE(SIGNATURE_REVOKED);
     default:
         return "Invalid error code.";
     }
 }
-#undef WRTSIGNATURE_ERRORDESCRIBE
+#undef SIGNATURE_ERRORDESCRIBE