Skip to content

Commit ed4aed4

Browse files
ReneSchwarzerReneSchwarzer
committed
refactor: restructure WqlParser, general improvements and minor bugs
1 parent 3e98051 commit ed4aed4

58 files changed

Lines changed: 936 additions & 356 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/concept.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -368,10 +368,10 @@ methods and properties of this class:
368368
- `Task DeleteAsync<TIndexItem>(TIndexItem item)`: Removes an item from the index asynchronously.
369369
- `void Clear<TIndexItem>()`: Removed all data from the index.
370370
- `Task ClearAsync<TIndexItem>()`: Removed all data from the index asynchronously.
371-
- `IQueryable<TIndexItem> Retrieve<TIndexItem>(string wql)`: Executes a WQL statement.
372-
- `IQueryable<TIndexItem> Retrieve<TIndexItem>(IWqlStatement<TIndexItem> wql)`: Executes a WQL statement.
373-
- `Task<IQueryable<TIndexItem>> RetrieveAsync<TIndexItem>(string wql)`: Executes a wql statement asynchronously.
374-
- `Task<IQueryable<TIndexItem>> RetrieveAsync<TIndexItem>(IWqlStatement<TIndexItem> wql)`: Executes a wql statement asynchronously.
371+
- `IEnumerable<TIndexItem> Retrieve<TIndexItem>(string wql)`: Executes a WQL statement.
372+
- `IEnumerable<TIndexItem> Retrieve<TIndexItem>(IWqlStatement<TIndexItem> wql)`: Executes a WQL statement.
373+
- `Task<IEnumerable<TIndexItem>> RetrieveAsync<TIndexItem>(string wql)`: Executes a wql statement asynchronously.
374+
- `Task<IEnumerable<TIndexItem>> RetrieveAsync<TIndexItem>(IWqlStatement<TIndexItem> wql)`: Executes a wql statement asynchronously.
375375
- `IEnumerable<TIndexItem> All<TIndexItem>()`: Returns all documents from the index.
376376
- `IIndexDocument<TIndexItem> GetIndexDocument<TIndexItem>()`: Returns an index type based on its type.
377377
- `void Dispose()`: Disposes of the resources used by the current instance.

‎src/WebExpress.WebIndex.Test/IndexManager/UnitTestIndexManagerMemoryA.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void Add()
139139
var item = IndexManager.Retrieve<UnitTestIndexTestDocumentA>("text ~ 'Aurora'");
140140

141141
Assert.NotNull(item);
142-
Assert.Equal(1, item.Count());
142+
Assert.Single(item);
143143

144144
Postconditions();
145145
}
@@ -165,11 +165,11 @@ public void Update()
165165
// validation
166166
var item = IndexManager.Retrieve<UnitTestIndexTestDocumentA>("text ~ 'Aurora'");
167167
Assert.NotNull(item);
168-
Assert.Equal(1, item.Count());
168+
Assert.Single(item);
169169

170170
item = IndexManager.Retrieve<UnitTestIndexTestDocumentA>("text ~ 'Helge'");
171171
Assert.NotNull(item);
172-
Assert.Equal(1, item.Count());
172+
Assert.Single(item);
173173

174174
Postconditions();
175175
}
@@ -195,11 +195,11 @@ await IndexManager.UpdateAsync(new UnitTestIndexTestDocumentA()
195195
// validation
196196
var item = IndexManager.Retrieve<UnitTestIndexTestDocumentA>("text ~ 'Aurora'");
197197
Assert.NotNull(item);
198-
Assert.Equal(1, item.Count());
198+
Assert.Single(item);
199199

200200
item = IndexManager.Retrieve<UnitTestIndexTestDocumentA>("text ~ 'Helge'");
201201
Assert.NotNull(item);
202-
Assert.Equal(1, item.Count());
202+
Assert.Single(item);
203203

204204
Postconditions();
205205
}

‎src/WebExpress.WebIndex.Test/IndexManager/UnitTestIndexManagerMemoryB.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void Add()
139139
// validation
140140
var item = IndexManager.Retrieve<UnitTestIndexTestDocumentB>("name = 'Aurora'");
141141
Assert.NotNull(item);
142-
Assert.Equal(1, item.Count());
142+
Assert.Single(item);
143143

144144
Postconditions();
145145
}
@@ -166,7 +166,7 @@ public void Update()
166166
// validation
167167
var item = IndexManager.Retrieve<UnitTestIndexTestDocumentB>("name = 'Aurora'");
168168
Assert.NotNull(item);
169-
Assert.Equal(1, item.Count());
169+
Assert.Single(item);
170170

171171
Postconditions();
172172
}
@@ -193,7 +193,7 @@ await IndexManager.UpdateAsync(new UnitTestIndexTestDocumentB()
193193
// validation
194194
var item = IndexManager.Retrieve<UnitTestIndexTestDocumentB>("name = 'Aurora'");
195195
Assert.NotNull(item);
196-
Assert.Equal(1, item.Count());
196+
Assert.Single(item);
197197

198198
Postconditions();
199199
}

‎src/WebExpress.WebIndex.Test/IndexManager/UnitTestIndexManagerMemoryC.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void Add()
145145
// validation
146146
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentC>("text = 'Aurora'");
147147
Assert.NotNull(items);
148-
Assert.Equal(1, items.Count());
148+
Assert.Single(items);
149149

150150
Postconditions();
151151
}
@@ -172,7 +172,7 @@ public void Update()
172172
// validation
173173
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentC>("text = 'Aurora'");
174174
Assert.NotNull(items);
175-
Assert.Equal(1, items.Count());
175+
Assert.Single(items);
176176

177177
Postconditions();
178178
}
@@ -199,7 +199,7 @@ await IndexManager.UpdateAsync(new UnitTestIndexTestDocumentC()
199199
// validation
200200
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentC>("text = 'Aurora'");
201201
Assert.NotNull(items);
202-
Assert.Equal(1, items.Count());
202+
Assert.Single(items);
203203

204204
Postconditions();
205205
}

‎src/WebExpress.WebIndex.Test/IndexManager/UnitTestIndexManagerMemoryD.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void Add()
139139
// validation
140140
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentD>("firstname = 'Aurora'");
141141
Assert.NotNull(items);
142-
Assert.Equal(1, items.Count());
142+
Assert.Single(items);
143143

144144
Postconditions();
145145
}
@@ -166,7 +166,7 @@ public void Update()
166166
// validation
167167
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentD>("firstname = 'Aurora'");
168168
Assert.NotNull(items);
169-
Assert.Equal(1, items.Count());
169+
Assert.Single(items);
170170

171171
Postconditions();
172172
}
@@ -193,7 +193,7 @@ await IndexManager.UpdateAsync(new UnitTestIndexTestDocumentD()
193193
// validation
194194
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentD>("firstname = 'Aurora'");
195195
Assert.NotNull(items);
196-
Assert.Equal(1, items.Count());
196+
Assert.Single(items);
197197

198198
Postconditions();
199199
}

‎src/WebExpress.WebIndex.Test/IndexManager/UnitTestIndexManagerMemoryE.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public void Add()
140140
// validation
141141
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentE>("name = 'Aurora'");
142142
Assert.NotNull(items);
143-
Assert.Equal(1, items.Count());
143+
Assert.Single(items);
144144

145145
Postconditions();
146146
}
@@ -167,7 +167,7 @@ public void Update()
167167
// validation
168168
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentE>("name = 'Aurora'");
169169
Assert.NotNull(items);
170-
Assert.Equal(1, items.Count());
170+
Assert.Single(items);
171171

172172
Postconditions();
173173
}
@@ -193,7 +193,7 @@ await IndexManager.UpdateAsync(new UnitTestIndexTestDocumentE()
193193

194194
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentE>("name = 'Aurora'");
195195
Assert.NotNull(items);
196-
Assert.Equal(1, items.Count());
196+
Assert.Single(items);
197197

198198
Postconditions();
199199
}

‎src/WebExpress.WebIndex.Test/IndexManager/UnitTestIndexManagerMemoryF.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void Add(string id, string name)
143143
// validation
144144
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentF>($"name = '{name}'");
145145
Assert.NotNull(items);
146-
Assert.Equal(1, items.Count());
146+
Assert.Single(items);
147147

148148
Postconditions();
149149
}
@@ -197,7 +197,7 @@ public void Update()
197197
// validation
198198
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentF>("name = 'Aurora'");
199199
Assert.NotNull(items);
200-
Assert.Equal(1, items.Count());
200+
Assert.Single(items);
201201

202202
Postconditions();
203203
}
@@ -224,7 +224,7 @@ await IndexManager.UpdateAsync(new UnitTestIndexTestDocumentF()
224224
// validation
225225
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentF>("name = 'Aurora'");
226226
Assert.NotNull(items);
227-
Assert.Equal(1, items.Count());
227+
Assert.Single(items);
228228

229229
Postconditions();
230230
}

‎src/WebExpress.WebIndex.Test/IndexManager/UnitTestIndexManagerStorageA.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void Add()
136136
// validation
137137
var item = IndexManager.Retrieve<UnitTestIndexTestDocumentA>("text ~ 'Aurora'");
138138
Assert.NotNull(item);
139-
Assert.Equal(1, item.Count());
139+
Assert.Single(item);
140140

141141
Postconditions();
142142
}
@@ -217,11 +217,11 @@ public void Update()
217217
// validation
218218
var item = IndexManager.Retrieve<UnitTestIndexTestDocumentA>("text ~ 'Aurora'");
219219
Assert.NotNull(item);
220-
Assert.Equal(1, item.Count());
220+
Assert.Single(item);
221221

222222
item = IndexManager.Retrieve<UnitTestIndexTestDocumentA>("text ~ 'Helge'");
223223
Assert.NotNull(item);
224-
Assert.Equal(1, item.Count());
224+
Assert.Single(item);
225225

226226
Postconditions();
227227
}
@@ -247,11 +247,11 @@ await IndexManager.UpdateAsync(new UnitTestIndexTestDocumentA()
247247
// validation
248248
var item = IndexManager.Retrieve<UnitTestIndexTestDocumentA>("text ~ 'Aurora'");
249249
Assert.NotNull(item);
250-
Assert.Equal(1, item.Count());
250+
Assert.Single(item);
251251

252252
item = IndexManager.Retrieve<UnitTestIndexTestDocumentA>("text ~ 'Helge'");
253253
Assert.NotNull(item);
254-
Assert.Equal(1, item.Count());
254+
Assert.Single(item);
255255

256256
Postconditions();
257257
}

‎src/WebExpress.WebIndex.Test/IndexManager/UnitTestIndexManagerStorageB.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public void Add()
168168
// validation
169169
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentB>("name = 'Aurora'");
170170
Assert.NotNull(items);
171-
Assert.Equal(1, items.Count());
171+
Assert.Single(items);
172172

173173
Postconditions();
174174
}
@@ -195,7 +195,7 @@ public void Update()
195195
// validation
196196
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentB>("name = 'Aurora'");
197197
Assert.NotNull(items);
198-
Assert.Equal(1, items.Count());
198+
Assert.Single(items);
199199

200200
Postconditions();
201201
}
@@ -222,7 +222,7 @@ await IndexManager.UpdateAsync(new UnitTestIndexTestDocumentB()
222222
// validation
223223
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentB>("name = 'Aurora'");
224224
Assert.NotNull(items);
225-
Assert.Equal(1, items.Count());
225+
Assert.Single(items);
226226

227227
Postconditions();
228228
}

‎src/WebExpress.WebIndex.Test/IndexManager/UnitTestIndexManagerStorageC.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public void Add()
147147
// validation
148148
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentC>("text = 'Aurora'");
149149
Assert.NotNull(items);
150-
Assert.Equal(1, items.Count());
150+
Assert.Single(items);
151151

152152
Postconditions();
153153
}
@@ -174,7 +174,7 @@ public void Update()
174174
// validation
175175
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentC>("text = 'Aurora'");
176176
Assert.NotNull(items);
177-
Assert.Equal(1, items.Count());
177+
Assert.Single(items);
178178

179179
Postconditions();
180180
}
@@ -201,7 +201,7 @@ await IndexManager.UpdateAsync(new UnitTestIndexTestDocumentC()
201201
// validation
202202
var items = IndexManager.Retrieve<UnitTestIndexTestDocumentC>("text = 'Aurora'");
203203
Assert.NotNull(items);
204-
Assert.Equal(1, items.Count());
204+
Assert.Single(items);
205205

206206
Postconditions();
207207
}

0 commit comments

Comments
 (0)