Changeset 605


Ignore:
Timestamp:
08/16/14 07:24:41 (5 years ago)
Author:
jls17
Message:
Location:
branches/work_311
Files:
5 edited
3 moved

Legend:

Unmodified
Added
Removed
  • branches/work_311/ARInsideLib.vcproj

    r604 r605  
    763763                        </File> 
    764764                        <File 
    765                                 RelativePath=".\core\OpenWindowHelper.cpp" 
    766                                 > 
    767                         </File> 
    768                         <File 
    769                                 RelativePath=".\core\OpenWindowHelper.h" 
     765                                RelativePath=".\core\OpenWindowReportData.cpp" 
     766                                > 
     767                        </File> 
     768                        <File 
     769                                RelativePath=".\core\OpenWindowReportData.h" 
    770770                                > 
    771771                        </File> 
  • branches/work_311/ARInsideTest.vcproj

    r603 r605  
    563563                        </File> 
    564564                        <File 
    565                                 RelativePath=".\core\OpenWindowHelperTest.cpp" 
     565                                RelativePath=".\core\OpenWindowReportDataTest.cpp" 
    566566                                > 
    567567                        </File> 
  • branches/work_311/core/OpenWindowReportData.cpp

    r604 r605  
    1616 
    1717#include "stdafx.h" 
    18 #include "OpenWindowHelper.h" 
    19  
    20 CDocActionOpenWindowHelper::CDocActionOpenWindowHelper(char* reportString) 
     18#include "OpenWindowReportData.h" 
     19 
     20OpenWindowReportData::OpenWindowReportData(char* reportString) 
    2121{ 
    2222        isValid = false; 
     
    4444} 
    4545 
    46 CDocActionOpenWindowHelper::~CDocActionOpenWindowHelper() 
    47 { 
    48 } 
    49  
    50 bool CDocActionOpenWindowHelper::ParseReportData() 
     46OpenWindowReportData::~OpenWindowReportData() 
     47{ 
     48} 
     49 
     50bool OpenWindowReportData::ParseReportData() 
    5151{ 
    5252        isParsed = true; 
     
    130130} 
    131131 
    132 void CDocActionOpenWindowHelper::CheckAlreadyParsed() 
     132void OpenWindowReportData::CheckAlreadyParsed() 
    133133{ 
    134134        if (!isParsed) 
     
    136136} 
    137137 
    138 bool CDocActionOpenWindowHelper::IsValid() 
     138bool OpenWindowReportData::IsValid() 
    139139{ 
    140140        CheckAlreadyParsed(); 
     
    142142} 
    143143 
    144 string CDocActionOpenWindowHelper::getReportType() 
     144string OpenWindowReportData::getReportType() 
    145145{ 
    146146        CheckAlreadyParsed(); 
     
    150150} 
    151151 
    152 string CDocActionOpenWindowHelper::getReportLocation() 
     152string OpenWindowReportData::getReportLocation() 
    153153{ 
    154154        CheckAlreadyParsed(); 
     
    158158} 
    159159 
    160 string CDocActionOpenWindowHelper::getReportName() 
     160string OpenWindowReportData::getReportName() 
    161161{ 
    162162        CheckAlreadyParsed(); 
     
    166166} 
    167167 
    168 string CDocActionOpenWindowHelper::getReportDestination() 
     168string OpenWindowReportData::getReportDestination() 
    169169{ 
    170170        CheckAlreadyParsed(); 
     
    174174} 
    175175 
    176 string CDocActionOpenWindowHelper::getEntryIds() 
     176string OpenWindowReportData::getEntryIds() 
    177177{ 
    178178        CheckAlreadyParsed(); 
     
    182182} 
    183183 
    184 string CDocActionOpenWindowHelper::getQueryOverride() 
     184string OpenWindowReportData::getQueryOverride() 
    185185{ 
    186186        CheckAlreadyParsed(); 
     
    190190} 
    191191 
    192 string CDocActionOpenWindowHelper::getReportOperation() 
     192string OpenWindowReportData::getReportOperation() 
    193193{ 
    194194        CheckAlreadyParsed(); 
     
    198198} 
    199199 
    200 string CDocActionOpenWindowHelper::getCharEncoding() 
     200string OpenWindowReportData::getCharEncoding() 
    201201{ 
    202202        CheckAlreadyParsed(); 
     
    206206} 
    207207 
    208 string CDocActionOpenWindowHelper::getInlineForm() 
     208string OpenWindowReportData::getInlineForm() 
    209209{ 
    210210        CheckAlreadyParsed(); 
  • branches/work_311/core/OpenWindowReportData.h

    r604 r605  
    1818#include "../ARInside.h" 
    1919 
    20 class CDocActionOpenWindowHelper 
     20class OpenWindowReportData 
    2121{ 
    2222public: 
    23         CDocActionOpenWindowHelper(char* reportString); 
    24         ~CDocActionOpenWindowHelper(void); 
     23        OpenWindowReportData(char* reportString); 
     24        ~OpenWindowReportData(void); 
    2525 
    2626        bool IsValid(); // returns true if the report string passed to the constructor could be parsed without errors 
  • branches/work_311/core/OpenWindowReportDataTest.cpp

    r604 r605  
    11#include "ARInsideTest.h" 
    2 #include "OpenWindowHelper.h" 
     2#include "OpenWindowReportData.h" 
    33 
    44using namespace testing; 
     
    66char* testReportString = "Report: \00121=AR System\00122=\00129=\00127=\00128=null\00124=\00125=\00126=\00130=0\00131=\00132=true\001\nto-screen: "; 
    77 
    8 // A fixture class with a instance of CDocActionOpenWindowHelper using the testReportString above 
    9 class DocActionOpenWindowHelperTests : public Test 
     8// A fixture class with a instance of OpenWindowReportData using the testReportString above 
     9class OpenWindowReportDataTests : public Test 
    1010{ 
    1111public: 
    12         DocActionOpenWindowHelperTests() : reportData(testReportString) {} 
     12        OpenWindowReportDataTests() : reportData(testReportString) {} 
    1313 
    1414protected: 
    15         CDocActionOpenWindowHelper reportData; 
     15        OpenWindowReportData reportData; 
    1616}; 
    1717 
    1818// verify the testReportString above is valid for the parser 
    19 TEST_F(DocActionOpenWindowHelperTests, ValidInput) 
     19TEST_F(OpenWindowReportDataTests, ValidInput) 
    2020{ 
    2121        ASSERT_TRUE(reportData.IsValid()); 
     
    2323 
    2424// now just verify a few values we've in the report string 
    25 TEST_F(DocActionOpenWindowHelperTests, VerifyReportType) 
     25TEST_F(OpenWindowReportDataTests, VerifyReportType) 
    2626{ 
    2727        string result = reportData.getReportType(); 
     
    2929} 
    3030 
    31 TEST_F(DocActionOpenWindowHelperTests, VerifyReportName) 
     31TEST_F(OpenWindowReportDataTests, VerifyReportName) 
    3232{ 
    3333        string result = reportData.getReportName(); 
     
    3535} 
    3636 
    37 TEST_F(DocActionOpenWindowHelperTests, VerifyQueryOverride) 
     37TEST_F(OpenWindowReportDataTests, VerifyQueryOverride) 
    3838{ 
    3939        string result = reportData.getQueryOverride(); 
     
    4141} 
    4242 
    43 TEST_F(DocActionOpenWindowHelperTests, VerifyReportDestination) 
     43TEST_F(OpenWindowReportDataTests, VerifyReportDestination) 
    4444{ 
    4545        string result = reportData.getReportDestination(); 
     
    4747} 
    4848 
    49 TEST_F(DocActionOpenWindowHelperTests, VerifyInlineForm) 
     49TEST_F(OpenWindowReportDataTests, VerifyInlineForm) 
    5050{ 
    5151        string result = reportData.getInlineForm(); 
     
    5454 
    5555// even if the property (here "Report Name") is not in the (valid) report, it shouldn't fail 
    56 TEST_F(DocActionOpenWindowHelperTests, TryToReadAValueNotInTheReportString) 
     56TEST_F(OpenWindowReportDataTests, TryToReadAValueNotInTheReportString) 
    5757{ 
    5858        char* mostlyEmptyReport = "Report: \00121=AR System\001\nto-screen: "; 
    59         CDocActionOpenWindowHelper reportData(mostlyEmptyReport); 
     59        OpenWindowReportData reportData(mostlyEmptyReport); 
    6060 
    6161        string result = reportData.getReportName(); 
     
    6464 
    6565// if the report is simply invalid, it shouldn't fail as well 
    66 TEST_F(DocActionOpenWindowHelperTests, TryToReadAValueFromInvalidReport) 
     66TEST_F(OpenWindowReportDataTests, TryToReadAValueFromInvalidReport) 
    6767{ 
    6868        char* invalidReport = "WrongReport: \001"; 
    69         CDocActionOpenWindowHelper reportData(invalidReport); 
     69        OpenWindowReportData reportData(invalidReport); 
    7070 
    7171        string result = reportData.getReportDestination(); 
  • branches/work_311/doc/DocAlActionStruct.cpp

    r603 r605  
    1818#include "DocAlActionStruct.h" 
    1919#include "DocAllMatchingIdsTable.h" 
    20 #include "../core/OpenWindowHelper.h" 
     20#include "../core/OpenWindowReportData.h" 
    2121#include "actions/DocOpenWindowAction.h" 
    2222#include "actions/DocAlMessageAction.h" 
  • branches/work_311/doc/DocSchemaDetails.cpp

    r604 r605  
    2525#include "../core/ARDayStructHelper.h" 
    2626#include "../core/ARHandle.h" 
    27 #include "../core/OpenWindowHelper.h" 
     27#include "../core/OpenWindowReportData.h" 
    2828#include "../core/OpenWindowSampleData.h" 
    2929#include "DocOverlayHelper.h" 
  • branches/work_311/doc/actions/DocOpenWindowAction.cpp

    r604 r605  
    2020#include "../../core/ARQualification.h" 
    2121#include "../../core/ARAssignHelper.h" 
    22 #include "../../core/OpenWindowHelper.h" 
     22#include "../../core/OpenWindowReportData.h" 
    2323#include "../../core/OpenWindowSampleData.h" 
    2424#include "../../output/ObjNotFound.h" 
     
    3939                string openWindowSchemaName; 
    4040                CARSchema attachedSchema(context.getCurrentSchemaId()); 
    41                 CDocActionOpenWindowHelper reportData(action.reportString); 
     41                OpenWindowReportData reportData(action.reportString); 
    4242 
    4343                // check if we need to get the sample data 
Note: See TracChangeset for help on using the changeset viewer.