Merge pull request #19633 from Dr15Jones/addExceptionTests

Extend state machine test to include exceptions
cms-sw · Jul 10, 2017 · 22055b5 · 22055b5
2 parents 0d534b8 + d21de95
commit 22055b5
Show file tree

Hide file tree

Showing 12 changed files with 432 additions and 4 deletions.
diff --git a/FWCore/Framework/test/MockEventProcessor.cc b/FWCore/Framework/test/MockEventProcessor.cc
@@ -5,6 +5,7 @@
 #include "FWCore/Framework/interface/InputSource.h"
 #include <cassert>
 #include <sstream>
+#include <exception>
 
 namespace {
   // As each data item is read from the mock data it is
@@ -42,7 +43,8 @@ namespace edm {
     shouldWeEndLoop_(true),
     shouldWeStop_(false),
     eventProcessed_(false),
-    reachedEndOfInput_(false)
+    reachedEndOfInput_(false),
+    shouldThrow_(false)
   {
   }
 
@@ -92,6 +94,10 @@ namespace edm {
       output_ << "    *** nextItemType: Restart " << t.value << " ***\n";
       shouldWeEndLoop_ = t.value;
       return InputSource::IsStop;
+    } else if(ch == 't') {
+      output_ << "    *** nextItemType: Throw " << t.value << " ***\n";
+      shouldThrow_ = true;
+      return nextTransitionType();
     }
     return InputSource::IsInvalid;
   }
@@ -150,6 +156,7 @@ namespace edm {
 
   void MockEventProcessor::readFile() {
     output_ << " \treadFile\n";
+    throwIfNeeded();
   }
 
   void MockEventProcessor::closeInputFile(bool /*cleaningUpAfterException*/) {
@@ -200,6 +207,7 @@ namespace edm {
 
   void MockEventProcessor::beginRun(ProcessHistoryID const& phid, RunNumber_t run) {
     output_ << "\tbeginRun " << run << "\n";
+    throwIfNeeded();
   }
 
   void MockEventProcessor::endRun(ProcessHistoryID const& phid, RunNumber_t run, bool /*cleaningUpAfterException*/ ) {
@@ -208,6 +216,7 @@ namespace edm {
 
   void MockEventProcessor::beginLumi(ProcessHistoryID const&, RunNumber_t run, LuminosityBlockNumber_t lumi) {
     output_ << "\tbeginLumi " << run << "/" << lumi << "\n";
+    throwIfNeeded();
   }
 
   void MockEventProcessor::endLumi(ProcessHistoryID const&, RunNumber_t run, LuminosityBlockNumber_t lumi, bool /*cleaningUpAfterException*/) {
@@ -254,13 +263,22 @@ namespace edm {
     output_ << "\treadEvent\n";
     output_ << "\tprocessEvent\n";
     eventProcessed_ = true;
+    throwIfNeeded();
   }
 
   bool MockEventProcessor::shouldWeStop() const {
     output_ << "\tshouldWeStop\n";
     return eventProcessed_ and shouldWeStop_;
   }
 
+  void MockEventProcessor::throwIfNeeded() {
+    if(shouldThrow_) {
+      shouldThrow_ = false;
+      output_ <<"\tthrowing\n";
+      throw TestException();
+    }
+  }
+
   void MockEventProcessor::setExceptionMessageFiles(std::string&) {}
   void MockEventProcessor::setExceptionMessageRuns(std::string&) {}
   void MockEventProcessor::setExceptionMessageLumis(std::string&) {}

diff --git a/FWCore/Framework/test/MockEventProcessor.h b/FWCore/Framework/test/MockEventProcessor.h
@@ -14,11 +14,17 @@ Original Authors: W. David Dagenhart, Marc Paterno
 #include <iostream>
 #include <string>
 #include <sstream>
+#include <exception>
 
 namespace edm {
   class MockEventProcessor {
   public:
-
+    class TestException : public std::exception {
+    public:
+      TestException() noexcept
+      :std::exception() {}
+    };
+
     MockEventProcessor(std::string const& mockData,
                        std::ostream& output,
                        bool iDoNotMerge);
@@ -72,6 +78,7 @@ namespace edm {
 
   private:
     void readAndProcessEvent();
+    void throwIfNeeded();
 
     std::string mockData_;
     std::ostream & output_;
@@ -86,6 +93,7 @@ namespace edm {
     bool shouldWeStop_;
     bool eventProcessed_;
     bool reachedEndOfInput_;
+    bool shouldThrow_;
   };
 }
 

diff --git a/FWCore/Framework/test/run_statemachine.sh b/FWCore/Framework/test/run_statemachine.sh
@@ -40,6 +40,15 @@ pushd ${LOCAL_TMP_DIR}
 
   done
 
+#testing exceptions
+  for i in 20 21 22 23
+  do
+
+    ${exe} -i ${input}${i}.txt -o ${output}${i}.txt || die "TestFWCoreFrameworkStatemachine with input ${i}" $?
+    diff ${reference_output}${i}.txt ${output}${i}.txt || die "comparing ${output}${i}.txt" $?
+
+  done
+
 popd
 
 exit 0
diff --git a/FWCore/Framework/test/statemachine_t.cc b/FWCore/Framework/test/statemachine_t.cc
@@ -71,8 +71,11 @@ int main(int argc, char* argv[]) try {
     edm::MockEventProcessor mockEventProcessor(mockData,
                                                output,
                                                mode);
-
-    mockEventProcessor.runToCompletion();
+    try {
+      mockEventProcessor.runToCompletion();
+    } catch(edm::MockEventProcessor::TestException const& e) {
+      output <<"caught test exception\n";
+    }
   }
   return 0;
 } catch(std::exception const& e) {

diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_20.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_20.txt
@@ -0,0 +1,9 @@
+f 1
+r 1
+l 1
+e 1
+f 0
+r 2
+l 1
+t 1
+e 1
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_21.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_21.txt
@@ -0,0 +1,9 @@
+f 1
+r 1
+l 1
+e 1
+f 0
+r 2
+t 1
+l 1
+
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_22.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_22.txt
@@ -0,0 +1,9 @@
+f 1
+r 1
+l 1
+e 1
+f 0
+t 1
+r 2
+
+
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_23.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_23.txt
@@ -0,0 +1,8 @@
+f 1
+r 1
+l 1
+e 1
+t 1
+f 0
+
+
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_20.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_20.txt
@@ -0,0 +1,103 @@
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	deleteLumiFromCache 1/1
+	endRun 1
+	writeRun 1
+	deleteRunFromCache 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 2 ***
+	readRun 2
+	beginRun 2
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+    *** nextItemType: Throw 1 ***
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	throwing
+	endLumi 2/1
+	writeLumi 2/1
+	deleteLumiFromCache 2/1
+	endRun 2
+	writeRun 2
+	deleteRunFromCache 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+caught test exception
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 2 ***
+	endLumi 1/1
+	writeLumi 1/1
+	deleteLumiFromCache 1/1
+	endRun 1
+	writeRun 1
+	deleteRunFromCache 1
+	readRun 2
+	beginRun 2
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+    *** nextItemType: Throw 1 ***
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	throwing
+	endLumi 2/1
+	writeLumi 2/1
+	deleteLumiFromCache 2/1
+	endRun 2
+	writeRun 2
+	deleteRunFromCache 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+caught test exception
diff --git a/FWCore/Framework/test/unit_test_outputs/statemachine_output_21.txt b/FWCore/Framework/test/unit_test_outputs/statemachine_output_21.txt
@@ -0,0 +1,97 @@
+
+Machine parameters:  mode = NOMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	endLumi 1/1
+	writeLumi 1/1
+	deleteLumiFromCache 1/1
+	endRun 1
+	writeRun 1
+	deleteRunFromCache 1
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 2 ***
+	readRun 2
+	beginRun 2
+    *** nextItemType: Throw 1 ***
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+	throwing
+	endLumi 2/1
+	writeLumi 2/1
+	deleteLumiFromCache 2/1
+	endRun 2
+	writeRun 2
+	deleteRunFromCache 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+caught test exception
+
+Machine parameters:  mode = FULLMERGE
+	startingNewLoop
+    *** nextItemType: File 1 ***
+ 	readFile
+	respondToOpenInputFile
+	openOutputFiles
+    *** nextItemType: Run 1 ***
+	readRun 1
+	beginRun 1
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 1/1
+    *** nextItemType: Event ***
+	readEvent
+	processEvent
+	shouldWeStop
+    *** nextItemType: File 0 ***
+	shouldWeStop
+	shouldWeCloseOutput
+	respondToCloseInputFile
+	closeInputFile
+ 	readFile
+	respondToOpenInputFile
+    *** nextItemType: Run 2 ***
+	endLumi 1/1
+	writeLumi 1/1
+	deleteLumiFromCache 1/1
+	endRun 1
+	writeRun 1
+	deleteRunFromCache 1
+	readRun 2
+	beginRun 2
+    *** nextItemType: Throw 1 ***
+    *** nextItemType: Lumi 1 ***
+	readLuminosityBlock 1
+	beginLumi 2/1
+	throwing
+	endLumi 2/1
+	writeLumi 2/1
+	deleteLumiFromCache 2/1
+	endRun 2
+	writeRun 2
+	deleteRunFromCache 2
+	respondToCloseInputFile
+	closeInputFile
+	closeOutputFiles
+caught test exception