[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/multimedia/ktabedit
From:       Gwenael Casaccio <mrgwen () gmail ! com>
Date:       2007-05-20 10:33:03
Message-ID: 1179657183.608888.32481.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 666569 by casaccio:

Add precondition and postcondition and their unit test

 M  +4 -4      ktabedit/tablature/tabtrack.cpp  
 M  +6 -1      unitTest/CMakeLists.txt  
 A             unitTest/exceptiontest.cpp   [License: no copyright]
 A             unitTest/exceptiontest.h   [License: no copyright]
 A             util/assert.cpp   [License: no copyright]
 A             util/assert.h   [License: GPL (v2+)]


--- trunk/playground/multimedia/ktabedit/ktabedit/tablature/tabtrack.cpp \
#666568:666569 @@ -83,7 +83,7 @@
 	iterator it;
 	uint j = 0;
 	
-	for (it = tabBar.begin(); j < i; ++it, j++)
+	for (it = tabBar.begin(); j < barNumber; ++it, j++)
 		;
 	
 	tabBar.insert(it, tempBar);
@@ -113,7 +113,7 @@
 {
 	assert(barNumber < tabBar.size());
 	
-	return tabBar[i];
+	return tabBar[barNumber];
 }
 
 void TabTrack::setBar(uint barNumber, TabBar &tempBar)
@@ -130,7 +130,7 @@
 	iterator it;
 	uint j = 0;
 	
-	for (it = tabBar.begin(); j < i; ++it, j++)
+	for (it = tabBar.begin(); j < barNumber; ++it, j++)
 		;
 	
 	tabBar.erase(it);
@@ -156,7 +156,7 @@
 
 char TabTrack::fret(uint barNumber, uint timeNumber, uint string) const
 {
-	if (hasPositionExceed(bar) == true)
+	if (hasPositionExceed(barNumber) == true)
 		return 0;
 	
 	return bar(barNumber).fret(timeNumber, string);
--- trunk/playground/multimedia/ktabedit/unitTest/CMakeLists.txt #666568:666569
@@ -1,30 +1,35 @@
 INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  \
${QT_INCLUDE_DIR}   ${CMAKE_CURRENT_SOURCE_DIR}/../ktabedit/ )
 
+set ( exceptiontest_SRCS exceptiontest.cpp )
 set ( tabsongtest_SRCS tabsongtest.cpp )
 set ( tabtracktest_SRCS tabtracktest.cpp )
 set ( songkeytest_SRCS songkeytest.cpp ) 
 set ( assistantguitest_SRCS assistantguitest.cpp ) 
 set ( optionguitest_SRCS optionguitest.cpp ) 
 
+kde4_automoc ( ${exceptiontest_SRCS} )
 kde4_automoc ( ${tabsongtest_SRCS} )
 kde4_automoc ( ${tabtracktest_SRCS} )
 kde4_automoc ( ${songkeytest_SRCS} )
 kde4_automoc ( ${assistantguitest_SRCS} )
 kde4_automoc ( ${optionguitest_SRCS} )
- 
+
+kde4_add_executable ( exceptiontest NOGUI RUN_UNINSTALLED ${exceptiontest_SRCS} )
 kde4_add_executable ( tabsongtest NOGUI RUN_UNINSTALLED ${tabsongtest_SRCS} )
 kde4_add_executable ( tabtracktest NOGUI RUN_UNINSTALLED ${tabtracktest_SRCS} )
 kde4_add_executable ( songkeytest NOGUI RUN_UNINSTALLED ${songkeytest_SRCS} )
 kde4_add_executable ( assistantguitest GUI RUN_UNINSTALLED ${assistantguitest_SRCS} \
)  kde4_add_executable ( optionguitest GUI RUN_UNINSTALLED ${optionguitest_SRCS} )
 
+target_link_libraries ( exceptiontest ${QT_QTTEST_LIBRARY} ${QT_AND_KDECORE_LIBS} \
${KDE4_KDE3SUPPORT_LIBS} util )  target_link_libraries ( tabsongtest \
${QT_QTTEST_LIBRARY} ${QT_AND_KDECORE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} tablature )  \
target_link_libraries ( tabtracktest ${QT_QTTEST_LIBRARY} ${QT_AND_KDECORE_LIBS} \
${KDE4_KDE3SUPPORT_LIBS} tablature )  target_link_libraries ( songkeytest \
${QT_QTTEST_LIBRARY} ${QT_AND_KDECORE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} tablature )  \
target_link_libraries ( assistantguitest ${QT_QTTEST_LIBRARY} ${QT_AND_KDECORE_LIBS} \
${KDE4_KDE3SUPPORT_LIBS} ${TSE3_LIBRARY} wizard )  target_link_libraries ( \
optionguitest ${QT_QTTEST_LIBRARY} ${QT_AND_KDECORE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} \
${TSE3_LIBRARY} options )  
+add_test ( util-exceptiontest ${EXECUTABLE_OUTPUT_PATH}/exceptiontest )
 add_test ( tablature-tabsongtest ${EXECUTABLE_OUTPUT_PATH}/tabsongtest )
 add_test ( tablature-tabtracktest ${EXECUTABLE_OUTPUT_PATH}/tabtracktest )
 add_test ( tablature-songkeytest ${EXECUTABLE_OUTPUT_PATH}/songkeytest )


[prev in list] [next in list] [prev in thread] [next in thread]