Rewrite macro defines as consts 63/18663/2
authorZofia Abramowska <z.abramowska@samsung.com>
Thu, 27 Mar 2014 14:08:51 +0000 (15:08 +0100)
committerZofia Abramowska <z.abramowska@samsung.com>
Thu, 27 Mar 2014 18:08:28 +0000 (19:08 +0100)
Removing unnecessary macros and replace them with const variables.

Change-Id: I867e54eebbd4e01ca7947abf67a5642c6f965c2e

tests/libsmack-tests/test_cases.cpp

index 8a02c3c..d5f72e0 100644 (file)
 #include "tests_common.h"
 #include <access_provider.h>
 
-#define TEST_SUBJECT  "test_subject"
-#define TEST_OBJECT   "test_oject"
-#define TEST_OBJECT_2 "test_oject_2"
+const char* const TEST_SUBJECT = "test_subject";
+const char* const TEST_OBJECT = "test_object";
+const char* const TEST_OBJECT_2 = "test_object_2";
 
+const std::string testDir = "/opt/home/app/";
+const std::vector<std::string> accessesBasic = { "r", "w", "x", "wx", "rx", "rw", "rwx", "rwxat" };
+
+//This one define is required for sockaddr_un initialization
 #define SOCK_PATH "/tmp/test-smack-socket"
 
-std::string testDir = "/opt/home/app/";
-std::vector<std::string> accessesBasic = { "r", "w", "x", "wx", "rx", "rw", "rwx", "rwxat" };
+
 
 int files_compare(int fd1, int fd2)
 {