[aaf-commits] AAF/test/com/ComModTestAAF/ModuleTests CAAFDescriptiveClipTest.cpp, 1.2, 1.3

[William D. <bmd...@us...>]

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

Modified Files:
	CAAFDescriptiveClipTest.cpp 
Log Message:
Finished test for new AAF v1.2 class

Index: CAAFDescriptiveClipTest.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/ComModTestAAF/ModuleTests/CAAFDescriptiveClipTest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CAAFDescriptiveClipTest.cpp	25 Jul 2006 19:15:27 -0000	1.2
--- CAAFDescriptiveClipTest.cpp	14 Aug 2006 18:30:54 -0000	1.3
***************
*** 43,47 ****
  
  
- #if 0
  aafUInt32 TestSourceTrackIDsVector[] = { 1, 3, 5, 7, 11 };
  const aafUInt32 TestSourceTrackIDsVectorSize = 5;
--- 43,46 ----
***************
*** 153,169 ****
      	// Get described slots - should not be present.
      	aafUInt32 size = 0;
!     	AAFRESULT hr = pDescClip->GetSourceTrackIDsSize( &size );
      	checkExpression( AAFRESULT_PROP_NOT_PRESENT == hr, AAFRESULT_TEST_FAILED );
      	
  	    // Set/Get single sourcetrack id
  	    aafUInt32 setSingleSourceTrackID = 0xdeadbeef;
! 	    checkResult( pDescClip->SetSourceTrackIDs( 1, &setSingleSourceTrackID ) );
  	    aafUInt32 getSingleSourceTrackID = 0;
  	    checkResult( pDescClip->GetSourceTrackIDs( 1, &getSingleSourceTrackID ) );
  	    checkExpression( setSingleSourceTrackID == getSingleSourceTrackID, AAFRESULT_TEST_FAILED );
  
  	    // Set the persistent described slots.
! 	    checkResult( pDescClip->SetSourceTrackIDs( TestSourceTrackIDsVectorSize, TestSourceTrackIDsVector ) );
! 		
  		aafUInt32 getSourceTrackIDsVector[TestSourceTrackIDsVectorSize];
  
--- 152,174 ----
      	// Get described slots - should not be present.
      	aafUInt32 size = 0;
!     	AAFRESULT hr = pDescClip->CountSourceTrackIDs( &size );
      	checkExpression( AAFRESULT_PROP_NOT_PRESENT == hr, AAFRESULT_TEST_FAILED );
      	
  	    // Set/Get single sourcetrack id
  	    aafUInt32 setSingleSourceTrackID = 0xdeadbeef;
! 	    checkResult( pDescClip->AddSourceTrackID( setSingleSourceTrackID ) );
  	    aafUInt32 getSingleSourceTrackID = 0;
  	    checkResult( pDescClip->GetSourceTrackIDs( 1, &getSingleSourceTrackID ) );
  	    checkExpression( setSingleSourceTrackID == getSingleSourceTrackID, AAFRESULT_TEST_FAILED );
  
+ 	    // Clear the ID set for the next test
+ 	    checkResult( pDescClip->RemoveSourceTrackID( setSingleSourceTrackID ) );
+ 
  	    // Set the persistent described slots.
! 	    for( aafUInt32 i_tid = 0; i_tid < TestSourceTrackIDsVectorSize; ++i_tid )
! 	    {
! 		    checkResult( pDescClip->AddSourceTrackID( TestSourceTrackIDsVector[i_tid] ) );
! 	    }
! 
  		aafUInt32 getSourceTrackIDsVector[TestSourceTrackIDsVectorSize];
  
***************
*** 271,275 ****
  			    aafUInt32 getSourceTrackIDsVectorSize = 0;
  			
! 			    checkResult( pDescClip->GetSourceTrackIDsSize( &getSourceTrackIDsVectorSize ) );
  			    checkExpression( TestSourceTrackIDsVectorSize == getSourceTrackIDsVectorSize, AAFRESULT_TEST_FAILED );
  			
--- 276,280 ----
  			    aafUInt32 getSourceTrackIDsVectorSize = 0;
  			
! 			    checkResult( pDescClip->CountSourceTrackIDs( &getSourceTrackIDsVectorSize ) );
  			    checkExpression( TestSourceTrackIDsVectorSize == getSourceTrackIDsVectorSize, AAFRESULT_TEST_FAILED );
  			
***************
*** 359,368 ****
  	return hr;
  }
- 
- #else
- extern "C" HRESULT CAAFDescriptiveClip_test(testMode_t mode)
- {	
- 	HRESULT hr = AAFRESULT_NOT_IMPLEMENTED;
- 	return hr;
- }
- #endif
--- 364,365 ----