Skip to content

Commit cb00484

Browse files
ClaimundefineClaimundefine
authored
DGS-19203 Fix and refactor tests (#176)
* DGS-19203 refactor repo to add tests to schema registry workspace * fix Makefile
1 parent 618e1f9 commit cb00484

26 files changed

+54
-55
lines changed

‎schemaregistry/Makefile

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ DOCKER ?= ./run_docker_schemaregistry.sh
99

1010
# Paths
1111
SRC_DIR = .
12-
SR_TEST_DIR = ../test/schemaregistry
13-
DEK_TEST_DIR = ../test/schemaregistry/rules/encryption/dekregistry
12+
SR_TEST_DIR = ./schemaregistry/test
1413
INTEG_DIR = ../e2e/schemaregistry
1514

1615
# Tasks
@@ -22,7 +21,7 @@ lint:
2221
$(ESLINT) $(SRC_DIR) $(TEST_DIR) $(INTEG_DIR) $(DEK_TEST_DIR)
2322

2423
test:
25-
$(JEST) $(SR_TEST_DIR) $(DEK_TEST_DIR)
24+
$(JEST) $(SR_TEST_DIR)
2625

2726
integtest:
2827
$(DOCKER)

‎e2e/schemaregistry/schemaregistry-avro.spec.ts renamed to ‎schemaregistry/e2e/schemaregistry-avro.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import {
33
Metadata,
44
SchemaRegistryClient,
55
SchemaInfo
6-
} from '../../schemaregistry/schemaregistry-client';
6+
} from '../schemaregistry-client';
77
import { beforeEach, afterEach, describe, expect, it } from '@jest/globals';
8-
import { clientConfig } from '../../test/schemaregistry/test-constants';
9-
import { AvroDeserializer, AvroSerializer, AvroSerializerConfig } from '../../schemaregistry/serde/avro';
10-
import { SerdeType } from "../../schemaregistry/serde/serde";
8+
import { clientConfig } from '../test/test-constants';
9+
import { AvroDeserializer, AvroSerializer, AvroSerializerConfig } from '../serde/avro';
10+
import { SerdeType } from "../serde/serde";
1111
import stringify from 'json-stringify-deterministic';
1212
import { v4 } from 'uuid';
1313

‎e2e/schemaregistry/schemaregistry-client.spec.ts renamed to ‎schemaregistry/e2e/schemaregistry-client.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import {
55
SchemaInfo,
66
SchemaMetadata,
77
Metadata
8-
} from '../../schemaregistry/schemaregistry-client';
8+
} from '../schemaregistry-client';
99
import { beforeEach, describe, expect, it } from '@jest/globals';
10-
import { clientConfig } from '../../test/schemaregistry/test-constants';
10+
import { clientConfig } from '../test/test-constants';
1111
import { v4 } from 'uuid';
1212

1313
/* eslint-disable @typescript-eslint/no-non-null-asserted-optional-chain */

‎e2e/schemaregistry/schemaregistry-json.spec.ts renamed to ‎schemaregistry/e2e/schemaregistry-json.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import {
44
SchemaRegistryClient,
55
SchemaInfo,
66
Reference
7-
} from '../../schemaregistry/schemaregistry-client';
7+
} from '../schemaregistry-client';
88
import { beforeEach, afterEach, describe, expect, it } from '@jest/globals';
9-
import { clientConfig } from '../../test/schemaregistry/test-constants';
10-
import { JsonSerializer, JsonSerializerConfig, JsonDeserializer } from '../../schemaregistry/serde/json';
11-
import { SerdeType } from "../../schemaregistry/serde/serde";
9+
import { clientConfig } from '../test/test-constants';
10+
import { JsonSerializer, JsonSerializerConfig, JsonDeserializer } from '../serde/json';
11+
import { SerdeType } from "../serde/serde";
1212
import stringify from 'json-stringify-deterministic';
1313
import { v4 } from 'uuid';
1414

‎schemaregistry/run_docker_schemaregistry.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
COMPOSE_VERSION=$(docker-compose --version)
44
DOCKER_VERSION=$(docker --version)
55
JEST=${JEST:-../node_modules/.bin/jest}
6-
INTEG_DIR=../e2e/schemaregistry
6+
INTEG_DIR=./e2e/schemaregistry
77

88
# Start the docker compose file
99
echo "Running docker compose up. Docker version $DOCKER_VERSION. Compose version $COMPOSE_VERSION. "

‎test/schemaregistry/rules/encryption/dekregistry/dekregistry-client.spec.ts renamed to ‎schemaregistry/test/dekregistry/dekregistry-client.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { DekRegistryClient, Dek, Kek } from "../../../../../schemaregistry/rules/encryption/dekregistry/dekregistry-client";
2-
import { RestService } from "../../../../../schemaregistry/rest-service";
1+
import { DekRegistryClient, Dek, Kek } from "../../rules/encryption/dekregistry/dekregistry-client";
2+
import { RestService } from "../../rest-service";
33
import { AxiosResponse } from 'axios';
44
import { beforeEach, afterEach, describe, expect, it, jest } from '@jest/globals';
55
import { TEST_KEK, TEST_KEK_2, TEST_KEK_NAME, TEST_KEK_NAME_2, TEST_KMS_TYPE, TEST_KMS_KEY_ID,
66
TEST_KMS_PROPS, TEST_DOC, TEST_DEK, TEST_DEK_2, TEST_ALGORITHM,
77
TEST_ENCRYPTED_KEY_MATERIAL, TEST_SUBJECT, TEST_VERSION,
88
TEST_DEK_LATEST} from "./test-constants";
9-
import { mockClientConfig } from "../../../test-constants";
9+
import { mockClientConfig } from "../test-constants";
1010

11-
jest.mock('../../../../../schemaregistry/rest-service');
11+
jest.mock('../../rest-service');
1212

1313

1414
let client: DekRegistryClient;

‎test/schemaregistry/rules/encryption/dekregistry/mock-dekregistry-client.spec.ts renamed to ‎schemaregistry/test/dekregistry/mock-dekregistry-client.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Dek, Kek } from "../../../../../schemaregistry/rules/encryption/dekregistry/dekregistry-client";
2-
import { MockDekRegistryClient } from "../../../../../schemaregistry/rules/encryption/dekregistry/mock-dekregistry-client";
1+
import { Dek, Kek } from "../../rules/encryption/dekregistry/dekregistry-client";
2+
import { MockDekRegistryClient } from "../../rules/encryption/dekregistry/mock-dekregistry-client";
33
import { beforeEach, afterEach, describe, expect, it, jest } from '@jest/globals';
44
import { TEST_KEK, TEST_KEK_NAME, TEST_KMS_TYPE, TEST_KMS_KEY_ID,
55
TEST_KMS_PROPS, TEST_DOC, TEST_DEK, TEST_DEK_V2, TEST_ALGORITHM,

‎test/schemaregistry/rules/encryption/dekregistry/test-constants.ts renamed to ‎schemaregistry/test/dekregistry/test-constants.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { MOCK_TS } from "../../../../../schemaregistry/rules/encryption/dekregistry/constants";
2-
import { Kek, Dek } from "../../../../../schemaregistry/rules/encryption/dekregistry/dekregistry-client";
1+
import { MOCK_TS } from "../../rules/encryption/dekregistry/constants";
2+
import { Kek, Dek } from "../../rules/encryption/dekregistry/dekregistry-client";
33

44
const TEST_KEK_NAME: string = 'test-kek-name';
55
const TEST_KEK_NAME_2: string = 'test-kek-name2';

‎test/schemaregistry/mock-schemaregistery-client.spec.ts renamed to ‎schemaregistry/test/mock-schemaregistery-client.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { beforeEach, afterEach, describe, expect, it, jest } from '@jest/globals';
2-
import { MockClient } from '../../schemaregistry/mock-schemaregistry-client';
3-
import { Compatibility, Metadata, SchemaInfo, SchemaMetadata } from '../../schemaregistry/schemaregistry-client';
2+
import { MockClient } from '../mock-schemaregistry-client';
3+
import { Compatibility, Metadata, SchemaInfo, SchemaMetadata } from '../schemaregistry-client';
44

55
const schemaString: string = JSON.stringify({
66
type: 'record',

‎test/schemaregistry/oauth-client.spec.ts renamed to ‎schemaregistry/test/oauth-client.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { OAuthClient } from '../../schemaregistry/oauth/oauth-client';
1+
import { OAuthClient } from '../oauth/oauth-client';
22
import { ClientCredentials, AccessToken } from 'simple-oauth2';
33
import { beforeEach, afterEach, describe, expect, it, jest } from '@jest/globals';
44
import * as retryHelper from '@confluentinc/schemaregistry/retry-helper';

‎test/schemaregistry/rest-service.spec.ts renamed to ‎schemaregistry/test/rest-service.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { beforeEach, afterEach, describe, expect, it, jest } from '@jest/globals';
22
import axios from 'axios';
33
import MockAdapter from 'axios-mock-adapter';
4-
import { RestService } from '../../schemaregistry/rest-service';
4+
import { RestService } from '../rest-service';
55
import * as retryHelper from '@confluentinc/schemaregistry/retry-helper';
66
import { maxRetries, retriesWaitMs, retriesMaxWaitMs } from './test-constants';
77

‎test/schemaregistry/schemaregistry-client.spec.ts renamed to ‎schemaregistry/test/schemaregistry-client.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import {
55
SchemaInfo,
66
SchemaMetadata,
77
ServerConfig
8-
} from '../../schemaregistry/schemaregistry-client';
9-
import { RestService } from '../../schemaregistry/rest-service';
8+
} from '../schemaregistry-client';
9+
import { RestService } from '../rest-service';
1010
import { AxiosResponse } from 'axios';
1111
import stringify from "json-stringify-deterministic";
1212
import { beforeEach, afterEach, describe, expect, it, jest } from '@jest/globals';
13-
import { mockClientConfig, mockTtlClientConfig } from '../../test/schemaregistry/test-constants';
13+
import { mockClientConfig, mockTtlClientConfig } from './test-constants';
1414

1515
jest.mock('../../schemaregistry/rest-service');
1616

‎test/schemaregistry/serde/avro.spec.ts renamed to ‎schemaregistry/test/serde/avro.spec.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
import {afterEach, describe, expect, it} from '@jest/globals';
2-
import {ClientConfig} from "../../../schemaregistry/rest-service";
2+
import {ClientConfig} from "../../rest-service";
33
import {
44
AvroDeserializer,
55
AvroDeserializerConfig,
66
AvroSerializer,
77
AvroSerializerConfig
8-
} from "../../../schemaregistry/serde/avro";
9-
import {SerdeType, Serializer} from "../../../schemaregistry/serde/serde";
8+
} from "../../serde/avro";
9+
import {SerdeType, Serializer} from "../../serde/serde";
1010
import {
1111
Client,
1212
Rule,
1313
RuleMode,
1414
RuleSet,
1515
SchemaInfo,
1616
SchemaRegistryClient
17-
} from "../../../schemaregistry/schemaregistry-client";
18-
import {LocalKmsDriver} from "../../../schemaregistry/rules/encryption/localkms/local-driver";
17+
} from "../../schemaregistry-client";
18+
import {LocalKmsDriver} from "../../rules/encryption/localkms/local-driver";
1919
import {
2020
Clock,
2121
FieldEncryptionExecutor
22-
} from "../../../schemaregistry/rules/encryption/encrypt-executor";
23-
import {GcpKmsDriver} from "../../../schemaregistry/rules/encryption/gcpkms/gcp-driver";
24-
import {AwsKmsDriver} from "../../../schemaregistry/rules/encryption/awskms/aws-driver";
25-
import {AzureKmsDriver} from "../../../schemaregistry/rules/encryption/azurekms/azure-driver";
26-
import {HcVaultDriver} from "../../../schemaregistry/rules/encryption/hcvault/hcvault-driver";
22+
} from "../../rules/encryption/encrypt-executor";
23+
import {GcpKmsDriver} from "../../rules/encryption/gcpkms/gcp-driver";
24+
import {AwsKmsDriver} from "../../rules/encryption/awskms/aws-driver";
25+
import {AzureKmsDriver} from "../../rules/encryption/azurekms/azure-driver";
26+
import {HcVaultDriver} from "../../rules/encryption/hcvault/hcvault-driver";
2727
import {JsonataExecutor} from "@confluentinc/schemaregistry/rules/jsonata/jsonata-executor";
2828
import stringify from "json-stringify-deterministic";
2929
import {RuleRegistry} from "@confluentinc/schemaregistry/serde/rule-registry";

‎test/schemaregistry/serde/buffer-wrapper.spec.ts renamed to ‎schemaregistry/test/serde/buffer-wrapper.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { describe, expect, it } from '@jest/globals';
2-
import { BufferWrapper, MAX_VARINT_LEN_32 } from "../../../schemaregistry/serde/buffer-wrapper";
2+
import { BufferWrapper, MAX_VARINT_LEN_32 } from "../../serde/buffer-wrapper";
33

44
describe('BufferWrapper', () => {
55
it('write and read 100', () => {

‎test/schemaregistry/serde/json.spec.ts renamed to ‎schemaregistry/test/serde/json.spec.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import {afterEach, describe, expect, it} from '@jest/globals';
2-
import {ClientConfig} from "../../../schemaregistry/rest-service";
3-
import {SerdeType, SerializationError, Serializer} from "../../../schemaregistry/serde/serde";
2+
import {ClientConfig} from "../../rest-service";
3+
import {SerdeType, SerializationError, Serializer} from "../../serde/serde";
44
import {
55
Client,
66
Rule,
77
RuleMode,
88
RuleSet,
99
SchemaInfo,
1010
SchemaRegistryClient
11-
} from "../../../schemaregistry/schemaregistry-client";
12-
import {LocalKmsDriver} from "../../../schemaregistry/rules/encryption/localkms/local-driver";
13-
import {FieldEncryptionExecutor} from "../../../schemaregistry/rules/encryption/encrypt-executor";
11+
} from "../../schemaregistry-client";
12+
import {LocalKmsDriver} from "../../rules/encryption/localkms/local-driver";
13+
import {FieldEncryptionExecutor} from "../../rules/encryption/encrypt-executor";
1414
import {
1515
JsonDeserializer, JsonDeserializerConfig,
1616
JsonSerializer,
1717
JsonSerializerConfig
18-
} from "../../../schemaregistry/serde/json";
18+
} from "../../serde/json";
1919
import {RuleRegistry} from "@confluentinc/schemaregistry/serde/rule-registry";
2020
import stringify from "json-stringify-deterministic";
2121
import {JsonataExecutor} from "@confluentinc/schemaregistry/rules/jsonata/jsonata-executor";

‎test/schemaregistry/serde/protobuf.spec.ts renamed to ‎schemaregistry/test/serde/protobuf.spec.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import {afterEach, describe, expect, it} from '@jest/globals';
2-
import {ClientConfig} from "../../../schemaregistry/rest-service";
2+
import {ClientConfig} from "../../rest-service";
33
import {
44
ProtobufDeserializer, ProtobufDeserializerConfig,
55
ProtobufSerializer, ProtobufSerializerConfig,
6-
} from "../../../schemaregistry/serde/protobuf";
7-
import {SerdeType} from "../../../schemaregistry/serde/serde";
6+
} from "../../serde/protobuf";
7+
import {SerdeType} from "../../serde/serde";
88
import {
99
Rule,
1010
RuleMode,
1111
RuleSet,
1212
SchemaInfo,
1313
SchemaRegistryClient
14-
} from "../../../schemaregistry/schemaregistry-client";
15-
import {LocalKmsDriver} from "../../../schemaregistry/rules/encryption/localkms/local-driver";
16-
import {FieldEncryptionExecutor} from "../../../schemaregistry/rules/encryption/encrypt-executor";
14+
} from "../../schemaregistry-client";
15+
import {LocalKmsDriver} from "../../rules/encryption/localkms/local-driver";
16+
import {FieldEncryptionExecutor} from "../../rules/encryption/encrypt-executor";
1717
import {AuthorSchema, file_test_schemaregistry_serde_example, PizzaSchema} from "./test/example_pb";
1818
import {create, toBinary} from "@bufbuild/protobuf";
1919
import {FileDescriptorProtoSchema} from "@bufbuild/protobuf/wkt";

‎test/schemaregistry/serde/test/cycle_pb.ts renamed to ‎schemaregistry/test/serde/test/cycle_pb.ts

File renamed without changes.

‎test/schemaregistry/serde/test/dep_pb.ts renamed to ‎schemaregistry/test/serde/test/dep_pb.ts

File renamed without changes.

‎test/schemaregistry/serde/test/example_pb.ts renamed to ‎schemaregistry/test/serde/test/example_pb.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv1";
66
import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv1";
7-
import { file_confluent_meta } from "../../../../schemaregistry/confluent/meta_pb";
7+
import { file_confluent_meta } from "../../../confluent/meta_pb";
88
import type { Message } from "@bufbuild/protobuf";
99

1010
/**

‎test/schemaregistry/serde/test/nested_pb.ts renamed to ‎schemaregistry/test/serde/test/nested_pb.ts

File renamed without changes.

‎test/schemaregistry/serde/test/newerwidget_pb.ts renamed to ‎schemaregistry/test/serde/test/newerwidget_pb.ts

File renamed without changes.

‎test/schemaregistry/serde/test/newwidget_pb.ts renamed to ‎schemaregistry/test/serde/test/newwidget_pb.ts

File renamed without changes.

‎test/schemaregistry/serde/test/test_pb.ts renamed to ‎schemaregistry/test/serde/test/test_pb.ts

File renamed without changes.

‎test/schemaregistry/serde/test/widget_pb.ts renamed to ‎schemaregistry/test/serde/test/widget_pb.ts

File renamed without changes.

‎test/schemaregistry/serde/wildcard-matcher.spec.ts renamed to ‎schemaregistry/test/serde/wildcard-matcher.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { match } from '../../../schemaregistry/serde/wildcard-matcher';
1+
import { match } from '../../serde/wildcard-matcher';
22
import { describe, expect, it } from '@jest/globals';
33

44
describe('WildcardMatcher', () => {

‎test/schemaregistry/test-constants.ts renamed to ‎schemaregistry/test/test-constants.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { CreateAxiosDefaults } from 'axios';
2-
import { ClientConfig, BasicAuthCredentials } from '../../schemaregistry/rest-service';
2+
import { ClientConfig, BasicAuthCredentials } from '../rest-service';
33

44
const baseUrls = ['http://localhost:8081'];
55

0 commit comments

Comments
 (0)