Skip to content

Commit ca9e433

Browse files
HendyHendy
committed
#48 renamed lookQuery.Query() to lookQuery.Run()
1 parent 87686c8 commit ca9e433

12 files changed

+40
-40
lines changed

‎src/Our.Umbraco.Look.Tests/QueryTests/DateQueryTests.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void Boundary_Inclusive()
3737
lookQuery.DateQuery.Before = new DateTime(2000, 1, 3);
3838
lookQuery.DateQuery.Boundary = DateBoundary.Inclusive;
3939

40-
Assert.AreEqual(3, lookQuery.Query().TotalItemCount);
40+
Assert.AreEqual(3, lookQuery.Run().TotalItemCount);
4141
}
4242

4343
[TestMethod]
@@ -49,7 +49,7 @@ public void Boundary_Exclusive()
4949
lookQuery.DateQuery.After = new DateTime(2000, 1, 10);
5050
lookQuery.DateQuery.Boundary = DateBoundary.Exclusive;
5151

52-
Assert.AreEqual(3, lookQuery.Query().TotalItemCount);
52+
Assert.AreEqual(3, lookQuery.Run().TotalItemCount);
5353
}
5454

5555
[TestMethod]
@@ -61,7 +61,7 @@ public void Boundary_Inclusive_Exclusive()
6161
lookQuery.DateQuery.Before = new DateTime(2000, 1, 1);
6262
lookQuery.DateQuery.Boundary = DateBoundary.BeforeInclusiveAfterExclusive;
6363

64-
Assert.AreEqual(2, lookQuery.Query().TotalItemCount);
64+
Assert.AreEqual(2, lookQuery.Run().TotalItemCount);
6565
}
6666

6767
[TestMethod]
@@ -73,7 +73,7 @@ public void Boundary_Exclusive_Inclusive()
7373
lookQuery.DateQuery.Before = new DateTime(2000, 1, 1);
7474
lookQuery.DateQuery.Boundary = DateBoundary.BeforeExclusiveAfterInclusive;
7575

76-
Assert.AreEqual(1, lookQuery.Query().TotalItemCount);
76+
Assert.AreEqual(1, lookQuery.Run().TotalItemCount);
7777
}
7878

7979
}

‎src/Our.Umbraco.Look.Tests/QueryTests/FacetQueryTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void Facet_Counts()
4040
lookQuery.TagQuery.All = new LookTag[] { _red };
4141
lookQuery.TagQuery.FacetOn = new TagFacetQuery(_colour);
4242

43-
var lookResult = LookService.Query(lookQuery);
43+
var lookResult = LookService.RunQuery(lookQuery);
4444

4545
Assert.IsNotNull(lookResult);
4646
Assert.IsTrue(lookResult.Success);
@@ -65,7 +65,7 @@ public void Query_Apply_Random_Facet_Then_Re_Query()
6565
lookQuery.TagQuery.FacetOn = new TagFacetQuery(_colour);
6666

6767
// first query
68-
var lookResult = LookService.Query(lookQuery);
68+
var lookResult = LookService.RunQuery(lookQuery);
6969

7070
Assert.IsNotNull(lookResult);
7171
Assert.IsTrue(lookResult.Success);
@@ -86,7 +86,7 @@ public void Query_Apply_Random_Facet_Then_Re_Query()
8686
lookQuery.ApplyFacet(facet);
8787

8888
// second query
89-
lookResult = LookService.Query(lookQuery);
89+
lookResult = LookService.RunQuery(lookQuery);
9090

9191
Assert.IsNotNull(lookResult);
9292
Assert.IsTrue(lookResult.Success);

‎src/Our.Umbraco.Look.Tests/QueryTests/LocationQueryTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void Distance_Sorting()
3333

3434
lookQuery.SortOn = SortOn.Distance;
3535

36-
var lookResult = LookService.Query(lookQuery);
36+
var lookResult = LookService.RunQuery(lookQuery);
3737

3838
Assert.IsTrue(lookResult.Success);
3939
Assert.IsTrue(lookResult.TotalItemCount == 4);
@@ -55,7 +55,7 @@ public void Max_Distance()
5555
lookQuery.LocationQuery.Location = _london;
5656
lookQuery.LocationQuery.MaxDistance = new Distance(300, DistanceUnit.Miles);
5757

58-
var lookResult = LookService.Query(lookQuery);
58+
var lookResult = LookService.RunQuery(lookQuery);
5959

6060
Assert.IsTrue(lookResult.Success);
6161
Assert.IsTrue(lookResult.TotalItemCount == 2);

‎src/Our.Umbraco.Look.Tests/QueryTests/LookQueryCompiledTests.cs

+11-11
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void New_Query_No_Clauses_Not_Compiled()
2222
{
2323
var lookQuery = new LookQuery(TestHelper.GetSearchingContext());
2424

25-
var lookResult = LookService.Query(lookQuery);
25+
var lookResult = LookService.RunQuery(lookQuery);
2626

2727
Assert.IsNull(lookQuery.Compiled);
2828
}
@@ -32,7 +32,7 @@ public void New_Query_Executed_To_Make_Compiled()
3232
{
3333
var lookQuery = new LookQuery(TestHelper.GetSearchingContext()) { NodeQuery = new NodeQuery("thing") };
3434

35-
var lookResult = LookService.Query(lookQuery);
35+
var lookResult = LookService.RunQuery(lookQuery);
3636

3737
Assert.IsNotNull(lookQuery.Compiled);
3838
}
@@ -43,7 +43,7 @@ public void Invalidate_Compiled_By_Raw_Query_Change()
4343
{
4444
var lookQuery = new LookQuery(TestHelper.GetSearchingContext()) { NodeQuery = new NodeQuery("thing") };
4545

46-
var lookResult = LookService.Query(lookQuery);
46+
var lookResult = LookService.RunQuery(lookQuery);
4747

4848
lookQuery.RawQuery = "+field:value";
4949

@@ -55,7 +55,7 @@ public void Invalidate_Compiled_By_Node_Query_Change()
5555
{
5656
var lookQuery = new LookQuery(TestHelper.GetSearchingContext()) { NodeQuery = new NodeQuery("thing") };
5757

58-
var lookResult = LookService.Query(lookQuery);
58+
var lookResult = LookService.RunQuery(lookQuery);
5959

6060
lookQuery.NodeQuery = new NodeQuery();
6161

@@ -67,7 +67,7 @@ public void Invalidate_Compiled_By_Name_Query_Change()
6767
{
6868
var lookQuery = new LookQuery(TestHelper.GetSearchingContext()) { NodeQuery = new NodeQuery("thing") };
6969

70-
var lookResult = LookService.Query(lookQuery);
70+
var lookResult = LookService.RunQuery(lookQuery);
7171

7272
lookQuery.NameQuery = new NameQuery();
7373
lookQuery.NameQuery.StartsWith = "new value";
@@ -80,7 +80,7 @@ public void Invalidate_Compiled_By_Date_Query_Change()
8080
{
8181
var lookQuery = new LookQuery(TestHelper.GetSearchingContext()) { NodeQuery = new NodeQuery("thing") };
8282

83-
var lookResult = LookService.Query(lookQuery);
83+
var lookResult = LookService.RunQuery(lookQuery);
8484

8585
lookQuery.DateQuery = new DateQuery();
8686
lookQuery.DateQuery.Before = DateTime.MaxValue;
@@ -93,7 +93,7 @@ public void Invalidate_Compiled_By_Text_Query_Change()
9393
{
9494
var lookQuery = new LookQuery(TestHelper.GetSearchingContext()) { NodeQuery = new NodeQuery("thing") };
9595

96-
var lookResult = LookService.Query(lookQuery);
96+
var lookResult = LookService.RunQuery(lookQuery);
9797

9898
lookQuery.TextQuery = new TextQuery();
9999
lookQuery.TextQuery.GetHighlight = true;
@@ -106,7 +106,7 @@ public void Invalidate_Compiled_By_Tag_Query_Change()
106106
{
107107
var lookQuery = new LookQuery(TestHelper.GetSearchingContext()) { NodeQuery = new NodeQuery("thing") };
108108

109-
var lookResult = LookService.Query(lookQuery);
109+
var lookResult = LookService.RunQuery(lookQuery);
110110

111111
lookQuery.TagQuery = new TagQuery();
112112
lookQuery.TagQuery.FacetOn = new TagFacetQuery();
@@ -119,7 +119,7 @@ public void Invalidate_Compiled_By_Location_Query_Change()
119119
{
120120
var lookQuery = new LookQuery(TestHelper.GetSearchingContext()) { NodeQuery = new NodeQuery("thing") };
121121

122-
var lookResult = LookService.Query(lookQuery);
122+
var lookResult = LookService.RunQuery(lookQuery);
123123

124124
lookQuery.LocationQuery = new LocationQuery();
125125
lookQuery.LocationQuery.MaxDistance = new Distance(1, DistanceUnit.Miles);
@@ -136,13 +136,13 @@ public void Re_Execute_Compiled_Expect_Same_Results()
136136

137137
Assert.IsNull(lookQuery.Compiled);
138138

139-
var lookResults = LookService.Query(lookQuery);
139+
var lookResults = LookService.RunQuery(lookQuery);
140140
var total = lookResults.TotalItemCount;
141141

142142
Assert.IsNotNull(lookQuery.Compiled);
143143
Assert.IsTrue(total > 0);
144144

145-
Assert.AreEqual(total, LookService.Query(lookQuery).TotalItemCount);
145+
Assert.AreEqual(total, LookService.RunQuery(lookQuery).TotalItemCount);
146146
}
147147
}
148148
}

‎src/Our.Umbraco.Look.Tests/QueryTests/LookQueryTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class LookQueryTests
99
[TestMethod]
1010
public void Null_Query()
1111
{
12-
var lookResult = LookService.Query(null);
12+
var lookResult = LookService.RunQuery(null);
1313

1414
Assert.IsNotNull(lookResult);
1515
Assert.IsFalse(lookResult.Success);
@@ -21,7 +21,7 @@ public void Empty_Query()
2121
{
2222
var lookQuery = new LookQuery(TestHelper.GetSearchingContext());
2323

24-
var lookResult = LookService.Query(lookQuery);
24+
var lookResult = LookService.RunQuery(lookQuery);
2525

2626
Assert.IsNotNull(lookResult);
2727
Assert.IsFalse(lookResult.Success);
@@ -36,7 +36,7 @@ public void Query_With_Node_Type_Clause()
3636
lookQuery.NodeQuery = new NodeQuery();
3737
lookQuery.NodeQuery.Types = new PublishedItemType[] { PublishedItemType.Content };
3838

39-
var lookResult = LookService.Query(lookQuery);
39+
var lookResult = LookService.RunQuery(lookQuery);
4040

4141
Assert.IsNotNull(lookResult);
4242
Assert.IsTrue(lookResult.Success);

‎src/Our.Umbraco.Look.Tests/QueryTests/NameQueryTests.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void Is()
2424
lookQuery.NameQuery = new NameQuery();
2525
lookQuery.NameQuery.Is = "123";
2626

27-
var lookResult = LookService.Query(lookQuery);
27+
var lookResult = LookService.RunQuery(lookQuery);
2828

2929
Assert.IsTrue(lookResult.Success);
3030
Assert.IsTrue(lookResult.TotalItemCount == 1);
@@ -40,7 +40,7 @@ public void Is_And_Starts_With()
4040
lookQuery.NameQuery.Is = "123";
4141
lookQuery.NameQuery.StartsWith = "12";
4242

43-
var lookResult = LookService.Query(lookQuery);
43+
var lookResult = LookService.RunQuery(lookQuery);
4444

4545
Assert.IsTrue(lookResult.TotalItemCount > 0);
4646
}
@@ -54,7 +54,7 @@ public void Is_And_Ends_With()
5454
lookQuery.NameQuery.Is = "123";
5555
lookQuery.NameQuery.EndsWith= "23";
5656

57-
var lookResult = LookService.Query(lookQuery);
57+
var lookResult = LookService.RunQuery(lookQuery);
5858

5959
Assert.IsTrue(lookResult.TotalItemCount > 0);
6060
}
@@ -69,7 +69,7 @@ public void Is_And_Starts_With_And_Ends_With()
6969
lookQuery.NameQuery.StartsWith = "12";
7070
lookQuery.NameQuery.EndsWith = "23";
7171

72-
var lookResult = LookService.Query(lookQuery);
72+
var lookResult = LookService.RunQuery(lookQuery);
7373

7474
Assert.IsTrue(lookResult.TotalItemCount > 0);
7575
}
@@ -83,7 +83,7 @@ public void Conflicting_Query_Is_And_Starts_With()
8383
lookQuery.NameQuery.Is = "123";
8484
lookQuery.NameQuery.StartsWith = "xyz";
8585

86-
var lookResult = LookService.Query(lookQuery);
86+
var lookResult = LookService.RunQuery(lookQuery);
8787

8888
Assert.IsFalse(lookResult.Success);
8989
}
@@ -97,7 +97,7 @@ public void Conflicting_Query_Is_And_Ends_With()
9797
lookQuery.NameQuery.Is = "123";
9898
lookQuery.NameQuery.EndsWith = "xyz";
9999

100-
var lookResult = LookService.Query(lookQuery);
100+
var lookResult = LookService.RunQuery(lookQuery);
101101

102102
Assert.IsFalse(lookResult.Success);
103103
}

‎src/Our.Umbraco.Look.Tests/QueryTests/RequestFieldsTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void Look_Fields_Only()
3434
lookQuery.RequestFields = RequestFields.LookFieldsOnly;
3535
lookQuery.RawQuery = $"+{TEST_FIELD}:Not_Look_Value";
3636

37-
var lookResult = lookQuery.Query();
37+
var lookResult = lookQuery.Run();
3838

3939
Assert.AreEqual(1, lookResult.TotalItemCount);
4040
Assert.IsFalse(lookResult.Single().Fields.ContainsKey(TEST_FIELD));
@@ -48,7 +48,7 @@ public void All_Fields()
4848
lookQuery.RequestFields = RequestFields.AllFields;
4949
lookQuery.RawQuery = $"+{TEST_FIELD}:Not_Look_Value";
5050

51-
var lookResult = lookQuery.Query();
51+
var lookResult = lookQuery.Run();
5252

5353
Assert.AreEqual(1, lookResult.TotalItemCount);
5454
Assert.IsTrue(lookResult.Single().Fields.ContainsKey(TEST_FIELD));

‎src/Our.Umbraco.Look.Tests/QueryTests/TagQueryTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void All_Circles()
2727
lookQuery.TagQuery = new TagQuery();
2828
lookQuery.TagQuery.All = new LookTag[] { new LookTag("shape", "circle") };
2929

30-
var lookResult = LookService.Query(lookQuery);
30+
var lookResult = LookService.RunQuery(lookQuery);
3131

3232
Assert.IsTrue(lookResult.Success);
3333
Assert.AreEqual(3, lookResult.TotalItemCount);
@@ -42,7 +42,7 @@ public void All_Small_Or_Medium_Circles()
4242
lookQuery.TagQuery.All = TagQuery.MakeTags("shape:circle");
4343
lookQuery.TagQuery.Any = TagQuery.MakeTags("size:small", "size:medium");
4444

45-
var lookResult = LookService.Query(lookQuery);
45+
var lookResult = LookService.RunQuery(lookQuery);
4646

4747
Assert.IsTrue(lookResult.Success);
4848
Assert.AreEqual(2, lookResult.TotalItemCount);

‎src/Our.Umbraco.Look.Tests/QueryTests/TextQueryTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void No_Highlighting()
2424

2525
lookQuery.TextQuery = new TextQuery("dolor");
2626

27-
var lookResult = LookService.Query(lookQuery);
27+
var lookResult = LookService.RunQuery(lookQuery);
2828

2929
Assert.IsTrue(lookResult.Success);
3030
Assert.IsTrue(lookResult.TotalItemCount > 0);
@@ -39,7 +39,7 @@ public void Highlighting()
3939

4040
lookQuery.TextQuery = new TextQuery("dolor", true);
4141

42-
var lookResult = LookService.Query(lookQuery);
42+
var lookResult = LookService.RunQuery(lookQuery);
4343

4444
Assert.IsTrue(lookResult.Success);
4545
Assert.IsTrue(lookResult.TotalItemCount > 0);

‎src/Our.Umbraco.Look/Models/LookQuery.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@ public void ApplyFacet(Facet facet)
161161
}
162162

163163
/// <summary>
164-
/// Perform the query - this is a shortcut to and does the same thing as LookService.Query(this)
164+
/// Perform the query - this is a shortcut to and does the same thing as LookService.RunQuery(this)
165165
/// </summary>
166166
/// <returns></returns>
167-
public LookResult Query()
167+
public LookResult Run()
168168
{
169-
return LookService.Query(this);
169+
return LookService.RunQuery(this);
170170
}
171171

172172
internal LookQuery Clone()

‎src/Our.Umbraco.Look/Our.Umbraco.Look.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
<Compile Include="Services\LookService_GetLookMatches.cs" />
240240
<Compile Include="Services\LookService_GetSearchingContext.cs" />
241241
<Compile Include="Services\LookService_Index.cs" />
242-
<Compile Include="Services\LookService_Query.cs" />
242+
<Compile Include="Services\LookService_RunQuery.cs" />
243243
<Compile Include="Services\LookService_Initialize.cs" />
244244
<Compile Include="Services\LookService_SetDateIndexer.cs" />
245245
<Compile Include="Services\LookService_SetLocationIndexer.cs" />

‎src/Our.Umbraco.Look/Services/LookService_Query.cs ‎src/Our.Umbraco.Look/Services/LookService_RunQuery.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public partial class LookService
2222
/// </summary>
2323
/// <param name="lookQuery">A LookQuery model for the search criteria</param>
2424
/// <returns>A LookResult model for the search response</returns>
25-
public static LookResult Query(LookQuery lookQuery)
25+
public static LookResult RunQuery(LookQuery lookQuery)
2626
{
2727
// flag to indicate whether there are any query clauses in the supplied LookQuery
2828
bool hasQuery = lookQuery?.Compiled != null ? true : false;

0 commit comments

Comments
 (0)