[aaf-commits] AAF/test/com/XMLStoredFormat TestCharacter.cpp, 1.2, 1.3 TestEnum.cpp, 1.2, 1.3 TestExampleFiles.cpp, 1.2, 1.3 TestExtEnum.cpp, 1.2, 1.3 TestFixedArray.cpp, 1.2, 1.3 TestIndirect.cpp, 1.2, 1.3 TestInteger.cpp, 1.3, 1.4 TestOpaque.cpp, 1.2, 1.3 TestRecord.cpp, 1.2, 1.3 TestRename.cpp, 1.2, 1.3 TestSet.cpp, 1.2, 1.3 TestStream.cpp, 1.3, 1.4 TestString.cpp, 1.2, 1.3 TestVarArray.cpp, 1.2, 1.3 TestWeakRef.cpp, 1.2, 1.3 XMLStoredFormatTest.cpp, 1.3, 1.4 XMLStoredFormatTest.h, 1.2, 1.3

[Philip de N. <ph...@us...>]

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

Modified Files:
	TestCharacter.cpp TestEnum.cpp TestExampleFiles.cpp 
	TestExtEnum.cpp TestFixedArray.cpp TestIndirect.cpp 
	TestInteger.cpp TestOpaque.cpp TestRecord.cpp TestRename.cpp 
	TestSet.cpp TestStream.cpp TestString.cpp TestVarArray.cpp 
	TestWeakRef.cpp XMLStoredFormatTest.cpp XMLStoredFormatTest.h 
Log Message:
return 1 from test program when an unexpected failure occurs so that make check fails

Index: XMLStoredFormatTest.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/XMLStoredFormatTest.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XMLStoredFormatTest.cpp	1 Aug 2007 15:16:00 -0000	1.3
--- XMLStoredFormatTest.cpp	7 Aug 2007 17:19:32 -0000	1.4
***************
*** 273,278 ****
      CAAFInitialize aafInit;
  
!     bool result[15];
!     memset(result, false, sizeof(result));
      const char* tests[15] = 
      {
--- 273,278 ----
      CAAFInitialize aafInit;
  
!     int result[15];
!     memset(result, 0, sizeof(result));
      const char* tests[15] = 
      {
***************
*** 317,334 ****
  
      printf("\nResults summary:\n");
      for (unsigned int i = 0; i < sizeof(tests) / sizeof(char*); i++)
      {
          printf("  %s", tests[i]);
!         if (result[i])
          {
              printf("\t\tpassed\n");
          }
          else
          {
              printf("\t\tFAILED\n");
          }
      }
      
!     return 0;
  }
  
--- 317,340 ----
  
      printf("\nResults summary:\n");
+     bool passed = true;
      for (unsigned int i = 0; i < sizeof(tests) / sizeof(char*); i++)
      {
          printf("  %s", tests[i]);
!         if (result[i] == 0)
          {
              printf("\t\tpassed\n");
          }
+         else if (result[i] == 1)
+         {
+             printf("\t\tpassed (with known FAILURES)\n");
+         }
          else
          {
              printf("\t\tFAILED\n");
+             passed = false;
          }
      }
      
!     return passed ? 0 : 1;
  }
  

Index: TestVarArray.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/TestVarArray.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestVarArray.cpp	1 Aug 2007 15:16:00 -0000	1.2
--- TestVarArray.cpp	7 Aug 2007 17:19:32 -0000	1.3
***************
*** 365,369 ****
  
  
! bool testVarArray()
  {
      printf("Rule 5.14: VariableArray\n");
--- 365,369 ----
  
  
! int testVarArray()
  {
      printf("Rule 5.14: VariableArray\n");
***************
*** 391,395 ****
      printf("\n");
      
!     return passed;
  }
  
--- 391,395 ----
      printf("\n");
      
!     return passed ? 0 : 2;
  }
  

Index: TestInteger.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/TestInteger.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestInteger.cpp	1 Aug 2007 15:15:57 -0000	1.3
--- TestInteger.cpp	7 Aug 2007 17:19:31 -0000	1.4
***************
*** 566,570 ****
  
  
! bool testInteger()
  {
      printf("Rule 5.6: Integer\n");
--- 566,570 ----
  
  
! int testInteger()
  {
      printf("Rule 5.6: Integer\n");
***************
*** 592,596 ****
      printf("\n");
      
!     return passed;
  }
  
--- 592,596 ----
      printf("\n");
      
!     return passed ? 0 : 2;
  }
  

Index: TestSet.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/TestSet.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestSet.cpp	1 Aug 2007 15:15:59 -0000	1.2
--- TestSet.cpp	7 Aug 2007 17:19:32 -0000	1.3
***************
*** 261,265 ****
  
  
! bool testSet()
  {
      printf("Rule 5.10: Set\n");
--- 261,265 ----
  
  
! int testSet()
  {
      printf("Rule 5.10: Set\n");
***************
*** 287,291 ****
      printf("\n");
      
!     return passed;
  }
  
--- 287,291 ----
      printf("\n");
      
!     return passed ? 0 : 2;
  }
  

Index: TestWeakRef.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/TestWeakRef.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestWeakRef.cpp	1 Aug 2007 15:16:00 -0000	1.2
--- TestWeakRef.cpp	7 Aug 2007 17:19:32 -0000	1.3
***************
*** 507,511 ****
  
  
! bool testWeakRef()
  {
      printf("Rule 5.15: Weak Object Reference\n");
--- 507,511 ----
  
  
! int testWeakRef()
  {
      printf("Rule 5.15: Weak Object Reference\n");
***************
*** 533,537 ****
      printf("\n");
      
!     return passed;
  }
  
--- 533,537 ----
      printf("\n");
      
!     return passed ? 0 : 2;
  }
  

Index: TestExtEnum.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/TestExtEnum.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestExtEnum.cpp	1 Aug 2007 15:15:56 -0000	1.2
--- TestExtEnum.cpp	7 Aug 2007 17:19:31 -0000	1.3
***************
*** 275,279 ****
  
  
! bool testExtEnum()
  {
      printf("Rule 5.3: Extendible Enumeration\n");
--- 275,279 ----
  
  
! int testExtEnum()
  {
      printf("Rule 5.3: Extendible Enumeration\n");
***************
*** 287,291 ****
          printf("b) Roundtrip\n");
          printf("FAILED (not tested): Ext enums are not cloned properly - fix due for v1.2\n");
-         passed = false;
          //saveCopy(L"input/testExtEnum.xml", L"tmp.xml");
          //passed = testRestore(L"tmp.xml") && passed;
--- 287,290 ----
***************
*** 303,307 ****
      printf("\n");
      
!     return passed;
  }
  
--- 302,306 ----
      printf("\n");
      
!     return passed ? 1 : 2; // 1 -> known failures
  }
  

Index: TestString.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/TestString.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestString.cpp	1 Aug 2007 15:16:00 -0000	1.2
--- TestString.cpp	7 Aug 2007 17:19:32 -0000	1.3
***************
*** 265,269 ****
  
  
! bool testString()
  {
      printf("Rule 5.12: String\n");
--- 265,269 ----
  
  
! int testString()
  {
      printf("Rule 5.12: String\n");
***************
*** 291,295 ****
      printf("\n");
      
!     return passed;
  }
  
--- 291,295 ----
      printf("\n");
      
!     return passed ? 0 : 2;
  }
  

Index: TestExampleFiles.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/TestExampleFiles.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestExampleFiles.cpp	1 Aug 2007 15:15:56 -0000	1.2
--- TestExampleFiles.cpp	7 Aug 2007 17:19:31 -0000	1.3
***************
*** 27,31 ****
  
  
! bool testExampleFiles()
  {
      printf("\nExample Files:\n\n");
--- 27,31 ----
  
  
! int testExampleFiles()
  {
      printf("\nExample Files:\n\n");
***************
*** 89,93 ****
      printf("\n");
      
!     return passed;
  }
  
--- 89,93 ----
      printf("\n");
      
!     return passed ? 0 : 2;
  }
  

Index: TestCharacter.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/TestCharacter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestCharacter.cpp	1 Aug 2007 15:15:53 -0000	1.2
--- TestCharacter.cpp	7 Aug 2007 17:19:31 -0000	1.3
***************
*** 260,264 ****
  
  
! bool testCharacter()
  {
      printf("Rule 5.1: Character\n");
--- 260,264 ----
  
  
! int testCharacter()
  {
      printf("Rule 5.1: Character\n");
***************
*** 286,290 ****
      printf("\n");
      
!     return passed;
  }
  
--- 286,290 ----
      printf("\n");
      
!     return passed ? 0 : 2;
  }
  

Index: TestRecord.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/TestRecord.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestRecord.cpp	1 Aug 2007 15:15:58 -0000	1.2
--- TestRecord.cpp	7 Aug 2007 17:19:31 -0000	1.3
***************
*** 620,624 ****
  
  
! bool testRecord()
  {
      printf("Rule 5.8: Record\n");
--- 620,624 ----
  
  
! int testRecord()
  {
      printf("Rule 5.8: Record\n");
***************
*** 646,650 ****
      printf("\n");
      
!     return passed;
  }
  
--- 646,650 ----
      printf("\n");
      
!     return passed ? 0 : 2;
  }
  

Index: TestEnum.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/TestEnum.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestEnum.cpp	1 Aug 2007 15:15:56 -0000	1.2
--- TestEnum.cpp	7 Aug 2007 17:19:31 -0000	1.3
***************
*** 313,317 ****
  
  
! bool testEnum()
  {
      printf("Rule 5.2: Enumeration\n");
--- 313,317 ----
  
  
! int testEnum()
  {
      printf("Rule 5.2: Enumeration\n");
***************
*** 339,343 ****
      printf("\n");
      
!     return passed;
  }
  
--- 339,343 ----
      printf("\n");
      
!     return passed ? 0 : 2;
  }
  

Index: TestStream.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/TestStream.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestStream.cpp	1 Aug 2007 15:15:59 -0000	1.3
--- TestStream.cpp	7 Aug 2007 17:19:32 -0000	1.4
***************
*** 199,203 ****
  
  
! bool testStream()
  {
      printf("Rule 5.11: Stream\n");
--- 199,203 ----
  
  
! int testStream()
  {
      printf("Rule 5.11: Stream\n");
***************
*** 225,229 ****
      printf("\n");
      
!     return passed;
  }
  
--- 225,229 ----
      printf("\n");
      
!     return passed ? 0 : 2;
  }
  

Index: TestIndirect.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/TestIndirect.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestIndirect.cpp	1 Aug 2007 15:15:57 -0000	1.2
--- TestIndirect.cpp	7 Aug 2007 17:19:31 -0000	1.3
***************
*** 248,252 ****
  
  
! bool testIndirect()
  {
      printf("Rule 5.5: Indirect\n");
--- 248,252 ----
  
  
! int testIndirect()
  {
      printf("Rule 5.5: Indirect\n");
***************
*** 260,264 ****
          printf("b) Roundtrip\n");
          printf("FAILED (not tested): Type referenced in Indirect type value and no where else is not cloned - fix due for v1.2\n");
-         passed = false;
          //saveCopy(L"input/testIndirect.xml", L"tmp.xml");
          //passed = testRestore(L"tmp.xml") && passed;
--- 260,263 ----
***************
*** 276,280 ****
      printf("\n");
      
!     return passed;
  }
  
--- 275,279 ----
      printf("\n");
      
!     return passed ? 1 : 2; // 1 -> known failures
  }
  

Index: XMLStoredFormatTest.h
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/XMLStoredFormatTest.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** XMLStoredFormatTest.h	1 Aug 2007 15:16:01 -0000	1.2
--- XMLStoredFormatTest.h	7 Aug 2007 17:19:32 -0000	1.3
***************
*** 66,85 ****
  
  // the tests
! bool testCharacter();
! bool testEnum();
! bool testExtEnum();
! bool testFixedArray();
! bool testIndirect();
! bool testInteger();
! bool testOpaque();
! bool testRecord();
! bool testRename();
! bool testSet();
! bool testStream();
! bool testString();
! bool testVarArray();
! bool testWeakRef();
  
! bool testExampleFiles();
  
  #endif
--- 66,86 ----
  
  // the tests
! // returns 0 when passed, 1 when there are expected failures only, otherwise 2 when there are failures
! int testCharacter();
! int testEnum();
! int testExtEnum();
! int testFixedArray();
! int testIndirect();
! int testInteger();
! int testOpaque();
! int testRecord();
! int testRename();
! int testSet();
! int testStream();
! int testString();
! int testVarArray();
! int testWeakRef();
  
! int testExampleFiles();
  
  #endif

Index: TestFixedArray.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/TestFixedArray.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestFixedArray.cpp	1 Aug 2007 15:15:57 -0000	1.2
--- TestFixedArray.cpp	7 Aug 2007 17:19:31 -0000	1.3
***************
*** 197,201 ****
  
  
! bool testFixedArray()
  {
      printf("Rule 5.4: FixedArray\n");
--- 197,201 ----
  
  
! int testFixedArray()
  {
      printf("Rule 5.4: FixedArray\n");
***************
*** 223,227 ****
      printf("\n");
      
!     return passed;
  }
  
--- 223,227 ----
      printf("\n");
      
!     return passed ? 0 : 2;
  }
  

Index: TestRename.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/TestRename.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestRename.cpp	1 Aug 2007 15:15:58 -0000	1.2
--- TestRename.cpp	7 Aug 2007 17:19:31 -0000	1.3
***************
*** 192,196 ****
  
  
! bool testRename()
  {
      printf("Rule 5.9: Rename\n");
--- 192,196 ----
  
  
! int testRename()
  {
      printf("Rule 5.9: Rename\n");
***************
*** 218,222 ****
      printf("\n");
      
!     return passed;
  }
  
--- 218,222 ----
      printf("\n");
      
!     return passed ? 0 : 2;
  }
  

Index: TestOpaque.cpp
===================================================================
RCS file: /cvsroot/aaf/AAF/test/com/XMLStoredFormat/TestOpaque.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestOpaque.cpp	1 Aug 2007 15:15:58 -0000	1.2
--- TestOpaque.cpp	7 Aug 2007 17:19:31 -0000	1.3
***************
*** 199,203 ****
  
  
! bool testOpaque()
  {
      printf("Rule 5.7: Opaque\n");
--- 199,203 ----
  
  
! int testOpaque()
  {
      printf("Rule 5.7: Opaque\n");
***************
*** 225,229 ****
      printf("\n");
      
!     return passed;
  }
  
--- 225,229 ----
      printf("\n");
      
!     return passed ? 0 : 2;
  }