allow NULL_WAVE comparison

NULL_WAVE gets a non-zero binary flag to allow combination with other
binary operations like REQUIRE_WAVE(wv, NULL_WAVE | DOUBLE_WAVE) which
then fails if wv is a double wave.

NULL_WAVE=0x1000 was chosen to ensure enough space for further
WaveTypes() additions from upstream (WM).

Author: Matthias Kastner

procedures/unit-testing-comparators.ipf

@@ -480,22 +480,19 @@ static Function TEST_WAVE_WRAPPER(wv, majorType, flags, [minorType])
 
 	type2 = WaveType(wv, 2)
 	type1 = WaveType(wv, 1)
-	if(type1 == NULL_WAVE && type2 == NULL_WAVE)
-		type = NULL_WAVE
-	endif
 	if(type1 > 0 && type1 <= 4)
 		type = type | 2^(type1 - 1)
 	endif
 	if(type2 > 0 && type2 <= 2)
 		type = type | 2^(type2 + 3)
 	endif
 
-	if(majorType == NULL_WAVE)
-		result = type == majorType
-	else
-		result = (type & majorType) == majorType
+	if((type1 == 0 && type2 == 0) || !WaveExists(wv))
+		type = NULL_WAVE
 	endif
 
+	result = (type & majorType) == majorType
+
 	sprintf str, "Assumption that the wave's main type is %d", majorType
 	SetTestStatusAndDebug(str, result)
 

procedures/unit-testing-constants.ipf

@@ -32,7 +32,7 @@ Constant REQUIRE_MODE   = 0x07 // == OUTPUT_MESSAGE | INCREASE_ERROR | ABORT_FUN
 
 /// @addtogroup testWaveFlagsGeneral
 ///@{
-Constant NULL_WAVE       = 0x00
+Constant NULL_WAVE       = 0x1000
 ///@}
 
 /// @addtogroup testWaveFlagsMinor