X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Ftests%2Fxestiacalendar_testcommon.cpp;h=1dd9843b99ba69ea059998f8dc3711d441b1d3b6;hb=353e537a0c84a496c97e8889403c77d13a0b7341;hp=37ec06a0062e10e7a4dd66de1e2fa80b9ce2ffd5;hpb=15e8b1a87813f736e0e6d3c1d88956ff1ef15652;p=xestiacalendar%2F.git diff --git a/source/tests/xestiacalendar_testcommon.cpp b/source/tests/xestiacalendar_testcommon.cpp index 37ec06a..1dd9843 100644 --- a/source/tests/xestiacalendar_testcommon.cpp +++ b/source/tests/xestiacalendar_testcommon.cpp @@ -1,14 +1,14 @@ // xestiacalendar_testcommon.cpp - Xestia Calendar Unit Test Common Functions. // -// (c) 2016 Xestia Software Development. +// (c) 2016-2017 Xestia Software Development. // // This file is part of Xestia Calendar. // -// Xestia Address Book is free software: you can redistribute it and/or modify +// Xestia Calendar is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by the // Free Software Foundation, version 3 of the license. // -// Xestia Address Book is distributed in the hope that it will be useful, +// Xestia Calendar is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. @@ -21,68 +21,68 @@ #include "xestiacalendar_testcommon.h" #include "../common/file.h" -ProcessConnectionDataFileResult ProcessConnectionDataFile(string DataFilename, - CalDAVConnectionData *ConnData){ +ProcessConnectionDataFileResult ProcessConnectionDataFile(string dataFilename, + CalDAVConnectionData *connData){ - ProcessConnectionDataFileResult ProcessResult = PROCESSCONNECTIONDATAFILE_UNITTESTFAIL; + ProcessConnectionDataFileResult processResult = PROCESSCONNECTIONDATAFILE_UNITTESTFAIL; // Check if the file exists and return // PROCESSCONNECTIONDATAFILE_MISSING if not. - if (!FileExists(DataFilename)){ + if (!FileExists(dataFilename)){ return PROCESSCONNECTIONDATAFILE_MISSING; } - ifstream FileStream; - string ReceivedStringData = ""; + ifstream fileStream; + string receivedStringData = ""; - FileStream.open(DataFilename, ifstream::in); + fileStream.open(dataFilename, ifstream::in); - if (FileStream.rdstate() & ifstream::failbit){ + if (fileStream.rdstate() & ifstream::failbit){ return PROCESSCONNECTIONDATAFILE_CANNOTOPEN; } - if (FileStream.rdstate() & ifstream::badbit){ + if (fileStream.rdstate() & ifstream::badbit){ return PROCESSCONNECTIONDATAFILE_CANNOTOPEN; } // Process the file. - char *BufferRead = new char[256]; + char *bufferRead = new char[256]; - while (!FileStream.eof()){ + while (!fileStream.eof()){ - FileStream.getline(BufferRead, 256); - ReceivedStringData.append(BufferRead); - ReceivedStringData.append("\n"); + fileStream.getline(bufferRead, 256); + receivedStringData.append(bufferRead); + receivedStringData.append("\n"); } - delete[] BufferRead; + delete[] bufferRead; - bool NewLine = false; - bool SkipMode = false; - bool EqualFound = false; - bool QuoteMode = false; - bool ServerNameFound = false; - bool ServerUserFound = false; - bool ServerPassFound = false; - bool ServerSSLFound = false; - bool ServerPortFound = false; - bool ServerPrefixFound = false; - char BufferChar = 0; - int StringDataSize = ReceivedStringData.size(); - int SeekCount = 0; - string PropertyName; - string PropertyValue; + bool newLine = false; + bool skipMode = false; + bool equalFound = false; + bool quoteMode = false; + bool serverNameFound = false; + bool serverUserFound = false; + bool serverPassFound = false; + bool serverSSLFound = false; + bool serverPortFound = false; + bool serverPrefixFound = false; + char bufferChar = 0; + int stringDataSize = receivedStringData.size(); + int seekCount = 0; + string propertyName; + string propertyValue; - while (SeekCount < StringDataSize){ + while (seekCount < stringDataSize){ - if (ReceivedStringData[SeekCount] == '='){ + if (receivedStringData[seekCount] == '='){ - EqualFound = true; + equalFound = true; - } else if (ReceivedStringData[SeekCount] == '\n'){ + } else if (receivedStringData[seekCount] == '\n'){ // Newline reached. Check for what type of // data it is. @@ -91,72 +91,72 @@ ProcessConnectionDataFileResult ProcessConnectionDataFile(string DataFilename, // there is a values in the property name // and property value before doing anything. - if (EqualFound == true && - PropertyName.size() > 0 && - PropertyValue.size() > 0){ + if (equalFound == true && + propertyName.size() > 0 && + propertyValue.size() > 0){ - if (PropertyName == "server" && ServerNameFound == false){ + if (propertyName == "server" && serverNameFound == false){ // Setup the server hostname. - ConnData->Hostname = PropertyValue; - ServerNameFound = true; + connData->hostname = propertyValue; + serverNameFound = true; - } else if (PropertyName == "port" && ServerPortFound == false){ + } else if (propertyName == "port" && serverPortFound == false){ // Setup the server port. - int PortNum; - bool PortNumValid = true; + int portNum; + bool portNumValid = true; try{ - PortNum = stoi(PropertyValue); + portNum = stoi(propertyValue); } catch(const invalid_argument &oor){ - PortNumValid = false; + portNumValid = false; } // Port Number is valid so add to the // CalDAVConnectionData handle. - if (PortNumValid == true){ - ConnData->Port = PortNum; - ServerPortFound = true; + if (portNumValid == true){ + connData->port = portNum; + serverPortFound = true; } - } else if (PropertyName == "user" && ServerUserFound == false){ + } else if (propertyName == "user" && serverUserFound == false){ // Setup the server user. - ConnData->Username = PropertyValue; - ServerUserFound = true; + connData->username = propertyValue; + serverUserFound = true; - } else if (PropertyName == "pass" && ServerPassFound == false){ + } else if (propertyName == "pass" && serverPassFound == false){ // Setup the server pass. - ConnData->Password = PropertyValue; - ServerPassFound = true; + connData->password = propertyValue; + serverPassFound = true; - } else if (PropertyName == "ssl" && ServerSSLFound == false){ + } else if (propertyName == "ssl" && serverSSLFound == false){ // Setup the server SSL status. - if (PropertyValue == "true"){ - ConnData->UseSSL = true; + if (propertyValue == "true"){ + connData->useSSL = true; } else { - ConnData->UseSSL = false; + connData->useSSL = false; } - ServerSSLFound = true; + serverSSLFound = true; - } else if (PropertyName == "prefix" && ServerPrefixFound == false){ + } else if (propertyName == "prefix" && serverPrefixFound == false){ // Setup the server prefix. - ConnData->Prefix = PropertyValue; - ServerPrefixFound = true; + connData->prefix = propertyValue; + serverPrefixFound = true; } @@ -164,9 +164,9 @@ ProcessConnectionDataFileResult ProcessConnectionDataFile(string DataFilename, // Reset the variables. - EqualFound = false; - PropertyName.clear(); - PropertyValue.clear(); + equalFound = false; + propertyName.clear(); + propertyValue.clear(); } else { @@ -174,33 +174,33 @@ ProcessConnectionDataFileResult ProcessConnectionDataFile(string DataFilename, // Property name or value depending on // if the equal sign has been found. - BufferChar = ReceivedStringData[SeekCount]; + bufferChar = receivedStringData[seekCount]; - if (EqualFound == true){ - PropertyValue += BufferChar; + if (equalFound == true){ + propertyValue += bufferChar; } else { - PropertyName += BufferChar; + propertyName += bufferChar; } - BufferChar = 0; + bufferChar = 0; } - SeekCount++; + seekCount++; } // Check that the CalDAV connection data object // contains valid data. - bool CalDAVConnDataResult = CalDAVObjectValidSettings(ConnData); + bool calDAVConnDataResult = CalDAVObjectValidSettings(connData); - if (CalDAVConnDataResult == false){ - ProcessResult = PROCESSCONNECTIONDATAFILE_INVALID; + if (calDAVConnDataResult == false){ + processResult = PROCESSCONNECTIONDATAFILE_INVALID; } else { - ProcessResult = PROCESSCONNECTIONDATAFILE_OK; + processResult = PROCESSCONNECTIONDATAFILE_OK; } - return ProcessResult; + return processResult; } \ No newline at end of file