Cleaned up with one exception

klavinslab · Mar 10, 2019 · ba06690 · ba06690
1 parent f20692b
commit ba06690
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 42 deletions.
diff --git a/include/manager.h b/include/manager.h
@@ -61,6 +61,7 @@ namespace elma {
         Client& client() { return _client; }
 
         private:
+        const int Priority_min = -5, Priority_max = 15;
         vector<Process *> _processes;
         map<string, Channel *> _channels;
         map<string, vector<std::function<void(Event&)>>> event_handlers;

diff --git a/src/manager.cc b/src/manager.cc
@@ -16,7 +16,7 @@ namespace elma {
         _processes.push_back(&process); 
         process._manager_ptr = this;            
 
-        if (-5 > process._priority || process._priority > 15 ){
+        if (Priority_min > process._priority || process._priority > Priority_max ){
             throw Exception("Priority must be between -5(low priority) and 15(high priority)");
         }    
 
@@ -140,7 +140,7 @@ namespace elma {
     //! \return A reference to the manager, for chaining
     Manager& Manager::set_priority(Process& process, int priority) {
 
-    if (-5 <= priority && priority <= 15 ){
+    if (Priority_min <= priority && priority <= Priority_max  ){
         process._priority = priority;
         sort_processes();
     }else{

diff --git a/test/priority.cc b/test/priority.cc
@@ -12,6 +12,8 @@ namespace {
     #define SLEEP(__ms__) std::this_thread::sleep_for(std::chrono::milliseconds(__ms__))
     #define MS(__ms__) high_resolution_clock::duration(milliseconds(__ms__))
 
+    const int Priority_min = -5, Priority_max = 15;
+
     TEST(Priority, basic) {
 
         static vector<string> test1;
@@ -24,7 +26,6 @@ namespace {
             void start() {}
             void update() {
                 test1.push_back("james");
-                //std::cout << "james" << "\n";
             }
             void stop() {}
 
@@ -37,7 +38,6 @@ namespace {
             void start() {}
             void update() {
                 test1.push_back("lilly");
-                //std::cout << "lilly" << "\n";
             }
             void stop() {}
 
@@ -50,7 +50,6 @@ namespace {
             void start() {}
             void update() {
                 test1.push_back("boby");
-                //std::cout << "boby" << "\n";
             }
             void stop() {}
 
@@ -67,7 +66,6 @@ namespace {
         .schedule(lily, MS(30))
         .schedule(boby, MS(30));
 
-        //m.SetPriority("james", 3);
         m.init().run(MS(100));
         EXPECT_EQ(test1, ans1);
 
@@ -85,7 +83,6 @@ namespace {
             void start() {}
             void update() {
                 test1.push_back("james");
-                //std::cout << "james" << "\n";
             }
             void stop() {}
 
@@ -98,7 +95,6 @@ namespace {
             void start() {}
             void update() {
                 test1.push_back("lilly");
-                //std::cout << "lilly" << "\n";
             }
             void stop() {}
 
@@ -111,7 +107,6 @@ namespace {
             void start() {}
             void update() {
                 test1.push_back("boby");
-                //std::cout << "boby" << "\n";
             }
             void stop() {}
 
@@ -137,27 +132,6 @@ namespace {
 
     }
 
-    //This is no longer valid now that the process is passed not its name
-   /* TEST(Priority, NoProcess) {
-
-             
-        class  Tester: public elma::Process {
-        public: 
-            Tester(string name, int n = 0) : Process(name, n) {}
-            void init() {}
-            void start() {}
-            void update() {}
-            void stop() {}
-
-        };
-   
-        elma::Manager m;
-        Tester james("james",0);
-  
-
-        m.schedule(james, MS(30));
-        //EXPECT_ANY_THROW(m.set_priority("jams", 3));        
-    }*/
 
     TEST(Priority, LookSort) {
 
@@ -166,10 +140,7 @@ namespace {
             Tester(string name, int n = 0) : Process(name, n) {}
             void init() {}
             void start() {}
-            void update() {
-                //test1.push_back("james");
-                //std::cout << "james" << "\n";
-            }
+            void update() {}
             void stop() {}
 
         };
@@ -179,10 +150,7 @@ namespace {
             Tester2(string name, int n = 0) : Process(name, n) {}
             void init() {}
             void start() {}
-            void update() {
-                //test1.push_back("lilly");
-                //std::cout << "lilly" << "\n";
-            }
+            void update() {}
             void stop() {}
 
         };
@@ -192,10 +160,7 @@ namespace {
             Tester3(string name, int n = 0) : Process(name, n) {}
             void init() {}
             void start() {}
-            void update() {
-                //test1.push_back("boby");
-                //std::cout << "boby" << "\n";
-            }
+            void update() {}
             void stop() {}
 
         };