Revision 34:d9e45aad85f2, committed 2012-09-13

Comitter:

ashleymills

Date:

Thu Sep 13 10:14:49 2012 +0000

Parent:

33:16126e029d58

Child:

35:6867af70c51c

Commit message:

Refactoring.

Changed in this revision

--- a/Tests/Test10.h	Thu Sep 13 10:05:31 2012 +0000
+++ b/Tests/Test10.h	Thu Sep 13 10:14:49 2012 +0000
@@ -14,10 +14,9 @@
       
       virtual void setupTest() {
          
-         
       }
    
-      virtual bool runTest() {
+      virtual bool execute() {
          HTTPClient http;
          char msgBuffer[125];
          bool outcome = true;

--- a/Tests/Test12.h	Thu Sep 13 10:05:31 2012 +0000
+++ b/Tests/Test12.h	Thu Sep 13 10:14:49 2012 +0000
@@ -25,7 +25,7 @@
          _testCaseNumber = 12;
       }
    
-      virtual bool runTest() {
+      virtual bool execute() {
          LOG("Test: %d",_testCaseNumber);
          LOG(gTest12Description);
          LOG("Receiving SMS from test phone, waiting for response.");

--- a/Tests/Test13.h	Thu Sep 13 10:05:31 2012 +0000
+++ b/Tests/Test13.h	Thu Sep 13 10:14:49 2012 +0000
@@ -25,7 +25,7 @@
          _testCaseNumber = 13;
       }
    
-      virtual bool runTest() {
+      virtual bool execute() {
          LOG("Test %d waiting for an SMS message...", _testCaseNumber);
          LOG("Receiving SMS from test phone, waiting for response.");
       

--- a/Tests/Test14.h	Thu Sep 13 10:05:31 2012 +0000
+++ b/Tests/Test14.h	Thu Sep 13 10:14:49 2012 +0000
@@ -21,7 +21,7 @@
       }
       
    
-      virtual bool runTest() {
+      virtual bool execute() {
             
          LinkMonitor::REGISTRATION_STATE regState = LinkMonitor::REGISTRATION_STATE_UNKNOWN;
          LinkMonitor::BEARER bearer = LinkMonitor::BEARER_UNKNOWN;

--- a/Tests/Test16.h	Thu Sep 13 10:05:31 2012 +0000
+++ b/Tests/Test16.h	Thu Sep 13 10:14:49 2012 +0000
@@ -21,7 +21,7 @@
       }
       
    
-      virtual bool runTest() {
+      virtual bool execute() {
             
          LinkMonitor::REGISTRATION_STATE regState = LinkMonitor::REGISTRATION_STATE_UNKNOWN;
          LinkMonitor::BEARER bearer = LinkMonitor::BEARER_UNKNOWN;

--- a/Tests/Test21.h	Thu Sep 13 10:05:31 2012 +0000
+++ b/Tests/Test21.h	Thu Sep 13 10:14:49 2012 +0000
@@ -15,7 +15,7 @@
          _ussdResponse = (char*)malloc(16*sizeof(char));
       }
    
-      virtual bool runTest() {
+      virtual bool execute() {
          LOG(gTest21Description);
          
          if(_modem->sendUSSD("*#100#",_ussdResponse,16)!=0) {

--- a/Tests/Test22.h	Thu Sep 13 10:05:31 2012 +0000
+++ b/Tests/Test22.h	Thu Sep 13 10:14:49 2012 +0000
@@ -14,7 +14,7 @@
          _ussdResponse = (char*)malloc(16*sizeof(char));
       }
    
-      virtual bool runTest() {
+      virtual bool execute() {
          LOG(gTest22Description);
          
          if(_modem->sendUSSD(".2890",_ussdResponse,16)!=0) {

--- a/Tests/Test23.cpp	Thu Sep 13 10:05:31 2012 +0000
+++ b/Tests/Test23.cpp	Thu Sep 13 10:14:49 2012 +0000
@@ -13,7 +13,7 @@
 }
    
 // virtual
-bool Test23::runTest() {
+bool Test23::execute() {
 
    LOG(gTest23Description);
          

--- a/Tests/Test23.h	Thu Sep 13 10:05:31 2012 +0000
+++ b/Tests/Test23.h	Thu Sep 13 10:14:49 2012 +0000
@@ -8,7 +8,7 @@
    public: 
       Test23(VodafoneUSBModem *m);
       virtual void setupTest();
-      virtual bool runTest();
+      virtual bool execute();
       virtual void endTest();
       
    private:

--- a/Tests/Test25.h	Thu Sep 13 10:05:31 2012 +0000
+++ b/Tests/Test25.h	Thu Sep 13 10:14:49 2012 +0000
@@ -14,7 +14,7 @@
          
       }
    
-      virtual bool runTest() {
+      virtual bool execute() {
 
          LOG(gTest25Description);
          int rssi = -1000;

--- a/Tests/Test26.h	Thu Sep 13 10:05:31 2012 +0000
+++ b/Tests/Test26.h	Thu Sep 13 10:14:49 2012 +0000
@@ -15,7 +15,7 @@
          
       }
    
-      virtual bool runTest() {
+      virtual bool execute() {
          LOG(gTest26Description);
          for(int count=0; count<30; count++) {
             LOG("Iteration %d of 30",count);

--- a/Tests/Test50.h	Thu Sep 13 10:05:31 2012 +0000
+++ b/Tests/Test50.h	Thu Sep 13 10:14:49 2012 +0000
@@ -21,7 +21,7 @@
          freeStorage();
       }
       
-      virtual bool runTest() {
+      virtual bool execute() {
          LOG(gTest50Description);
          int numIterations = 10;
          size_t smCount;

--- a/Tests/Test56.h	Thu Sep 13 10:05:31 2012 +0000
+++ b/Tests/Test56.h	Thu Sep 13 10:14:49 2012 +0000
@@ -17,7 +17,7 @@
       }
       
    
-      virtual bool runTest() {
+      virtual bool execute() {
             
          LinkMonitor::REGISTRATION_STATE regState = LinkMonitor::REGISTRATION_STATE_UNKNOWN;
          LinkMonitor::BEARER bearer = LinkMonitor::BEARER_UNKNOWN;

--- a/Tests/Tests.h	Thu Sep 13 10:05:31 2012 +0000
+++ b/Tests/Tests.h	Thu Sep 13 10:14:49 2012 +0000
@@ -14,8 +14,8 @@
 
 const int gAllTests[] = {10,16,12,13,21,22,23,25,26,50};
 const int gNumAllTests = 10;
-const int gAutomatedTests[] = {10,16,12,21,22,23,25,26};
-const int gNumAutomatedTests = 8;
+const int gAutomatedTests[] = {10,21,22,23,25,26};
+const int gNumAutomatedTests = 6;
 const int gInteractiveTests[] = {16,12,14,13};
 const int gNumInteractiveTests = 4;
 const int gSoakTests[] = {50};

--- a/VodafoneTestCase.h	Thu Sep 13 10:05:31 2012 +0000
+++ b/VodafoneTestCase.h	Thu Sep 13 10:14:49 2012 +0000
@@ -19,7 +19,7 @@
       bool run() {
          _lastRunTime = time(NULL);
          setupTest();
-         _lastRunOutcome = runTest();
+         _lastRunOutcome = execute();
          endTest();
          return _lastRunOutcome;  
       }
@@ -27,7 +27,7 @@
       virtual void setupTest() {
       }
       
-      virtual bool runTest() {
+      virtual bool execute() {
          LOG("Base class runTest called!");
          return true;
       }