update examples

demergent-labs · May 21, 2024 · 71669cc · 71669cc
1 parent f40670f
commit 71669cc
Show file tree

Hide file tree

Showing 9 changed files with 212 additions and 256 deletions.
diff --git a/examples/apollo_server/test/tests.ts b/examples/apollo_server/test/tests.ts
@@ -1,7 +1,7 @@
 import * as dns from 'node:dns';
 dns.setDefaultResultOrder('ipv4first');
 
-import { Test } from 'azle/test';
+import { equals, Test } from 'azle/test';
 
 export function getTests(canisterId: string): Test[] {
     const origin = `http://${canisterId}.localhost:8000`;
@@ -11,6 +11,14 @@ export function getTests(canisterId: string): Test[] {
             name: 'query books',
             test: async () => {
                 try {
+                    const expectedResult = {
+                        data: {
+                            books: [
+                                { id: '0', title: 'The Awakening' },
+                                { id: '1', title: 'City of Glass' }
+                            ]
+                        }
+                    };
                     const response = await fetch(origin, {
                         method: 'POST',
                         headers: [['Content-Type', 'application/json']],
@@ -26,12 +34,7 @@ export function getTests(canisterId: string): Test[] {
                         })
                     });
                     const responseJson = await response.json();
-
-                    return {
-                        Ok:
-                            responseJson.data.books.length === 2 &&
-                            responseJson.data.books[0].title === 'The Awakening'
-                    };
+                    return equals(expectedResult, responseJson);
                 } catch (error: any) {
                     return {
                         Err: error
@@ -43,6 +46,9 @@ export function getTests(canisterId: string): Test[] {
             name: 'query authors',
             test: async () => {
                 try {
+                    const expectedResult = {
+                        data: { authors: [{ name: 'Jordan' }, { name: 'Ben' }] }
+                    };
                     const response = await fetch(origin, {
                         method: 'POST',
                         headers: [['Content-Type', 'application/json']],
@@ -58,11 +64,7 @@ export function getTests(canisterId: string): Test[] {
                     });
                     const responseJson = await response.json();
 
-                    return {
-                        Ok:
-                            responseJson.data.authors.length === 2 &&
-                            responseJson.data.authors[0].name === 'Jordan'
-                    };
+                    return equals(expectedResult, responseJson);
                 } catch (error: any) {
                     return {
                         Err: error

diff --git a/examples/async_await/test/tests.ts b/examples/async_await/test/tests.ts
@@ -1,5 +1,5 @@
 import { ActorSubclass } from '@dfinity/agent';
-import { Test } from 'azle/test';
+import { equals, Test } from 'azle/test';
 
 import { _SERVICE } from './dfx_generated/async_await/async_await.did';
 
@@ -13,9 +13,11 @@ export function get_tests(
                 const result =
                     await async_await_canister.getRandomnessDirectly();
 
-                return {
-                    Ok: result.length === 32
-                };
+                const expectedLen = 32;
+
+                return equals(result.length, expectedLen, {
+                    errMessage: `Expected ${expectedLen} bytes of randomness; received ${result.length}`
+                });
             }
         },
         {
@@ -24,9 +26,11 @@ export function get_tests(
                 const result =
                     await async_await_canister.getRandomnessIndirectly();
 
-                return {
-                    Ok: result.length === 32
-                };
+                const expectedLen = 32;
+
+                return equals(result.length, expectedLen, {
+                    errMessage: `Expected ${expectedLen} bytes of randomness; received ${result.length}`
+                });
             }
         },
         {
@@ -35,19 +39,19 @@ export function get_tests(
                 const result =
                     await async_await_canister.getRandomnessSuperIndirectly();
 
-                return {
-                    Ok: result.length === 96
-                };
+                const expectedLen = 96;
+
+                return equals(result.length, expectedLen, {
+                    errMessage: `Expected ${expectedLen} bytes of randomness; received ${result.length}`
+                });
             }
         },
         {
             name: 'return promise void',
             test: async () => {
                 const result = await async_await_canister.returnPromiseVoid();
 
-                return {
-                    Ok: result === undefined
-                };
+                return equals(result, undefined);
             }
         }
     ];

diff --git a/examples/audio_and_video/test/tests.ts b/examples/audio_and_video/test/tests.ts
@@ -1,7 +1,7 @@
 import * as dns from 'node:dns';
 dns.setDefaultResultOrder('ipv4first');
 
-import { Test } from 'azle/test';
+import { equals, fail, failWithMessage, Test } from 'azle/test';
 import { createHash } from 'crypto';
 import { readFileSync } from 'fs';
 
@@ -55,9 +55,7 @@ export function getTests(canisterId: string): Test[] {
                                     }`;
 
                             if (finalResult === false) {
-                                return {
-                                    Ok: false
-                                };
+                                return fail();
                             }
                         }
                     }
@@ -70,13 +68,9 @@ export function getTests(canisterId: string): Test[] {
                     rangedFileHasher.update(file);
                     const rangedFileDigest = rangedFileHasher.digest('hex');
 
-                    return {
-                        Ok: fileDigest === rangedFileDigest
-                    };
+                    return equals(rangedFileDigest, fileDigest);
                 } catch (error: any) {
-                    return {
-                        Err: error
-                    };
+                    return failWithMessage(error);
                 }
             }
         },
@@ -126,9 +120,7 @@ export function getTests(canisterId: string): Test[] {
                                     }`;
 
                             if (finalResult === false) {
-                                return {
-                                    Ok: false
-                                };
+                                return fail();
                             }
                         }
                     }
@@ -141,13 +133,9 @@ export function getTests(canisterId: string): Test[] {
                     rangedFileHasher.update(file);
                     const rangedFileDigest = rangedFileHasher.digest('hex');
 
-                    return {
-                        Ok: fileDigest === rangedFileDigest
-                    };
+                    return equals(rangedFileDigest, fileDigest);
                 } catch (error: any) {
-                    return {
-                        Err: error
-                    };
+                    return failWithMessage(error);
                 }
             }
         }