Intermdiate commit: trying google mock and test isn't working - it se…

…gfaults. Will be fixing on another box - jaju
tw4eric · Mar 18, 2011 · 9dd5232 · 9dd5232
1 parent 212f26d
commit 9dd5232
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/include/call_parser/FileBasedCallDataParser.hh b/include/call_parser/FileBasedCallDataParser.hh
@@ -18,15 +18,15 @@ namespace CallParser {
 		FileBasedCallDataParser(string fileName);
 =======
 */
-		  FileBasedCallDataParser(util::FileReader fileReader);
+		  FileBasedCallDataParser(util::FileReader* fileReader);
 		  FileBasedCallDataParser(const FileBasedCallDataParser& fileBasedCallDataParser);
 //>>>>>>> Stashed changes
 	      ~FileBasedCallDataParser();
 	       virtual list<CallRecord*>* parseRecords();
 		private:
 	       CallRecord* toCallRecord(string line);
 
-	       util::FileReader fileReaderM;
+	       util::FileReader* fileReaderM;
 	};
 }
 

diff --git a/src/call_parser/CallDataParserFactory.cc b/src/call_parser/CallDataParserFactory.cc
@@ -6,6 +6,7 @@
  */
 #include <fstream>
 #include <iostream>
+#include "util/FileReader.hh"
 #include "call_parser/CallDataParserFactory.hh"
 #include "call_parser/FileBasedCallDataParser.hh"
 #include "call_parser/FileBasedCallDataParserV2.hh"
@@ -60,7 +61,7 @@ CallDataParser* CallDataParserFactory::createParser(string FileName)
 	{
 		case 1:
 		{
-			return new FileBasedCallDataParser(FileName);
+			return new FileBasedCallDataParser(new util::FileReader(FileName));
 		}
 		case 2:
 		{

diff --git a/src/call_parser/FileBasedCallDataParser.cc b/src/call_parser/FileBasedCallDataParser.cc
@@ -62,7 +62,7 @@ namespace CallParser {
                 return NULL;
         }
 */
-    FileBasedCallDataParser::FileBasedCallDataParser(FileReader fileReader) :
+    FileBasedCallDataParser::FileBasedCallDataParser(FileReader* fileReader) :
         fileReaderM(fileReader) {
     }
 
@@ -78,19 +78,19 @@ namespace CallParser {
     list<CallRecord*>* FileBasedCallDataParser::parseRecords() {
         list<CallRecord*>* callRecordList = new list<CallRecord*> ;
 
-        if (!fileReaderM.open()) {
+        if (!fileReaderM->open()) {
             return callRecordList;
         }
 
         string line;
-        while ((line = fileReaderM.getLine()) != "") {
+        while ((line = fileReaderM->getLine()) != "") {
             CallRecord* callRec = toCallRecord(line);
             if(callRec != NULL){
                 callRecordList->push_back(callRec);
             }
         }
 
-        fileReaderM.close();
+        fileReaderM->close();
 
         return callRecordList;
     }
@@ -109,6 +109,7 @@ namespace CallParser {
                 return callRec;
             }catch(...){
                 cerr<<"Invalid Record Found: "<<line<<endl;
+                return NULL;
             }
 //>>>>>>> Stashed changes
         }

diff --git a/test/call_cost/SimpleCallCostCalculatorTest.cc b/test/call_cost/SimpleCallCostCalculatorTest.cc
@@ -42,7 +42,7 @@ GTEST(shouldGenerateCallRecordForValidInputFile)
     const char *if_cur_dir_is_test = "call_parser/call_data_small.txt";
     const char *data_file_name = if_cur_dir_is_root;
     FileReader fileReader(data_file_name);
-    CallDataParser *dataParser = new FileBasedCallDataParser(fileReader);
+    CallDataParser *dataParser = new FileBasedCallDataParser(&fileReader);
     list<CallRecord*>* dataRecords = dataParser->parseRecords();
 
     EXPECT_TRUE(dataRecords != NULL);

diff --git a/test/call_parser/FileBasedCallDataParserTest.cc b/test/call_parser/FileBasedCallDataParserTest.cc
@@ -23,7 +23,7 @@ using ::testing::Return;
 class MockFileReader : public ::util::FileReader {
 
 public:
-	MockFileReader(const string &filename) : FileReader(filename) {}
+	MockFileReader(const string &filename) : util::FileReader(filename) {}
  public:
   MOCK_METHOD0(open, bool());
   MOCK_METHOD0(getLine, string());
@@ -46,7 +46,7 @@ GTEST(countOftheCallRecordsMustBeEqualToNumberOfValidEntries)
 {
     const string data_file_name("dummyfile");
     MockFileReader fileReader(data_file_name);
-    EXPECT_CALL(fileReader, open()).Times(1);
+    EXPECT_CALL(fileReader, open()).Times(1).WillOnce(Return(true));
     EXPECT_CALL(fileReader, getLine())
         .Times(7)
         .WillOnce(Return("21/02/2011 LOC 5 Nick 974503244"))
@@ -57,7 +57,7 @@ GTEST(countOftheCallRecordsMustBeEqualToNumberOfValidEntries)
 		.WillOnce(Return("04/01/2011ISD 30 InvalidRecord 164503234"))
         .WillOnce(Return(""));
     EXPECT_CALL(fileReader, close()).Times(1);
-    CallDataParser *dataParser = new FileBasedCallDataParser(fileReader);
+    CallDataParser *dataParser = new FileBasedCallDataParser(&fileReader);
     list<CallRecord*>* dataRecords = dataParser->parseRecords();
 
     EXPECT_TRUE(dataRecords != NULL);
@@ -76,7 +76,7 @@ GTEST(shouldGenerateOneCallRecord)
         .WillOnce(Return("21/02/2011 LOC 5 Nick 974503244"))
         .WillOnce(Return(""));
     EXPECT_CALL(fileReader, close()).Times(1);
-    CallDataParser *dataParser = new FileBasedCallDataParser(fileReader);
+    CallDataParser *dataParser = new FileBasedCallDataParser(&fileReader);
     list<CallRecord*>* dataRecords = dataParser->parseRecords();
 
     EXPECT_TRUE(dataRecords != NULL);
@@ -99,7 +99,7 @@ GTEST(shouldNotGenerateCallRecordForEntryWithInvalidCallDuration)
         .WillOnce(Return("04/01/2011 LOC MNO InvalidRecord 164503234"))
         .WillOnce(Return(""));
     EXPECT_CALL(fileReader, close()).Times(1);
-    CallDataParser *dataParser = new FileBasedCallDataParser(fileReader);
+    CallDataParser *dataParser = new FileBasedCallDataParser(&fileReader);
     list<CallRecord*>* dataRecords = dataParser->parseRecords();
 
     EXPECT_TRUE(dataRecords == NULL);
@@ -151,7 +151,7 @@ GTEST(shouldGenerateCallRecordForValidInputFile)
 GTEST(shouldNotGenerateRecordForInvalidFile)
 {
     util::FileReader fileReader("xx");
-	CallDataParser *dataParser = new FileBasedCallDataParser(fileReader);
+	CallDataParser *dataParser = new FileBasedCallDataParser(&fileReader);
     list<CallRecord*>* dataRecords = dataParser->parseRecords();
 
     EXPECT_TRUE(dataRecords != NULL);