Skip to content

Commit 2fa54f8

Browse files
[Event hubs] Separate event hubs tests into public and internal and enable min-max tests (Azure#12798)
1 parent 9ee918e commit 2fa54f8

32 files changed

+1441
-735
lines changed

eng/tools/dependency-testing/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ async function readAndReplaceSourceReferences(filePath, packageName) {
200200
var fileContent = await packageUtils.readFile(filePath);
201201
console.log("Reading filePath = " + filePath);
202202
testAssetsContent = fileContent.replace('path.resolve(path.join(process.cwd(), "test-assets"','path.resolve(path.join(process.cwd(),"..","..", "test-assets"');
203-
// Regex for internal references = /* ["']+[../]*src[/a-z]+["'] */
204-
var internalrefs = testAssetsContent.match(/[\"\']+[..//]*src[//a-zA-Z]+[\"\']+/g);
203+
// Regex for internal references = /* ["']+[../]*src[/][a-z]+["'] */
204+
var internalrefs = testAssetsContent.match(/[\"\']+[..//]*src[//][a-zA-Z]+[\"\']+/g);
205205
var writeContent = "";
206206
if (internalrefs) {
207207
console.log("internal refs = ");
@@ -211,7 +211,7 @@ async function readAndReplaceSourceReferences(filePath, packageName) {
211211
else {
212212
var replaceText = "\"" + packageName + "\"";
213213
//Regex for public api references to be replaced by package name
214-
writeContent = testAssetsContent.replace(/[\"\']+[..//]*src[\"\']+/g, replaceText);
214+
writeContent = testAssetsContent.replace(/[\"\']+[..//]*src[//]*[\"\']+/g, replaceText);
215215
}
216216
await packageUtils.writeFile(filePath, writeContent);
217217
}

sdk/eventhub/event-hubs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"extract-api": "tsc -p . && api-extractor run --local",
5959
"format": "prettier --write --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
6060
"integration-test:browser": "karma start --single-run",
61-
"integration-test:node": "nyc mocha -r esm --require source-map-support/register --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 1200000 --full-trace dist-esm/test/*.spec.js dist-esm/test/**/*.spec.js",
61+
"integration-test:node": "nyc mocha -r esm --require source-map-support/register --reporter ../../../common/tools/mocha-multi-reporter.js --timeout 1200000 --full-trace dist-esm/test/internal/*.spec.js dist-esm/test/public/*.spec.js dist-esm/test/public/**/*.spec.js dist-esm/test/internal/**/*.spec.js",
6262
"integration-test": "npm run integration-test:node && npm run integration-test:browser",
6363
"lint:fix": "eslint package.json api-extractor.json src test --ext .ts --fix --fix-type [problem,suggestion]",
6464
"lint": "eslint package.json api-extractor.json src test --ext .ts -f html -o event-hubs-lintReport.html || exit 0",

sdk/eventhub/event-hubs/rollup.base.config.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export function nodeConfig(test = false) {
4343

4444
if (test) {
4545
// entry point is every test file
46-
baseConfig.input = "dist-esm/test/**/*.spec.js";
46+
baseConfig.input = ["dist-esm/test/internal/**/*.spec.js", "dist-esm/test/public/**/*.spec.js"];
4747
baseConfig.plugins.unshift(multiEntry({ exports: false }));
4848

4949
// different output file
@@ -143,7 +143,11 @@ export function browserConfig(test = false) {
143143
};
144144

145145
if (test) {
146-
baseConfig.input = ["dist-esm/test/*.spec.js", "dist-esm/test/impl/*.spec.js"];
146+
baseConfig.input = [
147+
"dist-esm/test/public/*.spec.js",
148+
"dist-esm/test/internal/*.spec.js",
149+
"dist-esm/test/internal/impl/*.spec.js"
150+
];
147151
baseConfig.plugins.unshift(multiEntry({ exports: false }));
148152
baseConfig.output.file = "test-browser/index.js";
149153

sdk/eventhub/event-hubs/test/auth.spec.ts renamed to sdk/eventhub/event-hubs/test/internal/auth.spec.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
// Licensed under the MIT license.
33

44
import { parseConnectionString } from "@azure/core-amqp";
5-
import { EventHubConsumerClient } from "../src/eventHubConsumerClient";
6-
import { EnvVarKeys, getEnvVars } from "./utils/testUtils";
5+
import { EventHubConsumerClient, EventHubProducerClient } from "../../src";
6+
import { EnvVarKeys, getEnvVars } from "../public/utils/testUtils";
77
import chai from "chai";
8-
import { EventHubProducerClient } from "../src";
9-
import { SharedKeyCredential } from "../src/eventhubSharedKeyCredential";
8+
import { SharedKeyCredential } from "../../src/eventhubSharedKeyCredential";
109

1110
const should = chai.should();
1211
const env = getEnvVars();

sdk/eventhub/event-hubs/test/client.spec.ts renamed to sdk/eventhub/event-hubs/test/internal/client.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import {
1414
EventHubProducerClient,
1515
EventHubConsumerClient,
1616
Subscription
17-
} from "../src";
18-
import { packageJsonInfo } from "../src/util/constants";
19-
import { EnvVarKeys, getEnvVars, isNode } from "./utils/testUtils";
17+
} from "../../src";
18+
import { packageJsonInfo } from "../../src/util/constants";
19+
import { EnvVarKeys, getEnvVars, isNode } from "../public/utils/testUtils";
2020
import { MessagingError } from "@azure/core-amqp";
21-
import { ConnectionContext } from "../src/connectionContext";
22-
import { getRuntimeInfo } from "../src/util/runtimeInfo";
21+
import { ConnectionContext } from "../../src/connectionContext";
22+
import { getRuntimeInfo } from "../../src/util/runtimeInfo";
2323
const env = getEnvVars();
2424

2525
const testFailureMessage = "Test failure";

sdk/eventhub/event-hubs/test/config.spec.ts renamed to sdk/eventhub/event-hubs/test/internal/config.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation.
22
// Licensed under the MIT license.
33

4-
import { EventHubConnectionConfig } from "../src/eventhubConnectionConfig";
4+
import { EventHubConnectionConfig } from "../../src/eventhubConnectionConfig";
55
import chai from "chai";
66
const should = chai.should();
77

sdk/eventhub/event-hubs/test/dataTransformer.spec.ts renamed to sdk/eventhub/event-hubs/test/internal/dataTransformer.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as chai from "chai";
66
const should = chai.should();
77
import * as assert from "assert";
88
import isBuffer from "is-buffer";
9-
import { defaultDataTransformer } from "../src/dataTransformer";
9+
import { defaultDataTransformer } from "../../src/dataTransformer";
1010

1111
describe("DataTransformer", function() {
1212
const objectBody: any = {

sdk/eventhub/event-hubs/test/diagnostics/messageSpan.spec.ts renamed to sdk/eventhub/event-hubs/test/internal/diagnostics/messageSpan.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Licensed under the MIT license.
33

44
import chai from "chai";
5-
import { createMessageSpan } from "../../src/diagnostics/messageSpan";
5+
import { createMessageSpan } from "../../../src/diagnostics/messageSpan";
66
import { TraceFlags, SpanContext } from "@opentelemetry/api";
77
import { TestTracer, setTracer, getTracer } from "@azure/core-tracing";
8-
import { EventHubConnectionConfig } from "../../src/eventhubConnectionConfig";
8+
import { EventHubConnectionConfig } from "../../../src/eventhubConnectionConfig";
99

1010
const should = chai.should();
1111
const assert = chai.assert;

0 commit comments

Comments
 (0)