aaf-commits

[Jesse L. <jl...@us...>]

Update of /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/BaseTestImpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23340/Utilities/AAFAnalyzer/BaseTestImpl

Modified Files:
	AcyclicVisitor.cpp AcyclicAnalysis.cpp 
Log Message:
Bug 102. Fix - Acyclic Requirement pass/fail

Index: AcyclicAnalysis.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/BaseTestImpl/AcyclicAnalysis.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AcyclicAnalysis.cpp	13 Oct 2005 19:33:58 -0000	1.6
--- AcyclicAnalysis.cpp	18 Jan 2006 15:54:14 -0000	1.7
***************
*** 78,81 ****
--- 78,82 ----
    spResult->SetName(GetName());
    spResult->SetDescription(GetDescription());
+   spResult->SetExplanation(L"Test Failed - See \"AcyclicVisitor\" for details");
  
    dfs.TraverseDown(spVisitor, GetTestGraph()->GetRootNode()); 
***************
*** 106,110 ****
      shared_ptr<vector<AxString> > spReqIds(new vector<AxString>);
      //TODO: Push actual requirements.
! //    spReqIds->push_back(L"Requirement Id");
      return TestInfo(L"AcyclicAnalysis", spReqIds);
  }
--- 107,111 ----
      shared_ptr<vector<AxString> > spReqIds(new vector<AxString>);
      //TODO: Push actual requirements.
!     spReqIds->push_back(L"REQ_EP_256");  // Acyclic graph requirement
      return TestInfo(L"AcyclicAnalysis", spReqIds);
  }

Index: AcyclicVisitor.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/Utilities/AAFAnalyzer/BaseTestImpl/AcyclicVisitor.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AcyclicVisitor.cpp	17 Jan 2006 20:29:30 -0000	1.9
--- AcyclicVisitor.cpp	18 Jan 2006 15:54:14 -0000	1.10
***************
*** 144,152 ****
    
    }
-   cycle+=newl;
-   //_os<<endl;
    
!   _spResult->SetExplanation(L"Cycle detected!" +newl +cycle);
    _spResult->SetResult(TestResult::FAIL);
    _Vector.pop_back();
    
--- 144,154 ----
    
    }
    
!   _spResult->SetExplanation(L"Cycle(s) detected!");
    _spResult->SetResult(TestResult::FAIL);
+   _spResult->AddInformationResult(
+             L"REQ_EP_256",
+             cycle,
+             TestResult::FAIL );
    _Vector.pop_back();