Merge pull request #34 from ukos-git/fix/null_wave_comparison

Null Wave comparison

Author: t-b

internal_dev/TestWaveType.ipf

@@ -4,7 +4,7 @@
 #include "unit-testing"
 
 Function run_IGNORE()
-	RunTest("TestWaveType.ipf", name="Test different Wave Types", testCase="testWaveTypes")
+	RunTest("TestWaveType.ipf", name="Test different Wave Types", testCase="testWaveTypes;testNullType")
 End
 
 Function testWaveTypes()
@@ -19,10 +19,18 @@ Function testWaveTypes()
 
 	Make/O/U/I root:wv2/WAVE=wv2
 	CHECK_WAVE(wv2, NORMAL_WAVE | NUMERIC_WAVE, minorType = UNSIGNED_WAVE | INT32_WAVE)
-	CHECK_WAVE(wv2, FREE_WAVE | NUMERIC_WAVE, minorType = UNSIGNED_WAVE | INT32_WAVE) // ! not a free wave
+	WARN_WAVE(wv2, FREE_WAVE | NUMERIC_WAVE, minorType = UNSIGNED_WAVE | INT32_WAVE) // !fails: not a free wave
 End
 
-Function checkWaveType()
+Function testNullType()
+	WAVE/Z wv
+	REQUIRE_WAVE(wv, NULL_WAVE)
+
+	Make/FREE wv
+	WARN_WAVE(wv, NULL_WAVE) // !fails: not a null wave
+End
+
+Function checkWaveType_IGNORE()
 	WAVE/Z wv
 	printWaveType(wv)
 

internal_dev/TestWaveType.pxp

@@ -480,15 +480,17 @@ 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((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

procedures/unit-testing-comparators.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