[codename-alex-dev-commits] QA subsTest0000.txt,1.1,1.2 subsTest0001.txt,1.1,1.2 subsTest0002.txt,1.1,1.2 subsTest0004.txt,1.1,1.2 subsTest0005.txt,1.1,1.2

[<wz...@us...>]

Update of /cvsroot/codename-alex/QA
In directory sc8-pr-cvs1:/tmp/cvs-serv27685/QA

Modified Files:
	subsTest0000.txt subsTest0001.txt subsTest0002.txt 
	subsTest0004.txt subsTest0005.txt 
Log Message:
updated version
- use #true and #false
- ensureVersion and isStableRelease now in subs.txt

Index: subsTest0000.txt
===================================================================
RCS file: /cvsroot/codename-alex/QA/subsTest0000.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** subsTest0000.txt	21 Jan 2003 13:45:32 -0000	1.1
--- subsTest0000.txt	8 Mar 2003 21:08:53 -0000	1.2
***************
*** 1,3 ****
! ; force subs.txt _init
  deleteVar subsInitialized
  
--- 1,3 ----
! ; force subs.txt _init, ensureVersion, isStableRelease
  deleteVar subsInitialized
  
***************
*** 14,49 ****
  	+ subsVerRevision: %subsVerRevision $$
  	+ [subs.txt should be initialized]
  	
! gosub ensureVersion 1 6	
  display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
  	+ subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
! 	+ "gosub ensureVersion 1 6" returned: %return $$
! 	+ ( true: %_TRUE / false: %_FALSE )
  	
! gosub isStableRelease
  display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
  	+ subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
  	+ "gosub isStableRelease" returned: %return $$
! 	+ ( true: %_TRUE / false: %_FALSE )
  halt
- 
- sub ensureVersion
- 	set %_1 %1
- 	call subs.txt andOr %subsVerMajor = %1 AND %subsVerMinor >= %2
- 	if %subsVerMajor > %_1
- 	{
- 		set %return %_TRUE
- 	}
- return
- 
- sub isStableRelease
- 	call subs.txt andOr RC in %subsVerRevision OR %subsVerRevision in AlphaBeta
- 	if %return = %_TRUE
- 	{
- 		set %return %_FALSE
- 		return
- 	}
- 	set %_subsVerRevisionModulus %subsVerRevision % 2
- 	if %_subsVerRevisionModulus = 1
- 		set %return %_TRUE
- return
--- 14,70 ----
  	+ subsVerRevision: %subsVerRevision $$
  	+ [subs.txt should be initialized]
+ 
+ set %testMinor %subsVerMinor - 1
+ set %testMajor %subsVerMajor
+ call subs.txt ensureVersion %testMajor %testMinor	
+ display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
+ 	+ subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
+ 	+ "gosub ensureVersion %testMajor %testMinor " returned: %return $$
+ 	+ ( true: #true / false: #false )
  	
! set %testMinor %subsVerMinor
! set %testMajor %subsVerMajor - 1
! call subs.txt ensureVersion %testMajor %testMinor	
  display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
  	+ subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
! 	+ "gosub ensureVersion %testMajor %testMinor " returned: %return $$
! 	+ ( true: #true / false: #false )
  	
! set %testMinor %subsVerMinor
! set %testMajor %subsVerMajor
! call subs.txt ensureVersion %testMajor %testMinor	
! display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! 	+ subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
! 	+ "gosub ensureVersion %testMajor %testMinor " returned: %return $$
! 	+ ( true: #true / false: #false )
! 	
! set %testMinor %subsVerMinor + 1
! set %testMajor %subsVerMajor
! call subs.txt ensureVersion %testMajor %testMinor	
! display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! 	+ subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
! 	+ "gosub ensureVersion %testMajor %testMinor " returned: %return $$
! 	+ ( true: #true / false: #false )
! 	
! set %testMinor %subsVerMinor
! set %testMajor %subsVerMajor + 1
! call subs.txt ensureVersion %testMajor %testMinor	
! display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! 	+ subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
! 	+ "gosub ensureVersion %testMajor %testMinor " returned: %return $$
! 	+ ( true: #true / false: #false )
! 	
! set %testMinor %subsVerMinor - 1
! set %testMajor %subsVerMajor + 1
! call subs.txt ensureVersion %testMajor %testMinor	
! display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! 	+ subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
! 	+ "gosub ensureVersion %testMajor %testMinor " returned: %return $$
! 	+ ( true: #true / false: #false )
! 	
! call subs.txt isStableRelease
  display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
  	+ subs.txt version: %subsVerMajor %subsVerMinor %subsVerRevision $$
  	+ "gosub isStableRelease" returned: %return $$
! 	+ ( true: #true / false: #false )
  halt

Index: subsTest0001.txt
===================================================================
RCS file: /cvsroot/codename-alex/QA/subsTest0001.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** subsTest0001.txt	21 Jan 2003 13:45:32 -0000	1.1
--- subsTest0001.txt	8 Mar 2003 21:08:53 -0000	1.2
***************
*** 5,9 ****
  
  display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! 	+ dontMoveCursor: %dontMoveCursor ( true: %_TRUE )$
  	+ screenResX: %screenResX $
  	+ screenResY: %screenResY $$
--- 5,9 ----
  
  display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! 	+ dontMoveCursor: %dontMoveCursor ( true: #true )$
  	+ screenResX: %screenResX $
  	+ screenResY: %screenResY $$
***************
*** 12,16 ****
  call subs.txt N/A
  display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! 	+ dontMoveCursor: %dontMoveCursor ( true: %_TRUE )$
  	+ screenResX: %screenResX $
  	+ screenResY: %screenResY $$
--- 12,16 ----
  call subs.txt N/A
  display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! 	+ dontMoveCursor: %dontMoveCursor ( true: #true )$
  	+ screenResX: %screenResX $
  	+ screenResY: %screenResY $$
***************
*** 19,23 ****
  call subs.txt setGameWndRes 800 600
  display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! 	+ dontMoveCursor: %dontMoveCursor ( true: %_TRUE )$
  	+ screenResX: %screenResX $
  	+ screenResY: %screenResY $$
--- 19,23 ----
  call subs.txt setGameWndRes 800 600
  display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! 	+ dontMoveCursor: %dontMoveCursor ( true: #true )$
  	+ screenResX: %screenResX $
  	+ screenResY: %screenResY $$
***************
*** 27,31 ****
  call subs.txt N/A
  display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! 	+ dontMoveCursor: %dontMoveCursor ( true: %_TRUE )$
  	+ screenResX: %screenResX $
  	+ screenResY: %screenResY $$
--- 27,31 ----
  call subs.txt N/A
  display ok subsInitialized: %subsInitialized ( ok: %_OK )$$
! 	+ dontMoveCursor: %dontMoveCursor ( true: #true )$
  	+ screenResX: %screenResX $
  	+ screenResY: %screenResY $$

Index: subsTest0002.txt
===================================================================
RCS file: /cvsroot/codename-alex/QA/subsTest0002.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** subsTest0002.txt	21 Jan 2003 13:45:32 -0000	1.1
--- subsTest0002.txt	8 Mar 2003 21:08:53 -0000	1.2
***************
*** 6,11 ****
  ; 1. run test twice; with "Don't Move Cursor" option on and off
  
! ; parameter "vendor name" is only used/tested when %dontMoveCursor = %_TRUE
! ; parameter "move" is only used/tested when %dontMoveCursor = %_FALSE
  
  ; Setup:
--- 6,11 ----
  ; 1. run test twice; with "Don't Move Cursor" option on and off
  
! ; parameter "vendor name" is only used/tested when %dontMoveCursor = #true
! ; parameter "move" is only used/tested when %dontMoveCursor = #false
  
  ; Setup:
***************
*** 25,63 ****
  	halt
  
! if %dontMoveCursor = %_FALSE
  {
  	display ok dontMoveCursor is off$$
! 		+  testing openBuy %vendorID %vendorName %_TRUE $
  		+ (character isn't allowed to move)
  		
  	if #contKind = %shopContKind
  		click 289 164 r
! 	call subs.txt openBuy %vendorID %vendorName %_TRUE 
  	
  	display ok dontMoveCursor is off$$
! 		+  testing openBuy %vendorID %vendorName %_TRUE $
  		+ (character isn't allowed to move)
  		
  	if #contKind = %shopContKind
  		click 289 164 r
! 	call subs.txt openSell %vendorID %vendorName %_TRUE
  	
  	display ok dontMoveCursor is off$$
! 		+  testing openBuy %vendorID %vendorName %_FALSE $
  		+ (character is allowed to move)
  		
  	if #contKind = %shopContKind
  		click 289 164 r
! 	call subs.txt openBuy %vendorID %vendorName %_FALSE
  	
  	display ok dontMoveCursor is off$$
! 		+  testing openBuy %vendorID %vendorName %_FALSE $
  		+ (character is allowed to move)
  		
  	if #contKind = %shopContKind
  		click 289 164 r
! 	call subs.txt openSell %vendorID %vendorName %_FALSE
  }
! if %dontMoveCursor = %_TRUE
  {
  	display ok dontMoveCursor is on$$
--- 25,63 ----
  	halt
  
! if %dontMoveCursor = #false
  {
  	display ok dontMoveCursor is off$$
! 		+  testing openBuy %vendorID %vendorName #true $
  		+ (character isn't allowed to move)
  		
  	if #contKind = %shopContKind
  		click 289 164 r
! 	call subs.txt openBuy %vendorID %vendorName #true 
  	
  	display ok dontMoveCursor is off$$
! 		+  testing openBuy %vendorID %vendorName #true $
  		+ (character isn't allowed to move)
  		
  	if #contKind = %shopContKind
  		click 289 164 r
! 	call subs.txt openSell %vendorID %vendorName #true
  	
  	display ok dontMoveCursor is off$$
! 		+  testing openBuy %vendorID %vendorName #false $
  		+ (character is allowed to move)
  		
  	if #contKind = %shopContKind
  		click 289 164 r
! 	call subs.txt openBuy %vendorID %vendorName #false
  	
  	display ok dontMoveCursor is off$$
! 		+  testing openBuy %vendorID %vendorName #false $
  		+ (character is allowed to move)
  		
  	if #contKind = %shopContKind
  		click 289 164 r
! 	call subs.txt openSell %vendorID %vendorName #false
  }
! if %dontMoveCursor = #true
  {
  	display ok dontMoveCursor is on$$
***************
*** 98,105 ****
  ; Parameters: %1 = vendor ID
  ;             %2 = vendor name
! ;             %3 = don't move (%_FALSE = it's okay to move, %_TRUE = don't move)
  
  ; Name: openSell
  ; Parameters: %1 = vendor ID
  ;             %2 = vendor name
! ;             %3 = don't move (%_FALSE = it's okay to move, %_TRUE = don't move)
--- 98,105 ----
  ; Parameters: %1 = vendor ID
  ;             %2 = vendor name
! ;             %3 = don't move (#false = it's okay to move, #true = don't move)
  
  ; Name: openSell
  ; Parameters: %1 = vendor ID
  ;             %2 = vendor name
! ;             %3 = don't move (#false = it's okay to move, #true = don't move)

Index: subsTest0004.txt
===================================================================
RCS file: /cvsroot/codename-alex/QA/subsTest0004.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** subsTest0004.txt	21 Jan 2003 13:45:32 -0000	1.1
--- subsTest0004.txt	8 Mar 2003 21:08:53 -0000	1.2
***************
*** 30,37 ****
  	halt
  
! if %dontMoveCursor = %_FALSE
  {
  	display ok dontMoveCursor is off$$
! 		+ testing openBuy %vendorID %vendorName %_TRUE $
  		+ (character isn't allowed to move)$$
  		+ testing buy %itemTypeList %buyAmount 0$
--- 30,37 ----
  	halt
  
! if %dontMoveCursor = #false
  {
  	display ok dontMoveCursor is off$$
! 		+ testing openBuy %vendorID %vendorName #true $
  		+ (character isn't allowed to move)$$
  		+ testing buy %itemTypeList %buyAmount 0$
***************
*** 40,44 ****
  	if #contKind = %shopContKind
  		click 289 164 r
! 	call subs.txt openBuy %vendorID %vendorName %_TRUE
  	call subs.txt buy %itemTypeList %buyAmount 0
  	
--- 40,44 ----
  	if #contKind = %shopContKind
  		click 289 164 r
! 	call subs.txt openBuy %vendorID %vendorName #true
  	call subs.txt buy %itemTypeList %buyAmount 0
  	
***************
*** 48,52 ****
  		
  	display ok dontMoveCursor is off$$
! 		+ testing openBuy %vendorID %vendorName %_TRUE $
  		+ (character isn't allowed to move)$$
  		+ testing buy %itemTypeList %buyAmount 1$
--- 48,52 ----
  		
  	display ok dontMoveCursor is off$$
! 		+ testing openBuy %vendorID %vendorName #true $
  		+ (character isn't allowed to move)$$
  		+ testing buy %itemTypeList %buyAmount 1$
***************
*** 55,59 ****
  	if #contKind = %shopContKind
  		click 289 164 r
! 	call subs.txt openBuy %vendorID %vendorName %_TRUE
  	call subs.txt buy %itemTypeList %buyAmount 1
  	
--- 55,59 ----
  	if #contKind = %shopContKind
  		click 289 164 r
! 	call subs.txt openBuy %vendorID %vendorName #true
  	call subs.txt buy %itemTypeList %buyAmount 1
  	
***************
*** 62,66 ****
  		+ closedUnexpectedly: %closedUnexpectedly
  }
! if %dontMoveCursor = %_TRUE
  {
  	display ok dontMoveCursor is on$$
--- 62,66 ----
  		+ closedUnexpectedly: %closedUnexpectedly
  }
! if %dontMoveCursor = #true
  {
  	display ok dontMoveCursor is on$$
***************
*** 99,106 ****
  ; Parameters: %1 = vendor ID
  ;             %2 = vendor name
! ;             %3 = don't move (%_FALSE = it's okay to move, %_TRUE = don't move)
  
  ; Name: buy
  ; Parameters: %1 = item type list
  ;             %2 = amount (0 = all available)
! ;             %3 = stop after match (%_FALSE or %_TRUE)
--- 99,106 ----
  ; Parameters: %1 = vendor ID
  ;             %2 = vendor name
! ;             %3 = don't move (#false = it's okay to move, #true = don't move)
  
  ; Name: buy
  ; Parameters: %1 = item type list
  ;             %2 = amount (0 = all available)
! ;             %3 = stop after match (#false or #true)

Index: subsTest0005.txt
===================================================================
RCS file: /cvsroot/codename-alex/QA/subsTest0005.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** subsTest0005.txt	21 Jan 2003 13:45:32 -0000	1.1
--- subsTest0005.txt	8 Mar 2003 21:08:53 -0000	1.2
***************
*** 34,37 ****
  ; Parameters: %1 = Runebook ID
  ;             %2 = Rune number
! ;             %3 = bail on blocked (%_TRUE or %_FALSE )
  ;             %4 = Time between tries (wait units)
--- 34,37 ----
  ; Parameters: %1 = Runebook ID
  ;             %2 = Rune number
! ;             %3 = bail on blocked (#true or #false )
  ;             %4 = Time between tries (wait units)