Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[482] trunk
|
From: <koc...@us...> - 2009-11-23 14:00:03
|
Revision: 482
http://scstudio.svn.sourceforge.net/scstudio/?rev=482&view=rev
Author: kocianon
Date: 2009-11-23 13:59:35 +0000 (Mon, 23 Nov 2009)
Log Message:
-----------
CMakeList time constraint check test fix
Modified Paths:
--------------
trunk/src/data/dfs_hmsc_flat_traverser.h
trunk/tests/time_constraints/CMakeLists.txt
Modified: trunk/src/data/dfs_hmsc_flat_traverser.h
===================================================================
--- trunk/src/data/dfs_hmsc_flat_traverser.h 2009-11-23 13:35:34 UTC (rev 481)
+++ trunk/src/data/dfs_hmsc_flat_traverser.h 2009-11-23 13:59:35 UTC (rev 482)
@@ -141,7 +141,7 @@
};
/// Traversing HMsc using DFSHMscFlatTraverser and hmsc found event
-class SCMSC_EXPORT DFSHMscsTraverse:public InnerHMscFoundListener
+class SCMSC_EXPORT DFSHMscsTraverse:public InnerHMscFoundListener, InnerBMscFoundListener
{
private:
std::stack<HMscPtr> m_to_traverse; /// stack of HMsc to traverse
@@ -168,7 +168,7 @@
m_to_traverse.push(hmsc); // push to the queue
add_hmsc_as_traversed(hmsc); // add this hmsc as it was traversed
m_traverser->add_inner_hmsc_listener(this);
-
+ m_traverser->add_inner_bmsc_listener(this);
while(!m_to_traverse.empty())
{
m_active_hmsc = m_to_traverse.top();
@@ -190,6 +190,11 @@
m_to_traverse.push(hmsc);
}
+ void on_new_inner_bmsc_found(HMscPtr msc, ReferenceNode* refNode)
+ {
+ std::cout<< "new BMSc found" << std::endl;
+ }
+
std::list<HMscPtr> get_hmsc_path()
{
std::list<HMscPtr> path;
Modified: trunk/tests/time_constraints/CMakeLists.txt
===================================================================
--- trunk/tests/time_constraints/CMakeLists.txt 2009-11-23 13:35:34 UTC (rev 481)
+++ trunk/tests/time_constraints/CMakeLists.txt 2009-11-23 13:59:35 UTC (rev 482)
@@ -1,57 +1,57 @@
# Positive test-cases
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos1.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos2.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos3.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos4.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos5.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos6.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos7.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos8.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos9.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos10.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos11.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos12.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos13.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos14.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos15.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos16.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos17.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos18.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos19.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos20.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos21.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos22.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos23.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos24.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos25.mpr 1)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_pos26.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos1.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos2.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos3.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos4.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos5.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos6.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos7.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos8.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos9.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos10.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos11.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos12.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos13.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos14.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos15.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos16.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos17.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos18.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos19.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos20.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos21.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos22.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos23.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos24.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos25.mpr 1)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_pos26.mpr 1)
# Negative test-cases
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg1.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg2.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg3.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg4.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg5.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg6.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg7.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg8.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg9.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg10.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg11.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg12.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg13.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg14.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg15.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg16.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg17.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg18.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg19.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg20.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg21.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg22.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg23.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg24.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg25.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg26.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg27.mpr 0)
-ADD_CHECKER_TEST(sctime "Constraints Check" proper_neg28.mpr 0)
\ No newline at end of file
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg1.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg2.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg3.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg4.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg5.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg6.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg7.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg8.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg9.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg10.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg11.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg12.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg13.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg14.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg15.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg16.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg17.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg18.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg19.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg20.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg21.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg22.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg23.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg24.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg25.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg26.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg27.mpr 0)
+ADD_CHECKER_TEST(sctime "Correct Time Constraint Syntax" proper_neg28.mpr 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
