[aaf-commits] AAF/test/com/ComModTestAAF/ModuleTests CAAFAES3PCMDescriptorTest.cpp, 1.5, 1.6

[William J. S. Ph.D. <ws...@us...>]

Update of /cvsroot/aaf/AAF/test/com/ComModTestAAF/ModuleTests
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17561/test/com/ComModTestAAF/ModuleTests

Modified Files:
	CAAFAES3PCMDescriptorTest.cpp 
Log Message:
adds OMtype base class

Index: CAAFAES3PCMDescriptorTest.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/ComModTestAAF/ModuleTests/CAAFAES3PCMDescriptorTest.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CAAFAES3PCMDescriptorTest.cpp	18 Jan 2007 21:19:42 -0000	1.5
--- CAAFAES3PCMDescriptorTest.cpp	6 Feb 2007 15:46:19 -0000	1.6
***************
*** 189,194 ****
  									  (void **) &pSoundDesc);
  
- 		checkResult(pFile->Save());
- 
  		// test initialization
  		AAFRESULT res = pAES3PCMDesc2->SetEmphasis(kAAFEmphasis_Unknown);
--- 189,192 ----
***************
*** 310,318 ****
  							fixedUserData));
  		}
! 		//TestArrayBasedStuff(channelCount, pAES3PCMDesc2);
  
  
  
! 		//checkResult(pFile->Save());
  		pAES3PCMDesc2->Release();
  		pAES3PCMDesc2 = NULL;
--- 308,316 ----
  							fixedUserData));
  		}
! 		TestArrayBasedStuff(channelCount, pAES3PCMDesc2);
  
  
  
! 		checkResult(pFile->Save());
  		pAES3PCMDesc2->Release();
  		pAES3PCMDesc2 = NULL;
***************
*** 422,451 ****
  
  
! 			//// test emphasis
! 			//aafEmphasisType_t emphasisType = kAAFEmphasis_Unknown;
! 			//checkResult(pAES3PCMDesc2->GetEmphasis(&emphasisType));
! 			//checkExpression((emphasisType == kAAFEmphasis_ITU), 
! 			//				AAFRESULT_TEST_FAILED);
  
! 			//// test blockStartOffset
! 			//aafUInt16 blockStartOffset = 0;
! 			//checkResult(pAES3PCMDesc2->GetBlockStartOffset(&blockStartOffset));
! 			//checkExpression((blockStartOffset == 65535), 
! 			//				AAFRESULT_TEST_FAILED);
  
! 			//// test auxBitsMode
! 			//aafAuxBitsModeType_t auxBitsMode = kAAFAuxBitsMode_NotDefined;
! 			//checkResult(pAES3PCMDesc2->GetAuxBitsMode(&auxBitsMode));
! 			//checkExpression(auxBitsMode == kAAFAuxBitsMode_Reserved3,
! 			//				AAFRESULT_TEST_FAILED);
  
! 			//// now test array based stuff
! 			//IAAFSoundDescriptor *pSoundDesc = NULL;
! 			//pAES3PCMDesc2->QueryInterface(IID_IAAFSoundDescriptor,
! 			//							  (void **) &pSoundDesc);
! 			//aafUInt32 channelCount = 0;
! 			//checkResult(pSoundDesc->GetChannelCount(&channelCount));
! 			//checkExpression(channelCount == 4, AAFRESULT_TEST_FAILED);
! 			//hr = TestArrayBasedStuff(channelCount, pAES3PCMDesc2);
  		}
      }
--- 420,449 ----
  
  
! 			// test emphasis
! 			aafEmphasisType_t emphasisType = kAAFEmphasis_Unknown;
! 			checkResult(pAES3PCMDesc2->GetEmphasis(&emphasisType));
! 			checkExpression((emphasisType == kAAFEmphasis_ITU), 
! 							AAFRESULT_TEST_FAILED);
  
! 			// test blockStartOffset
! 			aafUInt16 blockStartOffset = 0;
! 			checkResult(pAES3PCMDesc2->GetBlockStartOffset(&blockStartOffset));
! 			checkExpression((blockStartOffset == 65535), 
! 							AAFRESULT_TEST_FAILED);
  
! 			// test auxBitsMode
! 			aafAuxBitsModeType_t auxBitsMode = kAAFAuxBitsMode_NotDefined;
! 			checkResult(pAES3PCMDesc2->GetAuxBitsMode(&auxBitsMode));
! 			checkExpression(auxBitsMode == kAAFAuxBitsMode_Reserved3,
! 							AAFRESULT_TEST_FAILED);
  
! 			// now test array based stuff
! 			IAAFSoundDescriptor *pSoundDesc = NULL;
! 			pAES3PCMDesc2->QueryInterface(IID_IAAFSoundDescriptor,
! 										  (void **) &pSoundDesc);
! 			aafUInt32 channelCount = 0;
! 			checkResult(pSoundDesc->GetChannelCount(&channelCount));
! 			checkExpression(channelCount == 4, AAFRESULT_TEST_FAILED);
! 			hr = TestArrayBasedStuff(channelCount, pAES3PCMDesc2);
  		}
      }