Fix TA file names, remove dash (-)

Change-Id: Iec46e9fd2012b1e2c7c135b139db27c937b2f7b3

diff --git a/simulatordaemon/src/TABinaryManager/TestMain.cpp b/simulatordaemon/src/TABinaryManager/TestMain.cpp
index b0b322a..0882888 100644 (file)
--- a/simulatordaemon/src/TABinaryManager/TestMain.cpp
+++ b/simulatordaemon/src/TABinaryManager/TestMain.cpp
@@ -50,7 +50,7 @@ int test_main() {
                                // Unpack TA
                                case 1: {
                                        TAUnpack *unpacker = TAUnpack::getInstance();
-                                       unpacker->unpackTA(TEE_TASTORE_ROOT, "0000-0000-0000-0000000000c7");
+                                       unpacker->unpackTA(TEE_TASTORE_ROOT, "0000000000000000000000c7");
                                        break;
                                }
                                        // Manifest test
@@ -58,7 +58,7 @@ int test_main() {
                                        TAManifest manifest;
                                        manifest.processXML(
                                            string(
-                                               TEE_TASTORE_ROOT"0000-0000-0000-0000000000c7-ext/0000-0000-0000-0000000000c7.manifest"));
+                                               TEE_EXTRACT_ROOT"0000000000000000000000c7-ext/0000000000000000000000c7.manifest"));
                                        manifest.printProcessedData();
                                        break;
                                }
@@ -72,15 +72,15 @@ int test_main() {
                                        std::cout << "[SIM_DAEMON] Binary Manager successfully initialized"
                                            << std::endl;
                                        std::cout
-                                           << "[SIM_DAEMON] Image Path of 0000-0000-0000-0000000000c7: "
-                                           << bm->getImagePath("0000-0000-0000-0000000000c7") << std::endl;
+                                           << "[SIM_DAEMON] Image Path of 0000000000000000000000c7: "
+                                           << bm->getImagePath("0000000000000000000000c7") << std::endl;
                                        std::cout
-                                           << "[SIM_DAEMON] Image Path of 0000-0000-0000-0000001234d5: "
-                                           << bm->getImagePath("0000-0000-0000-0000001234d5") << std::endl;
+                                           << "[SIM_DAEMON] Image Path of 0000000000000000001234d5: "
+                                           << bm->getImagePath("0000000000000000001234d5") << std::endl;
                                        std::cout
-                                           << "[SIM_DAEMON] Image Path of 0000-0000-0000-0000004567c8: "
-                                           << bm->getImagePath("0000-0000-0000-0000004567c8") << std::endl;
-                                       bm->getManifest("0000-0000-0000-0000004567c8")->printProcessedData();
+                                           << "[SIM_DAEMON] Image Path of 0000000000000000004567c8: "
+                                           << bm->getImagePath("0000000000000000004567c8") << std::endl;
+                                       bm->getManifest("0000000000000000004567c8")->printProcessedData();
 
                                        break;
                                }