Skip to content

Commit cbfd513

Browse files
committed
Add more tests where PartitionKey.None maps to PartitionKey.Undefined
1 parent 94aea28 commit cbfd513

File tree

2 files changed

+13
-41
lines changed

2 files changed

+13
-41
lines changed

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Query/BypassQueryParsingTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ async Task ImplementationAsync(Container container, IReadOnlyList<CosmosObject>
4343

4444
await this.CreateIngestQueryDeleteAsync(
4545
ConnectionModes.Direct | ConnectionModes.Gateway,
46-
CollectionTypes.NonPartitioned,
46+
CollectionTypes.NonPartitioned | CollectionTypes.SinglePartition | CollectionTypes.MultiPartition,
4747
documents,
48-
ImplementationAsync);
48+
ImplementationAsync,
49+
"/undefinedPartitionKey");
4950
}
5051

5152
private static IReadOnlyList<string> CreateDocuments(int documentCount)

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.EmulatorTests/Query/OptimisticDirectExecutionQueryTests.cs

Lines changed: 10 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,6 @@ public async Task TestPassingOptimisticDirectExecutionQueries()
4444
enableOptimisticDirectExecution: true,
4545
pageSizeOptions: PageSizeOptions.NonGroupByPageSizeOptions,
4646
expectedPipelineType: TestInjections.PipelineType.OptimisticDirectExecution),
47-
CreateInput(
48-
query: $"SELECT TOP 5 VALUE r.numberField FROM r ORDER BY r.{PartitionKeyField}",
49-
expectedResult: empty,
50-
partitionKey: PartitionKey.None,
51-
enableOptimisticDirectExecution: true,
52-
pageSizeOptions: PageSizeOptions.NonGroupByPageSizeOptions,
53-
expectedPipelineType: TestInjections.PipelineType.OptimisticDirectExecution),
5447
CreateInput(
5548
query: $"SELECT TOP 5 VALUE r.numberField FROM r ORDER BY r.{PartitionKeyField}",
5649
expectedResult: first5Integers,
@@ -67,13 +60,6 @@ public async Task TestPassingOptimisticDirectExecutionQueries()
6760
enableOptimisticDirectExecution: true,
6861
pageSizeOptions: PageSizeOptions.NonGroupByPageSizeOptions,
6962
expectedPipelineType: TestInjections.PipelineType.OptimisticDirectExecution),
70-
CreateInput(
71-
query: $"SELECT VALUE r.numberField FROM r",
72-
expectedResult: empty,
73-
partitionKey: PartitionKey.None,
74-
enableOptimisticDirectExecution: true,
75-
pageSizeOptions: PageSizeOptions.NonGroupByPageSizeOptions,
76-
expectedPipelineType: TestInjections.PipelineType.OptimisticDirectExecution),
7763
CreateInput(
7864
query: $"SELECT VALUE r.numberField FROM r",
7965
expectedResult: first7Integers,
@@ -90,13 +76,6 @@ public async Task TestPassingOptimisticDirectExecutionQueries()
9076
enableOptimisticDirectExecution: true,
9177
pageSizeOptions: PageSizeOptions.NonGroupByPageSizeOptions,
9278
expectedPipelineType: TestInjections.PipelineType.OptimisticDirectExecution),
93-
CreateInput(
94-
query: $"SELECT DISTINCT VALUE r.{NumberField} FROM r ORDER BY r.{NumberField} DESC",
95-
expectedResult: empty,
96-
partitionKey: PartitionKey.None,
97-
enableOptimisticDirectExecution: true,
98-
pageSizeOptions: PageSizeOptions.NonGroupByPageSizeOptions,
99-
expectedPipelineType: TestInjections.PipelineType.OptimisticDirectExecution),
10079
CreateInput(
10180
query: $"SELECT DISTINCT VALUE r.{NumberField} FROM r ORDER BY r.{NumberField} DESC",
10281
expectedResult: first7IntegersReversed,
@@ -113,13 +92,6 @@ public async Task TestPassingOptimisticDirectExecutionQueries()
11392
enableOptimisticDirectExecution: true,
11493
pageSizeOptions: PageSizeOptions.GroupByPageSizeOptions,
11594
expectedPipelineType: TestInjections.PipelineType.OptimisticDirectExecution),
116-
CreateInput(
117-
query: $"SELECT TOP 5 VALUE r.{NumberField} FROM r GROUP BY r.{NumberField}",
118-
expectedResult: empty,
119-
partitionKey: PartitionKey.None,
120-
enableOptimisticDirectExecution: true,
121-
pageSizeOptions: PageSizeOptions.GroupByPageSizeOptions,
122-
expectedPipelineType: TestInjections.PipelineType.OptimisticDirectExecution),
12395
CreateInput(
12496
query: $"SELECT TOP 5 VALUE r.{NumberField} FROM r GROUP BY r.{NumberField}",
12597
expectedResult: first5Integers,
@@ -136,13 +108,6 @@ public async Task TestPassingOptimisticDirectExecutionQueries()
136108
pageSizeOptions: PageSizeOptions.NonGroupByPageSizeOptions,
137109
enableOptimisticDirectExecution: true,
138110
expectedPipelineType: TestInjections.PipelineType.OptimisticDirectExecution),
139-
CreateInput(
140-
query: $"SELECT VALUE r.numberField FROM r WHERE r.{NumberField} BETWEEN 0 AND {NumberOfDocuments} OFFSET 1 LIMIT 1",
141-
expectedResult: empty,
142-
partitionKey: PartitionKey.None,
143-
pageSizeOptions: PageSizeOptions.NonGroupByPageSizeOptions,
144-
enableOptimisticDirectExecution: true,
145-
expectedPipelineType: TestInjections.PipelineType.OptimisticDirectExecution),
146111
CreateInput(
147112
query: $"SELECT VALUE r.numberField FROM r WHERE r.{NumberField} BETWEEN 0 AND {NumberOfDocuments} OFFSET 1 LIMIT 1",
148113
expectedResult: new List<int> { 1 },
@@ -221,7 +186,7 @@ await this.CreateIngestQueryDeleteAsync(
221186
}
222187

223188
[TestMethod]
224-
public async Task TestNonPartitionedQueriesWithPartitionKeyNone()
189+
public async Task TestQueriesWithPartitionKeyNone()
225190
{
226191
int documentCount = 400;
227192
IReadOnlyList<int> first400Integers = Enumerable.Range(0, documentCount).ToList();
@@ -287,13 +252,19 @@ public async Task TestNonPartitionedQueriesWithPartitionKeyNone()
287252
expectedPipelineType: TestInjections.PipelineType.OptimisticDirectExecution),
288253
};
289254

290-
IReadOnlyList<string> documents = CreateDocuments(documentCount, PartitionKeyField, NumberField, NullField);
255+
List<string> documents = new List<string>(documentCount);
256+
for (int i = 0; i < documentCount; ++i)
257+
{
258+
string document = $@"{{ {NumberField}: {i}, {NullField}: null }}";
259+
documents.Add(document);
260+
}
291261

292262
await this.CreateIngestQueryDeleteAsync(
293263
ConnectionModes.Direct | ConnectionModes.Gateway,
294-
CollectionTypes.NonPartitioned,
264+
CollectionTypes.NonPartitioned | CollectionTypes.SinglePartition | CollectionTypes.MultiPartition,
295265
documents,
296-
(container, documents) => RunTests(testCases, container));
266+
(container, documents) => RunTests(testCases, container),
267+
"/undefinedPartitionKey");
297268
}
298269

299270
[TestMethod]

0 commit comments

Comments
 (0)