commit 0fb6c6d6d64436278eab9b61dda465913854489b
author Laurence Lundblade <lgl@island-resort.com> Fri Oct 12 22:02:05 2018 +0800
committer Laurence Lundblade <lgl@island-resort.com> Fri Oct 12 22:02:05 2018 +0800
tree 88e0f64a74ae0e7b998b2c86c531c3f803fc1c58
parent 4d1ecba76edd2a5417ef1a896fbc4144143d5dd0

all tests seem to be integrated and working

test/qcbor_encode_tests.c

diff --git a/test/qcbor_encode_tests.c b/test/qcbor_encode_tests.c
index ae94a7f..3636ba4 100644
--- a/test/qcbor_encode_tests.c
+++ b/test/qcbor_encode_tests.c
@@ -80,7 +80,6 @@
    fflush(stdout);
 }
 
-#endif
 
 #include <stdio.h>
 
@@ -95,13 +94,15 @@
    return 0;
    
 }
+#endif
 
 
-/*#define CheckResults(Enc, Expected) \
-   UsefulBuf_Compare(Enc, (UsefulBufC){Expected, sizeof(Expected)}) */
 
 #define CheckResults(Enc, Expected) \
-   Compare(Enc, (UsefulBufC){Expected, sizeof(Expected)})
+   UsefulBuf_Compare(Enc, (UsefulBufC){Expected, sizeof(Expected)})
+
+//#define CheckResults(Enc, Expected) \
+//   Compare(Enc, (UsefulBufC){Expected, sizeof(Expected)})
 
 
 
@@ -899,7 +900,6 @@
    }
    size_t nEncodedLen;
    if(QCBOREncode_Finish(&ECtx, &nEncodedLen)) {
-      printf("ArrayNestingTest1 Failed\n");
       nReturn = -1;
    }
    //printencoded(pEncoded, nEncodedLen);
@@ -958,43 +958,9 @@
    return(nReturn);
 }
 
-#if 0
-
 
 static uint8_t s_pFiveArrarys[] = {0x81, 0x81, 0x81, 0x81, 0x80};
 
-static int EncodeRaw(uint8_t **pEncoded, size_t *pEncodedLen)
-{
-   QCBOREncodeContext ECtx;
-   int nReturn = -1;
-   
-   *pEncoded = NULL;
-   *pEncodedLen = INT32_MAX; // largest buffer this CBOR implementation will deal with
-   
-   // loop runs CBOR encoding twice. First with no buffer to
-   // calucate the length so buffer can be allocated correctly,
-   // and last with the buffer to do the actual encoding
-   do {
-      QCBOREncode_Init(&ECtx, *pEncoded, *pEncodedLen);
-      QCBOREncode_OpenArray(&ECtx);
-      QCBOREncode_AddRaw(&ECtx, (EncodedCBORC){((UsefulBufC) {s_pFiveArrarys, 5}), 1});
-      QCBOREncode_AddRaw(&ECtx, (EncodedCBORC){((UsefulBufC) {pExpectedEncodedInts, sizeof(pExpectedEncodedInts)}), 1});
-      QCBOREncode_CloseArray(&ECtx);
-      
-      if(QCBOREncode_Finish(&ECtx, pEncodedLen))
-         goto Done;
-      if(*pEncoded != NULL) {
-         nReturn = 0;
-         goto Done;
-      }
-      *pEncoded = malloc(*pEncodedLen);
-   } while(1);
-   
-Done:
-   return(nReturn);
-}
-
-
 // Validated at http://cbor.me and by manually examining its output
 static uint8_t s_pEncodeRawExpected[] = {
    0x82, 0x81, 0x81, 0x81, 0x81, 0x80, 0x98, 0x2f,
@@ -1023,26 +989,31 @@
    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
 
-
 int EncodeRawTest()
 {
-   uint8_t *pEncodedRaw;
-   size_t nEncodedRawLen;
+   UsefulBuf_MakeStackUB(RawTestStorage, 220);
    
-   if(EncodeRaw(&pEncodedRaw, &nEncodedRawLen)) {
-      return(-1);
+   QCBOREncodeContext ECtx;
+
+   QCBOREncode_Init(&ECtx, RawTestStorage);
+   QCBOREncode_OpenArray(&ECtx);
+   QCBOREncode_AddEncoded(&ECtx, UsefulBuf_FromByteArrayLiteral(s_pFiveArrarys));
+   QCBOREncode_AddEncoded(&ECtx, UsefulBuf_FromByteArrayLiteral(pExpectedEncodedInts));
+   QCBOREncode_CloseArray(&ECtx);
+   
+   UsefulBufC EncodedRawTest;
+   
+   if(QCBOREncode_Finish2(&ECtx, &EncodedRawTest)) {
+      return -4;
    }
    
-   //printencoded(pEncodedRaw, nEncodedRawLen);
+   if(UsefulBuf_Compare(EncodedRawTest, UsefulBuf_FromByteArrayLiteral(s_pEncodeRawExpected))) {
+      return -5;
+   }
    
-  int nReturn = 0;
-  if(nEncodedRawLen != sizeof(s_pEncodeRawExpected) ||  memcmp(s_pEncodeRawExpected, pEncodedRaw, sizeof(s_pEncodeRawExpected)))
-      nReturn = 1;
-   
-   return(nReturn);
+   return 0;
 }
 
-#endif