Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add test cases for clientNamespace on anonymous models #2071

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { strictEqual } from "assert";
import { AzureCoreTestLibrary } from "@azure-tools/typespec-azure-core/testing";
import { ok, strictEqual } from "assert";
import { beforeEach, describe, it } from "vitest";
import { SdkClientType, SdkServiceOperation } from "../../src/interfaces.js";
import { SdkTestRunner, createSdkTestRunner } from "../test-host.js";
Expand All @@ -24,6 +25,40 @@ describe("typespec-client-generator-core: @clientNamespace", () => {
strictEqual(runner.context.sdkPackage.models[0].clientNamespace, "TestService");
});

it("namespace on anonymous model", async () => {
await runner.compileWithBuiltInService(`
model Test {
prop: {
p1: string;
p2: int32;
}
}

op test(): Test;
`);

const models = runner.context.sdkPackage.models;
const testModel = models.find((m) => m.name === "Test");
ok(testModel);
const anonymousModel = testModel?.properties[0].type;
ok(anonymousModel);
strictEqual(anonymousModel.kind, "model");
strictEqual(anonymousModel.clientNamespace, "TestService");
});

it("namespace on alias", async () => {
await runner.compileWithBuiltInService(
`
alias Test = {
prop: string;
};

op test(): Test;
`,
);
strictEqual(runner.context.sdkPackage.models[0].clientNamespace, "TestService");
});

it("namespace on enum", async () => {
await runner.compileWithBuiltInService(
`
Expand All @@ -37,6 +72,67 @@ describe("typespec-client-generator-core: @clientNamespace", () => {
strictEqual(runner.context.sdkPackage.enums[0].clientNamespace, "TestService");
});

it("namespace on anonymous response in a template", async () => {
runner = await createSdkTestRunner({
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should be adding @clientNamespace tests as well, instead of just looking at .clientNamespace

librariesToAdd: [AzureCoreTestLibrary],
autoUsings: ["Azure.Core", "Azure.Core.Traits"],
emitterName: "@azure-tools/typespec-java",
});
await runner.compileWithBuiltInAzureCoreService(`
alias ServiceTraits = SupportsRepeatableRequests &
SupportsConditionalRequests &
SupportsClientRequestId;

@route("service-status")
op getServiceStatus is RpcOperation<
{},
{
statusString: string;
},
ServiceTraits
>;
`);

const method = runner.context.sdkPackage.clients[0].methods[0];
strictEqual(method.kind, "basic");
const responseType = method.response.type;
ok(responseType);
strictEqual(responseType.kind, "model");
// TODO -- this is currently empty which might be an issue, tracking in @typespec/http library issue https://github.com/microsoft/typespec/issues/5664
strictEqual(responseType.clientNamespace, "");
});

it("namespace on concrete response in a template", async () => {
runner = await createSdkTestRunner({
librariesToAdd: [AzureCoreTestLibrary],
autoUsings: ["Azure.Core", "Azure.Core.Traits"],
emitterName: "@azure-tools/typespec-java",
});
await runner.compileWithBuiltInAzureCoreService(`
alias ServiceTraits = SupportsRepeatableRequests &
SupportsConditionalRequests &
SupportsClientRequestId;

model ServiceStatus {
statusString: string;
}

@route("service-status")
op getServiceStatus is RpcOperation<
{},
ServiceStatus,
ServiceTraits
>;
`);

const method = runner.context.sdkPackage.clients[0].methods[0];
strictEqual(method.kind, "basic");
const responseType = method.response.type;
ok(responseType);
strictEqual(responseType.kind, "model");
strictEqual(responseType.clientNamespace, "My.Service");
});

it("namespace on union", async () => {
await runner.compileWithBuiltInService(
`
Expand Down
Loading