Merge pull request #1475 from demergent-labs/multiple_deploy_tests

final StableBTreeMap tests
demergent-labs · Dec 8, 2023 · 8272114 · 8272114
2 parents 956c200 + dbf014f
commit 8272114
Show file tree

Hide file tree

Showing 42 changed files with 873 additions and 575 deletions.
diff --git a/property_tests/arbitraries/canister_arb.ts b/property_tests/arbitraries/canister_arb.ts
@@ -5,7 +5,7 @@ import { UpdateMethod } from './canister_methods/update_method_arb';
 
 export type Canister = {
     sourceCode: string;
-    tests: Test[];
+    tests: Test[][];
 };
 
 export type CanisterConfig = {
@@ -26,8 +26,28 @@ export function CanisterArb(configArb: fc.Arbitrary<CanisterConfig>) {
             config.globalDeclarations ?? [],
             canisterMethods
         );
-        const tests = canisterMethods.flatMap(
-            (canisterMethod) => canisterMethod.tests
+
+        const tests = canisterMethods.reduce(
+            (acc: Test[][], canisterMethod): Test[][] => {
+                if (canisterMethod.tests.length < acc.length) {
+                    return acc.map((accTests, index) => {
+                        return [
+                            ...accTests,
+                            ...(canisterMethod.tests[index] ?? [])
+                        ];
+                    });
+                } else {
+                    return canisterMethod.tests.map(
+                        (canisterMethodTests, index) => {
+                            return [
+                                ...(acc[index] ?? []),
+                                ...canisterMethodTests
+                            ];
+                        }
+                    );
+                }
+            },
+            []
         );
 
         return {

diff --git a/property_tests/arbitraries/canister_methods/index.ts b/property_tests/arbitraries/canister_methods/index.ts
@@ -33,7 +33,7 @@ export type TestsGenerator<
         ReturnTypeAgentArgumentValue,
         ReturnTypeAgentResponseValue
     >
-) => Test[];
+) => Test[][];
 
 export type CallbackLocation = 'INLINE' | 'STANDALONE';
 

diff --git a/property_tests/arbitraries/canister_methods/query_method_arb.ts b/property_tests/arbitraries/canister_methods/query_method_arb.ts
@@ -18,7 +18,7 @@ export type QueryMethod = {
     imports: Set<string>;
     globalDeclarations: string[];
     sourceCode: string;
-    tests: Test[];
+    tests: Test[][];
 };
 
 export function QueryMethodArb<

diff --git a/property_tests/arbitraries/canister_methods/update_method_arb.ts b/property_tests/arbitraries/canister_methods/update_method_arb.ts
@@ -19,7 +19,7 @@ export type UpdateMethod = {
     imports: Set<string>;
     globalDeclarations: string[];
     sourceCode: string;
-    tests: Test[];
+    tests: Test[][];
 };
 
 export function UpdateMethodArb<

diff --git a/property_tests/arbitraries/stable_b_tree_map_arb.ts b/property_tests/arbitraries/stable_b_tree_map_arb.ts
@@ -17,11 +17,19 @@ export const StableBTreeMapArb = fc
     .map(([keySample, valueSample, uniqueIdentifier, memoryId]) => {
         const name = `stableBTreeMap${uniqueIdentifier}`;
 
+        const imports = new Set([
+            ...keySample.src.imports,
+            ...valueSample.src.imports,
+            'stableJson',
+            'StableBTreeMap'
+        ]);
+
         return {
             name,
-            body: `let ${name} = StableBTreeMap<${keySample.src.candidTypeAnnotation}, ${valueSample.src.candidTypeAnnotation}>(stableJson, stableJson, ${memoryId});`,
-            param0: keySample,
-            param1: valueSample
+            imports,
+            definition: `let ${name} = StableBTreeMap<${keySample.src.candidTypeAnnotation}, ${valueSample.src.candidTypeAnnotation}>(stableJson, stableJson, ${memoryId});`,
+            keySample,
+            valueSample
         };
     });
 

diff --git a/property_tests/index.ts b/property_tests/index.ts
@@ -29,29 +29,37 @@ export function runPropTests(canisterArb: fc.Arbitrary<Canister>) {
                 stdio: 'inherit'
             });
 
-            execSync(`dfx deploy canister`, {
-                stdio: 'inherit'
-            });
+            for (let i = 0; i < canister.tests.length; i++) {
+                execSync(`dfx deploy canister`, {
+                    stdio: 'inherit'
+                });
 
-            execSync(`dfx generate canister`, {
-                stdio: 'inherit'
-            });
+                execSync(`dfx generate canister`, {
+                    stdio: 'inherit'
+                });
 
-            const result = await runTests(
-                canister.tests,
-                process.env.AZLE_PROPTEST_VERBOSE !== 'true'
-            );
+                const tests = canister.tests[i];
 
-            execSync(
-                `node_modules/.bin/tsc --noEmit --skipLibCheck --target es2020 --strict --moduleResolution node --allowJs`,
-                {
-                    stdio: 'inherit'
-                }
-            );
+                const result = await runTests(
+                    tests,
+                    process.env.AZLE_PROPTEST_VERBOSE !== 'true'
+                );
+
+                execSync(
+                    `node_modules/.bin/tsc --noEmit --skipLibCheck --target es2020 --strict --moduleResolution node --allowJs`,
+                    {
+                        stdio: 'inherit'
+                    }
+                );
 
-            clearUniquePrimitiveArb();
+                clearUniquePrimitiveArb();
+
+                if (result === false) {
+                    return false;
+                }
+            }
 
-            return result;
+            return true;
         }),
         {
             numRuns: Number(process.env.AZLE_PROPTEST_NUM_RUNS ?? 1),

diff --git a/property_tests/tests/blob/test/generate_tests.ts b/property_tests/tests/blob/test/generate_tests.ts
@@ -8,7 +8,7 @@ export function generateTests(
     functionName: string,
     paramBlobs: Named<CandidValueAndMeta<Uint8Array>>[],
     returnBlob: CandidValueAndMeta<Uint8Array>
-): Test[] {
+): Test[][] {
     const expectedResult = Uint8Array.from(
         paramBlobs
             .map((blob) => blob.el.agentResponseValue)
@@ -19,19 +19,21 @@ export function generateTests(
     );
 
     return [
-        {
-            name: `blob ${functionName}`,
-            test: async () => {
-                const actor = getActor('./tests/blob/test');
+        [
+            {
+                name: `blob ${functionName}`,
+                test: async () => {
+                    const actor = getActor('./tests/blob/test');
 
-                const result = await actor[functionName](
-                    ...paramBlobs.map((blob) => blob.el.agentArgumentValue)
-                );
+                    const result = await actor[functionName](
+                        ...paramBlobs.map((blob) => blob.el.agentArgumentValue)
+                    );
 
-                return {
-                    Ok: deepEqual(result, expectedResult)
-                };
+                    return {
+                        Ok: deepEqual(result, expectedResult)
+                    };
+                }
             }
-        }
+        ]
     ];
 }
diff --git a/property_tests/tests/bool/test/generate_tests.ts b/property_tests/tests/bool/test/generate_tests.ts
@@ -8,7 +8,7 @@ export function generateTests(
     functionName: string,
     namedParamBools: Named<CandidValueAndMeta<boolean>>[],
     returnBool: CandidValueAndMeta<boolean>
-): Test[] {
+): Test[][] {
     const expectedResult = namedParamBools.reduce(
         (acc, param) => acc && param.el.agentResponseValue,
         returnBool.agentResponseValue
@@ -18,17 +18,19 @@ export function generateTests(
     );
 
     return [
-        {
-            name: `bool ${functionName}`,
-            test: async () => {
-                const actor = getActor('./tests/bool/test');
+        [
+            {
+                name: `bool ${functionName}`,
+                test: async () => {
+                    const actor = getActor('./tests/bool/test');
 
-                const result = await actor[functionName](...paramValues);
+                    const result = await actor[functionName](...paramValues);
 
-                return {
-                    Ok: deepEqual(result, expectedResult)
-                };
+                    return {
+                        Ok: deepEqual(result, expectedResult)
+                    };
+                }
             }
-        }
+        ]
     ];
 }
diff --git a/property_tests/tests/float32/test/generate_tests.ts b/property_tests/tests/float32/test/generate_tests.ts
@@ -8,7 +8,7 @@ export function generateTests(
     functionName: string,
     namedParamFloat32s: Named<CandidValueAndMeta<number>>[],
     returnFloat32: CandidValueAndMeta<number>
-): Test[] {
+): Test[][] {
     const expectedResult =
         namedParamFloat32s.length === 0
             ? returnFloat32.agentResponseValue
@@ -17,17 +17,19 @@ export function generateTests(
         (paramFloats) => paramFloats.el.agentArgumentValue
     );
     return [
-        {
-            name: `float32 ${functionName}`,
-            test: async () => {
-                const actor = getActor('./tests/float32/test');
+        [
+            {
+                name: `float32 ${functionName}`,
+                test: async () => {
+                    const actor = getActor('./tests/float32/test');
 
-                const result = await actor[functionName](...paramValues);
+                    const result = await actor[functionName](...paramValues);
 
-                return {
-                    Ok: deepEqual(result, expectedResult)
-                };
+                    return {
+                        Ok: deepEqual(result, expectedResult)
+                    };
+                }
             }
-        }
+        ]
     ];
 }
diff --git a/property_tests/tests/float64/test/generate_tests.ts b/property_tests/tests/float64/test/generate_tests.ts
@@ -8,7 +8,7 @@ export function generateTests(
     functionName: string,
     namedParamFloat64s: Named<CandidValueAndMeta<number>>[],
     returnFloat64: CandidValueAndMeta<number>
-): Test[] {
+): Test[][] {
     const count = namedParamFloat64s.length + 1;
     const expectedResult =
         namedParamFloat64s.reduce(
@@ -21,17 +21,19 @@ export function generateTests(
     );
 
     return [
-        {
-            name: `float64 ${functionName}`,
-            test: async () => {
-                const actor = getActor('./tests/float64/test');
+        [
+            {
+                name: `float64 ${functionName}`,
+                test: async () => {
+                    const actor = getActor('./tests/float64/test');
 
-                const result = await actor[functionName](...paramValues);
+                    const result = await actor[functionName](...paramValues);
 
-                return {
-                    Ok: deepEqual(result, expectedResult)
-                };
+                    return {
+                        Ok: deepEqual(result, expectedResult)
+                    };
+                }
             }
-        }
+        ]
     ];
 }
diff --git a/property_tests/tests/func/test/generate_tests.ts b/property_tests/tests/func/test/generate_tests.ts
@@ -9,23 +9,25 @@ export function generateTests(
     functionName: string,
     namedParamFuncs: Named<CandidValueAndMeta<Func>>[],
     returnFunc: CandidValueAndMeta<Func>
-): Test[] {
+): Test[][] {
     return [
-        {
-            name: `func ${functionName}`,
-            test: async () => {
-                const actor = getActor('./tests/func/test');
+        [
+            {
+                name: `func ${functionName}`,
+                test: async () => {
+                    const actor = getActor('./tests/func/test');
 
-                const result = await actor[functionName](
-                    ...namedParamFuncs.map(
-                        (param) => param.el.agentArgumentValue
-                    )
-                );
+                    const result = await actor[functionName](
+                        ...namedParamFuncs.map(
+                            (param) => param.el.agentArgumentValue
+                        )
+                    );
 
-                return {
-                    Ok: deepEqual(result, returnFunc.agentResponseValue)
-                };
+                    return {
+                        Ok: deepEqual(result, returnFunc.agentResponseValue)
+                    };
+                }
             }
-        }
+        ]
     ];
 }
diff --git a/property_tests/tests/int/test/generate_tests.ts b/property_tests/tests/int/test/generate_tests.ts
@@ -8,7 +8,7 @@ export function generateTests(
     functionName: string,
     namedParamInts: Named<CandidValueAndMeta<bigint>>[],
     returnInt: CandidValueAndMeta<bigint>
-): Test[] {
+): Test[][] {
     const expectedResult = namedParamInts.reduce(
         (acc, param) => acc + param.el.agentResponseValue,
         returnInt.agentResponseValue
@@ -18,17 +18,19 @@ export function generateTests(
     );
 
     return [
-        {
-            name: `int ${functionName}`,
-            test: async () => {
-                const actor = getActor('./tests/int/test');
+        [
+            {
+                name: `int ${functionName}`,
+                test: async () => {
+                    const actor = getActor('./tests/int/test');
 
-                const result = await actor[functionName](...paramValues);
+                    const result = await actor[functionName](...paramValues);
 
-                return {
-                    Ok: deepEqual(result, expectedResult)
-                };
+                    return {
+                        Ok: deepEqual(result, expectedResult)
+                    };
+                }
             }
-        }
+        ]
     ];
 }