@alloy-js/python 0.5.0-dev.0 → 0.5.0-dev.2

package/dist/dev/test/classdeclarations.test.js

@@ -1,96 +1,165 @@
 import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/core/jsx-runtime";
 import { memberRefkey, namekey, refkey } from "@alloy-js/core";
-import { d } from "@alloy-js/core/testing";
 import { describe, expect, it } from "vitest";
 import * as py from "../src/index.js";
-import { assertFileContents, toSourceText, toSourceTextMultiple } from "./utils.js";
+import { TestOutput, TestOutputDirectory } from "./utils.js";
 describe("Python Class", () => {
-  it("renders a class with no body as 'pass'", () => {
-    const result = toSourceText([_$createComponent(py.ClassDeclaration, {
-      name: "Foo"
+  it("renders class-level decorators above `class`", () => {
+    expect(_$createComponent(TestOutput, {
+      get children() {
+        return _$createComponent(py.ClassDeclaration, {
+          name: "Foo",
+          decorators: ["@final", "@deprecated('use Bar')"]
+        }, {
+          fileName: import.meta.url,
+          lineNumber: 10,
+          columnNumber: 9
+        });
+      }
     }, {
       fileName: import.meta.url,
-      lineNumber: 13,
-      columnNumber: 34
-    })]);
-    expect(result).toRenderTo(d`
+      lineNumber: 9,
+      columnNumber: 7
+    })).toRenderTo(`
+      @final
+      @deprecated('use Bar')
       class Foo:
           pass
 
-
     `);
   });
-  it("takes a namekey", () => {
-    const result = toSourceText([_$createComponent(py.ClassDeclaration, {
-      get name() {
-        return namekey("Foo");
+  it("renders nothing extra when decorators is undefined", () => {
+    expect(_$createComponent(TestOutput, {
+      get children() {
+        return _$createComponent(py.ClassDeclaration, {
+          name: "Foo"
+        }, {
+          fileName: import.meta.url,
+          lineNumber: 29,
+          columnNumber: 9
+        });
       }
     }, {
       fileName: import.meta.url,
-      lineNumber: 24,
+      lineNumber: 28,
       columnNumber: 7
-    })]);
-    expect(result).toRenderTo(d`
+    })).toRenderTo(`
       class Foo:
           pass
 
-
     `);
   });
-  it("renders a class with a body", () => {
-    const result = toSourceText([_$createComponent(py.ClassDeclaration, {
-      name: "Bar",
-      children: "print('hi')"
+  it("renders a class with no body as 'pass'", () => {
+    expect(_$createComponent(TestOutput, {
+      get children() {
+        return _$createComponent(py.ClassDeclaration, {
+          name: "Foo"
+        }, {
+          fileName: import.meta.url,
+          lineNumber: 43,
+          columnNumber: 9
+        });
+      }
     }, {
       fileName: import.meta.url,
-      lineNumber: 36,
+      lineNumber: 42,
       columnNumber: 7
-    })]);
-    expect(result).toRenderTo(d`
-      class Bar:
-          print('hi')
-
+    })).toRenderTo(`
+      class Foo:
+          pass
 
     `);
   });
-  it("renders a class with base classes", () => {
-    const result = toSourceText([_$createComponent(py.StatementList, {
+  it("takes a namekey", () => {
+    expect(_$createComponent(TestOutput, {
       get children() {
-        return [_$createComponent(py.ClassDeclaration, {
-          name: "Base1",
-          get refkey() {
-            return refkey("Base1");
+        return _$createComponent(py.ClassDeclaration, {
+          get name() {
+            return namekey("Foo");
           }
         }, {
           fileName: import.meta.url,
-          lineNumber: 49,
+          lineNumber: 57,
           columnNumber: 9
-        }), _$createComponent(py.ClassDeclaration, {
-          name: "Base2",
-          get refkey() {
-            return refkey("Base2");
-          }
+        });
+      }
+    }, {
+      fileName: import.meta.url,
+      lineNumber: 56,
+      columnNumber: 7
+    })).toRenderTo(`
+      class Foo:
+          pass
+
+    `);
+  });
+  it("renders a class with a body", () => {
+    expect(_$createComponent(TestOutput, {
+      get children() {
+        return _$createComponent(py.ClassDeclaration, {
+          name: "Bar",
+          children: "print('hi')"
         }, {
           fileName: import.meta.url,
-          lineNumber: 50,
+          lineNumber: 71,
           columnNumber: 9
-        }), _$createComponent(py.ClassDeclaration, {
-          name: "Baz",
-          get bases() {
-            return [refkey("Base1"), refkey("Base2")];
+        });
+      }
+    }, {
+      fileName: import.meta.url,
+      lineNumber: 70,
+      columnNumber: 7
+    })).toRenderTo(`
+      class Bar:
+          print('hi')
+
+    `);
+  });
+  it("renders a class with base classes", () => {
+    expect(_$createComponent(TestOutput, {
+      get children() {
+        return _$createComponent(py.StatementList, {
+          get children() {
+            return [_$createComponent(py.ClassDeclaration, {
+              name: "Base1",
+              get refkey() {
+                return refkey("Base1");
+              }
+            }, {
+              fileName: import.meta.url,
+              lineNumber: 86,
+              columnNumber: 11
+            }), _$createComponent(py.ClassDeclaration, {
+              name: "Base2",
+              get refkey() {
+                return refkey("Base2");
+              }
+            }, {
+              fileName: import.meta.url,
+              lineNumber: 87,
+              columnNumber: 11
+            }), _$createComponent(py.ClassDeclaration, {
+              name: "Baz",
+              get bases() {
+                return [refkey("Base1"), refkey("Base2")];
+              }
+            }, {
+              fileName: import.meta.url,
+              lineNumber: 88,
+              columnNumber: 11
+            })];
           }
         }, {
           fileName: import.meta.url,
-          lineNumber: 51,
+          lineNumber: 85,
           columnNumber: 9
-        })];
+        });
       }
     }, {
       fileName: import.meta.url,
-      lineNumber: 48,
+      lineNumber: 84,
       columnNumber: 7
-    })]);
-    const expected = d`
+    })).toRenderTo(`
       class Base1:
           pass
 
@@ -100,175 +169,183 @@ describe("Python Class", () => {
       class Baz(Base1, Base2):
           pass
 
-        
-    `;
-    expect(result).toRenderTo(expected);
+    `);
   });
   it("renders a class with base classes and body", () => {
-    const result = toSourceText([_$createComponent(py.ClassDeclaration, {
-      name: "Qux",
-      bases: ["Base"],
-      children: "print('hello')"
+    expect(_$createComponent(TestOutput, {
+      get children() {
+        return _$createComponent(py.ClassDeclaration, {
+          name: "Qux",
+          bases: ["Base"],
+          children: "print('hello')"
+        }, {
+          fileName: import.meta.url,
+          lineNumber: 112,
+          columnNumber: 9
+        });
+      }
     }, {
       fileName: import.meta.url,
-      lineNumber: 74,
+      lineNumber: 111,
       columnNumber: 7
-    })]);
-    expect(result).toRenderTo(d`
+    })).toRenderTo(`
       class Qux(Base):
           print('hello')
 
-
     `);
   });
   it("renders classes across modules with inheritance", () => {
-    const result = toSourceTextMultiple([_$createComponent(py.SourceFile, {
-      path: "mod1.py",
+    expect(_$createComponent(TestOutputDirectory, {
       get children() {
-        return _$createComponent(py.ClassDeclaration, {
-          name: "A",
-          get refkey() {
-            return refkey("A");
+        return [_$createComponent(py.SourceFile, {
+          path: "mod1.py",
+          get children() {
+            return _$createComponent(py.ClassDeclaration, {
+              name: "A",
+              get refkey() {
+                return refkey("A");
+              }
+            }, {
+              fileName: import.meta.url,
+              lineNumber: 129,
+              columnNumber: 11
+            });
           }
         }, {
           fileName: import.meta.url,
-          lineNumber: 89,
+          lineNumber: 128,
           columnNumber: 9
-        });
-      }
-    }, {
-      fileName: import.meta.url,
-      lineNumber: 88,
-      columnNumber: 7
-    }), _$createComponent(py.SourceFile, {
-      path: "folder/mod2.py",
-      get children() {
-        return _$createComponent(py.ClassDeclaration, {
-          name: "B",
-          get refkey() {
-            return refkey("B");
-          },
-          get bases() {
-            return [refkey("A")];
+        }), _$createComponent(py.SourceFile, {
+          path: "folder/mod2.py",
+          get children() {
+            return _$createComponent(py.ClassDeclaration, {
+              name: "B",
+              get refkey() {
+                return refkey("B");
+              },
+              get bases() {
+                return [refkey("A")];
+              }
+            }, {
+              fileName: import.meta.url,
+              lineNumber: 132,
+              columnNumber: 11
+            });
           }
         }, {
           fileName: import.meta.url,
-          lineNumber: 92,
+          lineNumber: 131,
           columnNumber: 9
-        });
-      }
-    }, {
-      fileName: import.meta.url,
-      lineNumber: 91,
-      columnNumber: 7
-    }), _$createComponent(py.SourceFile, {
-      path: "mod3.py",
-      get children() {
-        return _$createComponent(py.ClassDeclaration, {
-          name: "C",
-          get bases() {
-            return [refkey("B")];
+        }), _$createComponent(py.SourceFile, {
+          path: "mod3.py",
+          get children() {
+            return _$createComponent(py.ClassDeclaration, {
+              name: "C",
+              get bases() {
+                return [refkey("B")];
+              }
+            }, {
+              fileName: import.meta.url,
+              lineNumber: 139,
+              columnNumber: 11
+            });
           }
         }, {
           fileName: import.meta.url,
-          lineNumber: 99,
+          lineNumber: 138,
           columnNumber: 9
-        });
+        })];
       }
     }, {
       fileName: import.meta.url,
-      lineNumber: 98,
+      lineNumber: 127,
       columnNumber: 7
-    })]);
-    const mod1Expected = d`
-      class A:
-          pass
-
-
-    `;
-    const mod2Expected = d`
-      from mod1 import A
+    })).toRenderTo({
+      "mod1.py": `
+          class A:
+              pass
 
+        `,
+      "folder/mod2.py": `
+          from mod1 import A
 
-      class B(A):
-          pass
 
+          class B(A):
+              pass
 
-    `;
-    const mod3Expected = d`
-      from folder.mod2 import B
-
+        `,
+      "mod3.py": `
+          from folder.mod2 import B
 
-      class C(B):
-          pass
 
+          class C(B):
+              pass
 
-    `;
-    assertFileContents(result, {
-      "mod1.py": mod1Expected
-    });
-    assertFileContents(result, {
-      "folder/mod2.py": mod2Expected
-    });
-    assertFileContents(result, {
-      "mod3.py": mod3Expected
+        `
     });
   });
   it("renders a class with class variables like foo: str, and also bar: A where A is another class", () => {
-    const result = toSourceText([_$createComponent(py.StatementList, {
+    expect(_$createComponent(TestOutput, {
       get children() {
-        return [_$createComponent(py.ClassDeclaration, {
-          name: "A",
-          get refkey() {
-            return refkey("A");
-          }
-        }, {
-          fileName: import.meta.url,
-          lineNumber: 134,
-          columnNumber: 9
-        }), _$createComponent(py.ClassDeclaration, {
-          name: "B",
+        return _$createComponent(py.StatementList, {
           get children() {
-            return _$createComponent(py.StatementList, {
+            return [_$createComponent(py.ClassDeclaration, {
+              name: "A",
+              get refkey() {
+                return refkey("A");
+              }
+            }, {
+              fileName: import.meta.url,
+              lineNumber: 171,
+              columnNumber: 11
+            }), _$createComponent(py.ClassDeclaration, {
+              name: "B",
               get children() {
-                return [_$createComponent(py.VariableDeclaration, {
-                  name: "bar",
-                  get type() {
-                    return refkey("A");
-                  },
-                  omitNone: true
-                }, {
-                  fileName: import.meta.url,
-                  lineNumber: 137,
-                  columnNumber: 13
-                }), _$createComponent(py.VariableDeclaration, {
-                  name: "foo",
-                  type: "str",
-                  omitNone: true
+                return _$createComponent(py.StatementList, {
+                  get children() {
+                    return [_$createComponent(py.VariableDeclaration, {
+                      name: "bar",
+                      get type() {
+                        return refkey("A");
+                      },
+                      omitNone: true
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 174,
+                      columnNumber: 15
+                    }), _$createComponent(py.VariableDeclaration, {
+                      name: "foo",
+                      type: "str",
+                      omitNone: true
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 175,
+                      columnNumber: 15
+                    })];
+                  }
                 }, {
                   fileName: import.meta.url,
-                  lineNumber: 138,
+                  lineNumber: 173,
                   columnNumber: 13
-                })];
+                });
               }
             }, {
               fileName: import.meta.url,
-              lineNumber: 136,
+              lineNumber: 172,
               columnNumber: 11
-            });
+            })];
           }
         }, {
           fileName: import.meta.url,
-          lineNumber: 135,
+          lineNumber: 170,
           columnNumber: 9
-        })];
+        });
       }
     }, {
       fileName: import.meta.url,
-      lineNumber: 133,
+      lineNumber: 169,
       columnNumber: 7
-    })]);
-    const expected = d`
+    })).toRenderTo(`
       class A:
           pass
 
@@ -276,75 +353,80 @@ describe("Python Class", () => {
           bar: A
           foo: str
 
-
-    `;
-    expect(result).toRenderTo(expected);
+    `);
   });
   it("renders a class with class variables like foo: str, and another identical class", () => {
     const fooKey = refkey();
     const barKey = refkey();
-    const result = toSourceText([_$createComponent(py.StatementList, {
+    expect(_$createComponent(TestOutput, {
       get children() {
-        return [_$createComponent(py.ClassDeclaration, {
-          name: "A",
+        return _$createComponent(py.StatementList, {
           get children() {
-            return _$createComponent(py.StatementList, {
+            return [_$createComponent(py.ClassDeclaration, {
+              name: "A",
               get children() {
-                return _$createComponent(py.VariableDeclaration, {
-                  name: "foo",
-                  type: "str",
-                  refkey: fooKey,
-                  omitNone: true
+                return _$createComponent(py.StatementList, {
+                  get children() {
+                    return _$createComponent(py.VariableDeclaration, {
+                      name: "foo",
+                      type: "str",
+                      refkey: fooKey,
+                      omitNone: true
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 202,
+                      columnNumber: 15
+                    });
+                  }
                 }, {
                   fileName: import.meta.url,
-                  lineNumber: 164,
+                  lineNumber: 201,
                   columnNumber: 13
                 });
               }
             }, {
               fileName: import.meta.url,
-              lineNumber: 163,
+              lineNumber: 200,
               columnNumber: 11
-            });
-          }
-        }, {
-          fileName: import.meta.url,
-          lineNumber: 162,
-          columnNumber: 9
-        }), _$createComponent(py.ClassDeclaration, {
-          name: "B",
-          get children() {
-            return _$createComponent(py.StatementList, {
+            }), _$createComponent(py.ClassDeclaration, {
+              name: "B",
               get children() {
-                return _$createComponent(py.VariableDeclaration, {
-                  name: "foo",
-                  type: "str",
-                  refkey: barKey,
-                  omitNone: true
+                return _$createComponent(py.StatementList, {
+                  get children() {
+                    return _$createComponent(py.VariableDeclaration, {
+                      name: "foo",
+                      type: "str",
+                      refkey: barKey,
+                      omitNone: true
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 212,
+                      columnNumber: 15
+                    });
+                  }
                 }, {
                   fileName: import.meta.url,
-                  lineNumber: 174,
+                  lineNumber: 211,
                   columnNumber: 13
                 });
               }
             }, {
               fileName: import.meta.url,
-              lineNumber: 173,
+              lineNumber: 210,
               columnNumber: 11
-            });
+            }), fooKey, barKey];
           }
         }, {
           fileName: import.meta.url,
-          lineNumber: 172,
+          lineNumber: 199,
           columnNumber: 9
-        }), fooKey, barKey];
+        });
       }
     }, {
       fileName: import.meta.url,
-      lineNumber: 161,
+      lineNumber: 198,
       columnNumber: 7
-    })]);
-    const expected = d`
+    })).toRenderTo(`
       class A:
           foo: str
 
@@ -353,85 +435,91 @@ describe("Python Class", () => {
 
       A.foo
       B.foo
-    `;
-    expect(result).toRenderTo(expected);
+    `);
   });
 });
 describe("Python Class - VariableDeclaration", () => {
   it("renders a class with class fields", () => {
-    const result = toSourceText([_$createComponent(py.StatementList, {
+    expect(_$createComponent(TestOutput, {
       get children() {
-        return [_$createComponent(py.ClassDeclaration, {
-          get refkey() {
-            return refkey("Base");
-          },
-          name: "Base"
-        }, {
-          fileName: import.meta.url,
-          lineNumber: 204,
-          columnNumber: 9
-        }), _$createComponent(py.ClassDeclaration, {
-          get refkey() {
-            return refkey("A");
-          },
-          name: "A",
+        return _$createComponent(py.StatementList, {
           get children() {
-            return _$createComponent(py.StatementList, {
+            return [_$createComponent(py.ClassDeclaration, {
+              get refkey() {
+                return refkey("Base");
+              },
+              name: "Base"
+            }, {
+              fileName: import.meta.url,
+              lineNumber: 244,
+              columnNumber: 11
+            }), _$createComponent(py.ClassDeclaration, {
+              get refkey() {
+                return refkey("A");
+              },
+              name: "A",
               get children() {
-                return [_$createComponent(py.VariableDeclaration, {
-                  instanceVariable: true,
-                  name: "just_name"
-                }, {
-                  fileName: import.meta.url,
-                  lineNumber: 210,
-                  columnNumber: 13
-                }), _$createComponent(py.VariableDeclaration, {
-                  name: "name_and_type",
-                  type: "number",
-                  instanceVariable: true
-                }, {
-                  fileName: import.meta.url,
-                  lineNumber: 211,
-                  columnNumber: 13
-                }), _$createComponent(py.VariableDeclaration, {
-                  instanceVariable: true,
-                  name: "name_type_and_value",
-                  type: "number",
-                  initializer: 12
-                }, {
-                  fileName: import.meta.url,
-                  lineNumber: 216,
-                  columnNumber: 13
-                }), _$createComponent(py.VariableDeclaration, {
-                  instanceVariable: true,
-                  name: "class_based",
-                  get type() {
-                    return refkey("Base");
+                return _$createComponent(py.StatementList, {
+                  get children() {
+                    return [_$createComponent(py.VariableDeclaration, {
+                      instanceVariable: true,
+                      name: "just_name"
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 250,
+                      columnNumber: 15
+                    }), _$createComponent(py.VariableDeclaration, {
+                      name: "name_and_type",
+                      type: "number",
+                      instanceVariable: true
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 251,
+                      columnNumber: 15
+                    }), _$createComponent(py.VariableDeclaration, {
+                      instanceVariable: true,
+                      name: "name_type_and_value",
+                      type: "number",
+                      initializer: 12
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 256,
+                      columnNumber: 15
+                    }), _$createComponent(py.VariableDeclaration, {
+                      instanceVariable: true,
+                      name: "class_based",
+                      get type() {
+                        return refkey("Base");
+                      }
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 262,
+                      columnNumber: 15
+                    })];
                   }
                 }, {
                   fileName: import.meta.url,
-                  lineNumber: 222,
+                  lineNumber: 249,
                   columnNumber: 13
-                })];
+                });
               }
             }, {
               fileName: import.meta.url,
-              lineNumber: 209,
+              lineNumber: 248,
               columnNumber: 11
-            });
+            })];
           }
         }, {
           fileName: import.meta.url,
-          lineNumber: 208,
+          lineNumber: 243,
           columnNumber: 9
-        })];
+        });
       }
     }, {
       fileName: import.meta.url,
-      lineNumber: 203,
+      lineNumber: 242,
       columnNumber: 7
-    })]);
-    const expected = d`
+    })).toRenderTo(`
       class Base:
           pass
 
@@ -441,110 +529,115 @@ describe("Python Class - VariableDeclaration", () => {
           name_type_and_value: number = 12
           class_based: Base = None
 
-
-    `;
-    expect(result).toRenderTo(expected);
+    `);
   });
   it("correctly access members of its type", () => {
     const classRk = refkey();
     const classMemberRk = refkey();
     const classMethodRk = refkey();
     const v1Rk = refkey();
-    const res = toSourceTextMultiple([_$createComponent(py.SourceFile, {
-      path: "inst.py",
+    expect(_$createComponent(TestOutputDirectory, {
       get children() {
-        return _$createComponent(py.StatementList, {
+        return [_$createComponent(py.SourceFile, {
+          path: "inst.py",
           get children() {
-            return [_$createComponent(py.VariableDeclaration, {
-              name: "one",
-              refkey: v1Rk,
-              type: classRk,
-              get initializer() {
-                return _$createComponent(py.ClassInstantiation, {
-                  target: classRk
+            return _$createComponent(py.StatementList, {
+              get children() {
+                return [_$createComponent(py.VariableDeclaration, {
+                  name: "one",
+                  refkey: v1Rk,
+                  type: classRk,
+                  get initializer() {
+                    return _$createComponent(py.ClassInstantiation, {
+                      target: classRk
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 300,
+                      columnNumber: 28
+                    });
+                  }
                 }, {
                   fileName: import.meta.url,
-                  lineNumber: 259,
-                  columnNumber: 26
-                });
+                  lineNumber: 296,
+                  columnNumber: 13
+                }), [_$memo(() => memberRefkey(v1Rk, classMemberRk), false, "memberRefkey(\u2026)")], [_$memo(() => memberRefkey(v1Rk, classMethodRk), false, "memberRefkey(\u2026)"), "()"]];
               }
             }, {
               fileName: import.meta.url,
-              lineNumber: 255,
+              lineNumber: 295,
               columnNumber: 11
-            }), [_$memo(() => memberRefkey(v1Rk, classMemberRk), false, "memberRefkey(\u2026)")], [_$memo(() => memberRefkey(v1Rk, classMethodRk), false, "memberRefkey(\u2026)"), "()"]];
+            });
           }
         }, {
           fileName: import.meta.url,
-          lineNumber: 254,
+          lineNumber: 294,
           columnNumber: 9
-        });
-      }
-    }, {
-      fileName: import.meta.url,
-      lineNumber: 253,
-      columnNumber: 7
-    }), _$createComponent(py.SourceFile, {
-      path: "decl.py",
-      get children() {
-        return _$createComponent(py.ClassDeclaration, {
-          name: "Bar",
-          refkey: classRk,
+        }), _$createComponent(py.SourceFile, {
+          path: "decl.py",
           get children() {
-            return _$createComponent(py.StatementList, {
+            return _$createComponent(py.ClassDeclaration, {
+              name: "Bar",
+              refkey: classRk,
               get children() {
-                return [_$createComponent(py.VariableDeclaration, {
-                  name: "instanceProp",
-                  refkey: classMemberRk,
-                  initializer: 42,
-                  instanceVariable: true
-                }, {
-                  fileName: import.meta.url,
-                  lineNumber: 268,
-                  columnNumber: 13
-                }), _$createComponent(py.MethodDeclaration, {
-                  name: "instanceMethod",
-                  refkey: classMethodRk,
-                  returnType: "int"
+                return _$createComponent(py.StatementList, {
+                  get children() {
+                    return [_$createComponent(py.VariableDeclaration, {
+                      name: "instanceProp",
+                      refkey: classMemberRk,
+                      initializer: 42,
+                      instanceVariable: true
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 309,
+                      columnNumber: 15
+                    }), _$createComponent(py.MethodDeclaration, {
+                      name: "instanceMethod",
+                      refkey: classMethodRk,
+                      returnType: "int"
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 315,
+                      columnNumber: 15
+                    })];
+                  }
                 }, {
                   fileName: import.meta.url,
-                  lineNumber: 274,
+                  lineNumber: 308,
                   columnNumber: 13
-                })];
+                });
               }
             }, {
               fileName: import.meta.url,
-              lineNumber: 267,
+              lineNumber: 307,
               columnNumber: 11
             });
           }
         }, {
           fileName: import.meta.url,
-          lineNumber: 266,
+          lineNumber: 306,
           columnNumber: 9
-        });
+        })];
       }
     }, {
       fileName: import.meta.url,
-      lineNumber: 265,
+      lineNumber: 293,
       columnNumber: 7
-    })]);
-    assertFileContents(res, {
+    })).toRenderTo({
       "inst.py": `
-        from decl import Bar
+          from decl import Bar
 
-        one: Bar = Bar()
-        one.instance_prop
-        one.instance_method()
-      `,
+          one: Bar = Bar()
+          one.instance_prop
+          one.instance_method()
+        `,
       "decl.py": `
-        class Bar:
-            instance_prop = 42
-            def instance_method(self) -> int:
-                pass
+          class Bar:
+              instance_prop = 42
+              def instance_method(self) -> int:
+                  pass
 
 
-      `
+        `
     });
   });
 });
@@ -553,84 +646,91 @@ describe("Python Class - FunctionDeclaration", () => {
     const methodRefkey = refkey();
     const classMethodRefkey = refkey();
     const staticMethodRefkey = refkey();
-    const result = toSourceText([_$createComponent(py.StatementList, {
+    expect(_$createComponent(TestOutput, {
       get children() {
-        return [_$createComponent(py.ClassDeclaration, {
-          name: "MyClass",
-          bases: ["BaseClass"],
+        return _$createComponent(py.StatementList, {
           get children() {
-            return _$createComponent(py.StatementList, {
+            return [_$createComponent(py.ClassDeclaration, {
+              name: "MyClass",
+              bases: ["BaseClass"],
               get children() {
-                return [_$createComponent(py.VariableDeclaration, {
-                  name: "a",
-                  type: "int",
-                  instanceVariable: true
-                }, {
-                  fileName: import.meta.url,
-                  lineNumber: 314,
-                  columnNumber: 13
-                }), _$createComponent(py.VariableDeclaration, {
-                  name: "b",
-                  type: "int",
-                  instanceVariable: true
-                }, {
-                  fileName: import.meta.url,
-                  lineNumber: 315,
-                  columnNumber: 13
-                }), _$createComponent(py.MethodDeclaration, {
-                  name: "my_method",
-                  parameters: [{
-                    name: "a",
-                    type: "int"
-                  }, {
-                    name: "b",
-                    type: "int"
-                  }],
-                  returnType: "int",
-                  refkey: methodRefkey,
-                  children: "return a + b"
-                }, {
-                  fileName: import.meta.url,
-                  lineNumber: 316,
-                  columnNumber: 13
-                }), _$createComponent(py.ClassMethodDeclaration, {
-                  name: "my_class_method",
-                  returnType: "int",
-                  refkey: classMethodRefkey,
-                  children: "pass"
-                }, {
-                  fileName: import.meta.url,
-                  lineNumber: 327,
-                  columnNumber: 13
-                }), _$createComponent(py.FunctionDeclaration, {
-                  name: "my_standalone_function",
-                  returnType: "int",
-                  refkey: staticMethodRefkey,
-                  children: "pass"
+                return _$createComponent(py.StatementList, {
+                  get children() {
+                    return [_$createComponent(py.VariableDeclaration, {
+                      name: "a",
+                      type: "int",
+                      instanceVariable: true
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 355,
+                      columnNumber: 15
+                    }), _$createComponent(py.VariableDeclaration, {
+                      name: "b",
+                      type: "int",
+                      instanceVariable: true
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 356,
+                      columnNumber: 15
+                    }), _$createComponent(py.MethodDeclaration, {
+                      name: "my_method",
+                      parameters: [{
+                        name: "a",
+                        type: "int"
+                      }, {
+                        name: "b",
+                        type: "int"
+                      }],
+                      returnType: "int",
+                      refkey: methodRefkey,
+                      children: "return a + b"
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 357,
+                      columnNumber: 15
+                    }), _$createComponent(py.ClassMethodDeclaration, {
+                      name: "my_class_method",
+                      returnType: "int",
+                      refkey: classMethodRefkey,
+                      children: "pass"
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 368,
+                      columnNumber: 15
+                    }), _$createComponent(py.FunctionDeclaration, {
+                      name: "my_standalone_function",
+                      returnType: "int",
+                      refkey: staticMethodRefkey,
+                      children: "pass"
+                    }, {
+                      fileName: import.meta.url,
+                      lineNumber: 375,
+                      columnNumber: 15
+                    })];
+                  }
                 }, {
                   fileName: import.meta.url,
-                  lineNumber: 334,
+                  lineNumber: 354,
                   columnNumber: 13
-                })];
+                });
               }
             }, {
               fileName: import.meta.url,
-              lineNumber: 313,
+              lineNumber: 353,
               columnNumber: 11
-            });
+            }), classMethodRefkey, staticMethodRefkey];
           }
         }, {
           fileName: import.meta.url,
-          lineNumber: 312,
+          lineNumber: 352,
           columnNumber: 9
-        }), classMethodRefkey, staticMethodRefkey];
+        });
       }
     }, {
       fileName: import.meta.url,
-      lineNumber: 311,
+      lineNumber: 351,
       columnNumber: 7
-    })]);
-    const expected = d`
+    })).toRenderTo(`
       class MyClass(BaseClass):
           a: int = None
           b: int = None
@@ -647,8 +747,7 @@ describe("Python Class - FunctionDeclaration", () => {
       
       MyClass.my_class_method
       MyClass.my_standalone_function
-    `;
-    expect(result).toRenderTo(expected);
+    `);
   });
 });
 //# sourceMappingURL=classdeclarations.test.js.map