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

package/test/classinstantiations.test.tsx

@@ -1,33 +1,33 @@
 import { refkey } from "@alloy-js/core";
-import { d } from "@alloy-js/core/testing";
 import { expect, it } from "vitest";
 import { createModule } from "../src/create-module.js";
 import * as py from "../src/index.js";
-import { toSourceText } from "./utils.jsx";
+import { TestOutput } from "./utils.js";
 
 it("declaration of class instance with variables", () => {
-  // Creating the reference separately so the naming policy doesn't interfere
   const classRef = refkey();
-  const result = toSourceText([
-    <py.StatementList>
-      <py.ClassDeclaration name="one-class" refkey={classRef} />
-      <py.ClassInstantiation
-        target={classRef}
-        args={[
-          <py.Atom jsValue={"A name"} />,
-          <py.Atom jsValue={42} />,
-          <py.Atom jsValue={true} />,
-        ]}
-      />
-    </py.StatementList>,
-  ]);
-  const expected = d`
+  expect(
+    <TestOutput>
+      <py.StatementList>
+        <py.ClassDeclaration name="one-class" refkey={classRef} />
+        <py.ClassInstantiation
+          target={classRef}
+          args={[
+            <py.Atom jsValue={"A name"} />,
+            <py.Atom jsValue={42} />,
+            <py.Atom jsValue={true} />,
+          ]}
+        />
+      </py.StatementList>
+    </TestOutput>,
+  ).toRenderTo(
+    `
     class OneClass:
         pass
 
     OneClass("A name", 42, True)
-  `;
-  expect(result).toRenderTo(expected);
+  `,
+  );
 });
 
 it("correct resolving of external module", () => {
@@ -37,114 +37,120 @@ it("correct resolving of external module", () => {
       models: ["Request"],
     },
   });
-  const result = toSourceText(
-    [
+  expect(
+    <TestOutput externals={[requestsLib]}>
       <py.StatementList>
         <py.ClassInstantiation target={requestsLib["models"].Request} />
-      </py.StatementList>,
-    ],
-    { externals: [requestsLib] },
-  );
-  const expected = d`
+      </py.StatementList>
+    </TestOutput>,
+  ).toRenderTo(
+    `
     from requests.models import Request
 
     Request()
-  `;
-  expect(result).toRenderTo(expected);
+  `,
+  );
 });
 
 it("Class instantiation without a reference", () => {
-  const result = toSourceText([
-    <py.StatementList>
-      <py.ClassInstantiation
-        target={"ExampleClass"}
-        args={[
-          <py.Atom jsValue={"A name"} />,
-          <py.Atom jsValue={42} />,
-          <py.Atom jsValue={true} />,
-        ]}
-      />
-    </py.StatementList>,
-  ]);
-  const expected = d`
+  expect(
+    <TestOutput>
+      <py.StatementList>
+        <py.ClassInstantiation
+          target={"ExampleClass"}
+          args={[
+            <py.Atom jsValue={"A name"} />,
+            <py.Atom jsValue={42} />,
+            <py.Atom jsValue={true} />,
+          ]}
+        />
+      </py.StatementList>
+    </TestOutput>,
+  ).toRenderTo(
+    `
     ExampleClass("A name", 42, True)
-  `;
-  expect(result).toRenderTo(expected);
+  `,
+  );
 });
 
 it("Class instantiation without a reference and with call statement vars", () => {
-  const result = toSourceText([
-    <py.StatementList>
-      <py.ClassInstantiation
-        target={"ExampleClass"}
-        args={[
-          <py.VariableDeclaration
-            name="name"
-            initializer={"A name"}
-            callStatementVar
-          />,
-          <py.VariableDeclaration
-            name="number"
-            initializer={42}
-            callStatementVar
-          />,
-          <py.VariableDeclaration
-            name="flag"
-            initializer={true}
-            callStatementVar
-          />,
-        ]}
-      />
-    </py.StatementList>,
-  ]);
-  const expected = d`
+  expect(
+    <TestOutput>
+      <py.StatementList>
+        <py.ClassInstantiation
+          target={"ExampleClass"}
+          args={[
+            <py.VariableDeclaration
+              name="name"
+              initializer={"A name"}
+              callStatementVar
+            />,
+            <py.VariableDeclaration
+              name="number"
+              initializer={42}
+              callStatementVar
+            />,
+            <py.VariableDeclaration
+              name="flag"
+              initializer={true}
+              callStatementVar
+            />,
+          ]}
+        />
+      </py.StatementList>
+    </TestOutput>,
+  ).toRenderTo(
+    `
     ExampleClass(name="A name", number=42, flag=True)
-  `;
-  expect(result).toRenderTo(expected);
+  `,
+  );
 });
 
 it("Class instantiation without a reference mixing unnamed and named vars", () => {
-  const result = toSourceText([
-    <py.StatementList>
-      <py.ClassInstantiation
-        target={"ExampleClass"}
-        args={[
-          <py.Atom jsValue={"A name"} />,
-          <py.VariableDeclaration
-            name="number"
-            initializer={42}
-            callStatementVar
-          />,
-          <py.VariableDeclaration
-            name="flag"
-            initializer={true}
-            callStatementVar
-          />,
-        ]}
-      />
-    </py.StatementList>,
-  ]);
-  const expected = d`
+  expect(
+    <TestOutput>
+      <py.StatementList>
+        <py.ClassInstantiation
+          target={"ExampleClass"}
+          args={[
+            <py.Atom jsValue={"A name"} />,
+            <py.VariableDeclaration
+              name="number"
+              initializer={42}
+              callStatementVar
+            />,
+            <py.VariableDeclaration
+              name="flag"
+              initializer={true}
+              callStatementVar
+            />,
+          ]}
+        />
+      </py.StatementList>
+    </TestOutput>,
+  ).toRenderTo(
+    `
     ExampleClass("A name", number=42, flag=True)
-  `;
-  expect(result).toRenderTo(expected);
+  `,
+  );
 });
 
 it("incorrect Class instantiation works", () => {
-  const result = toSourceText([
-    <py.ClassInstantiation
-      target="MyClass"
-      args={[
-        <py.ClassDeclaration name="NestedClass" />,
-        <py.FunctionDeclaration name="myFunc" />,
-        <py.StatementList>
-          <py.VariableDeclaration name="x" />
-        </py.StatementList>,
-      ]}
-    />,
-  ]);
-
-  const expected = d`
+  expect(
+    <TestOutput>
+      <py.ClassInstantiation
+        target="MyClass"
+        args={[
+          <py.ClassDeclaration name="NestedClass" />,
+          <py.FunctionDeclaration name="myFunc" />,
+          <py.StatementList>
+            <py.VariableDeclaration name="x" />
+          </py.StatementList>,
+        ]}
+      />
+    </TestOutput>,
+  ).toRenderTo(
+    `
     MyClass(
         class NestedClass:
             pass
@@ -154,6 +160,6 @@ it("incorrect Class instantiation works", () => {
         ,
         x = None
     )
-  `;
-  expect(result).toRenderTo(expected);
+  `,
+  );
 });

package/test/constructordeclaration.test.tsx

@@ -1,7 +1,6 @@
-import { d } from "@alloy-js/core/testing";
 import { describe, expect, it } from "vitest";
 import * as py from "../src/index.js";
-import { toSourceText } from "./utils.js";
+import { TestOutput } from "./utils.js";
 
 describe("ConstructorDeclaration", () => {
   it("renders async constructor with return type", () => {
@@ -17,13 +16,15 @@ describe("ConstructorDeclaration", () => {
       </py.StatementList>
     );
 
-    expect(toSourceText([decl])).toBe(d`
+    expect(<TestOutput>{decl}</TestOutput>).toRenderTo(
+      `
       class MyClass:
           async def __new__(cls) -> MyClass:
               return super().__new__(cls)
 
 
-    `);
+    `,
+    );
   });
 
   it("renders __new__ with spread args", () => {
@@ -37,12 +38,14 @@ describe("ConstructorDeclaration", () => {
       </py.ClassDeclaration>
     );
 
-    expect(toSourceText([decl])).toBe(d`
+    expect(<TestOutput>{decl}</TestOutput>).toRenderTo(
+      `
       class MyClass:
           def __new__(cls, *args, **kwargs):
               pass
 
 
-    `);
+    `,
+    );
   });
 });