Skip to content

Commit 283a4d3

Browse files
author
Marco De Salvo
committed
Renamed methods for better usability
1 parent 96f89c1 commit 283a4d3

File tree

7 files changed

+217
-217
lines changed

7 files changed

+217
-217
lines changed

‎RDFSharp.Test/Query/Mirella/Algebra/Operations/RDFInsertWhereOperationTest.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public void ShouldAddPatternGroupWithBind()
220220
public void ShouldAddPatternGroupWithBindAfterUnion()
221221
{
222222
RDFPatternGroup patternGroup = new RDFPatternGroup()
223-
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).UnionWithNext())
223+
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).Union())
224224
.AddBind(new RDFBind(new RDFVariableExpression(new RDFVariable("?Y")), new RDFVariable("?YBIND")));
225225
RDFInsertWhereOperation operation = new RDFInsertWhereOperation();
226226
operation.AddPatternGroup(patternGroup);
@@ -251,9 +251,9 @@ public void ShouldAddPatternGroupWithBindAfterUnion()
251251
public void ShouldAddPatternGroupWithBindAfterUnionAndThenPattern()
252252
{
253253
RDFPatternGroup patternGroup = new RDFPatternGroup()
254-
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).UnionWithNext())
254+
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).Union())
255255
.AddBind(new RDFBind(new RDFVariableExpression(new RDFVariable("?Y")), new RDFVariable("?YBIND")))
256-
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:isDogOf"), new RDFVariable("?X")).UnionWithNext());
256+
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:isDogOf"), new RDFVariable("?X")).Union());
257257
RDFInsertWhereOperation operation = new RDFInsertWhereOperation();
258258
operation.AddPatternGroup(patternGroup);
259259
operation.AddPatternGroup(patternGroup); //Will be discarded, since duplicate patternGroups are not allowed
@@ -326,7 +326,7 @@ public void ShouldPrintComplexOperation()
326326
.AddInsertTemplate(new RDFPattern(new RDFVariable("?Y"), RDFVocabulary.RDF.TYPE, new RDFResource("ex:dog")).Optional())
327327
.AddPatternGroup(new RDFPatternGroup()
328328
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:dogOf"), new RDFVariable("?X"))
329-
.UnionWithNext())
329+
.Union())
330330
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:isDogOf"), new RDFVariable("?X")))
331331
.Union())
332332
.AddPatternGroup(new RDFPatternGroup()
@@ -401,7 +401,7 @@ public void ShouldPrintComplexOperationWithBindAndExpressions()
401401
.AddPatternGroup(new RDFPatternGroup()
402402
.AddBind(new RDFBind(new RDFVariableExpression(new RDFVariable("?Y")), new RDFVariable("?YBIND3")))
403403
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:dogOf"), new RDFVariable("?X"))
404-
.UnionWithNext())
404+
.Union())
405405
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:isDogOf"), new RDFVariable("?X")))
406406
.AddBind(new RDFBind(new RDFVariableExpression(new RDFVariable("?Y")), new RDFVariable("?YBIND")))
407407
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:isDoggyOf"), new RDFVariable("?X")))
@@ -410,7 +410,7 @@ public void ShouldPrintComplexOperationWithBindAndExpressions()
410410
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:isDogOf"), new RDFVariable("?X")))
411411
.AddBind(new RDFBind(new RDFVariableExpression(new RDFVariable("?Y")), new RDFVariable("?YBIND2")))
412412
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:dogOf"), new RDFVariable("?X"))
413-
.UnionWithNext())
413+
.Union())
414414
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:isDoggyOf"), new RDFVariable("?X"))))
415415
.AddSubQuery(new RDFSelectQuery()
416416
.AddPatternGroup(new RDFPatternGroup()
@@ -489,7 +489,7 @@ public void ShouldPrintComplexOperationWithBindAndExpressionsAndLastQueryMemberU
489489
.AddPatternGroup(new RDFPatternGroup()
490490
.AddBind(new RDFBind(new RDFVariableExpression(new RDFVariable("?Y")), new RDFVariable("?YBIND3")))
491491
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:dogOf"), new RDFVariable("?X"))
492-
.UnionWithNext())
492+
.Union())
493493
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:isDogOf"), new RDFVariable("?X")))
494494
.AddBind(new RDFBind(new RDFVariableExpression(new RDFVariable("?Y")), new RDFVariable("?YBIND")))
495495
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:isDoggyOf"), new RDFVariable("?X")))
@@ -498,7 +498,7 @@ public void ShouldPrintComplexOperationWithBindAndExpressionsAndLastQueryMemberU
498498
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:isDogOf"), new RDFVariable("?X")))
499499
.AddBind(new RDFBind(new RDFVariableExpression(new RDFVariable("?Y")), new RDFVariable("?YBIND2")))
500500
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:dogOf"), new RDFVariable("?X"))
501-
.UnionWithNext())
501+
.Union())
502502
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:isDoggyOf"), new RDFVariable("?X"))))
503503
.AddSubQuery(new RDFSelectQuery()
504504
.AddPatternGroup(new RDFPatternGroup()

‎RDFSharp.Test/Query/Mirella/Algebra/RDFPatternTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ public void ShouldCreateOptionalPatternWithSharedVariable()
10071007
[TestMethod]
10081008
public void ShouldSetUnionWithNextPattern()
10091009
{
1010-
RDFPattern pattern = new RDFPattern(new RDFVariable("subj"), new RDFVariable("pred"), new RDFVariable("obj")).UnionWithNext();
1010+
RDFPattern pattern = new RDFPattern(new RDFVariable("subj"), new RDFVariable("pred"), new RDFVariable("obj")).Union();
10111011

10121012
Assert.IsNotNull(pattern);
10131013
Assert.IsNull(pattern.Context);
@@ -1030,7 +1030,7 @@ public void ShouldSetUnionWithNextPattern()
10301030
[TestMethod]
10311031
public void ShouldSetMinusWithNextPattern()
10321032
{
1033-
RDFPattern pattern = new RDFPattern(new RDFVariable("subj"), new RDFVariable("subj"), new RDFVariable("obj")).MinusWithNext();
1033+
RDFPattern pattern = new RDFPattern(new RDFVariable("subj"), new RDFVariable("subj"), new RDFVariable("obj")).Minus();
10341034

10351035
Assert.IsNotNull(pattern);
10361036
Assert.IsNull(pattern.Context);

‎RDFSharp.Test/Query/Mirella/RDFQueryEngineTest.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ public void ShouldEvaluateSelectQueryOnGraphUnionsThenOptional()
211211

212212
RDFSelectQuery query = new RDFSelectQuery()
213213
.AddPatternGroup(new RDFPatternGroup()
214-
.AddPattern(new RDFPattern(new RDFResource("ex:pluto"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).UnionWithNext())
215-
.AddPattern(new RDFPattern(new RDFResource("ex:fido"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).UnionWithNext())
214+
.AddPattern(new RDFPattern(new RDFResource("ex:pluto"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).Union())
215+
.AddPattern(new RDFPattern(new RDFResource("ex:fido"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).Union())
216216
.AddPattern(new RDFPattern(new RDFResource("ex:balto"), new RDFResource("ex:dogOf"), new RDFVariable("?X")))
217217
.AddPattern(new RDFPattern(new RDFVariable("?X"), new RDFResource("ex:hasName"), new RDFVariable("?N")).Optional()))
218218
.AddModifier(new RDFOrderByModifier(new RDFVariable("?X"), RDFQueryEnums.RDFOrderByFlavors.ASC));
@@ -244,8 +244,8 @@ public void ShouldEvaluateSelectQueryOnGraphUnionsThenInner()
244244

245245
RDFSelectQuery query = new RDFSelectQuery()
246246
.AddPatternGroup(new RDFPatternGroup()
247-
.AddPattern(new RDFPattern(new RDFResource("ex:pluto"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).UnionWithNext())
248-
.AddPattern(new RDFPattern(new RDFResource("ex:fido"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).UnionWithNext())
247+
.AddPattern(new RDFPattern(new RDFResource("ex:pluto"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).Union())
248+
.AddPattern(new RDFPattern(new RDFResource("ex:fido"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).Union())
249249
.AddPattern(new RDFPattern(new RDFResource("ex:balto"), new RDFResource("ex:dogOf"), new RDFVariable("?X")))
250250
.AddPattern(new RDFPattern(new RDFVariable("?X"), new RDFResource("ex:hasName"), new RDFVariable("?N"))))
251251
.AddModifier(new RDFOrderByModifier(new RDFVariable("?X"), RDFQueryEnums.RDFOrderByFlavors.ASC));
@@ -327,7 +327,7 @@ public void ShouldEvaluateSelectQueryOnGraphMinusPattern()
327327

328328
RDFSelectQuery query = new RDFSelectQuery()
329329
.AddPatternGroup(new RDFPatternGroup()
330-
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).MinusWithNext())
330+
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).Minus())
331331
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:dogOf"), new RDFResource("ex:paperino"))));
332332
RDFSelectQueryResult result = new RDFQueryEngine().EvaluateSelectQuery(query, graph);
333333

@@ -869,13 +869,13 @@ public void ShouldEvaluateSelectQueryOnGraphWithComplexQuery1()
869869

870870
RDFSelectQuery query = new RDFSelectQuery()
871871
.AddPatternGroup(new RDFPatternGroup()
872-
.AddPattern(new RDFPattern(new RDFResource("ex:pluto"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).UnionWithNext())
873-
.AddPattern(new RDFPattern(new RDFResource("ex:fido"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).UnionWithNext())
872+
.AddPattern(new RDFPattern(new RDFResource("ex:pluto"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).Union())
873+
.AddPattern(new RDFPattern(new RDFResource("ex:fido"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).Union())
874874
.AddPattern(new RDFPattern(new RDFResource("ex:balto"), new RDFResource("ex:dogOf"), new RDFVariable("?X")))
875875
.AddPattern(new RDFPattern(new RDFVariable("?X"), new RDFResource("ex:hasName"), new RDFVariable("?N"))))
876876
.AddSubQuery(new RDFSelectQuery()
877877
.AddPatternGroup(new RDFPatternGroup()
878-
.AddPattern(new RDFPattern(new RDFResource("ex:baubau"), new RDFResource("ex:dogOf"), new RDFVariable("?Y")).UnionWithNext())
878+
.AddPattern(new RDFPattern(new RDFResource("ex:baubau"), new RDFResource("ex:dogOf"), new RDFVariable("?Y")).Union())
879879
.AddPattern(new RDFPattern(new RDFResource("ex:snoopie"), new RDFResource("ex:dogOf"), new RDFVariable("?Y")))
880880
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:hasColor"), new RDFVariable("?C"))))
881881
.Optional())
@@ -913,13 +913,13 @@ public void ShouldEvaluateSelectQueryOnGraphWithComplexQuery2()
913913

914914
RDFSelectQuery query = new RDFSelectQuery()
915915
.AddPatternGroup(new RDFPatternGroup()
916-
.AddPattern(new RDFPattern(new RDFResource("ex:pluto"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).UnionWithNext())
917-
.AddPattern(new RDFPattern(new RDFResource("ex:fido"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).UnionWithNext())
916+
.AddPattern(new RDFPattern(new RDFResource("ex:pluto"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).Union())
917+
.AddPattern(new RDFPattern(new RDFResource("ex:fido"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).Union())
918918
.AddPattern(new RDFPattern(new RDFResource("ex:balto"), new RDFResource("ex:dogOf"), new RDFVariable("?X")))
919919
.AddPattern(new RDFPattern(new RDFVariable("?X"), new RDFResource("ex:hasName"), new RDFVariable("?N"))))
920920
.AddSubQuery(new RDFSelectQuery()
921921
.AddPatternGroup(new RDFPatternGroup()
922-
.AddPattern(new RDFPattern(new RDFResource("ex:baubau"), new RDFResource("ex:dogOf"), new RDFVariable("?Y")).UnionWithNext())
922+
.AddPattern(new RDFPattern(new RDFResource("ex:baubau"), new RDFResource("ex:dogOf"), new RDFVariable("?Y")).Union())
923923
.AddPattern(new RDFPattern(new RDFResource("ex:snoopie"), new RDFResource("ex:dogOf"), new RDFVariable("?Y")))
924924
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:hasColor"), new RDFVariable("?C")).Optional()))
925925
.Optional())
@@ -965,13 +965,13 @@ public void ShouldEvaluateSelectQueryOnGraphWithComplexQuery3()
965965

966966
RDFSelectQuery query = new RDFSelectQuery()
967967
.AddPatternGroup(new RDFPatternGroup()
968-
.AddPattern(new RDFPattern(new RDFResource("ex:pluto"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).UnionWithNext())
969-
.AddPattern(new RDFPattern(new RDFResource("ex:fido"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).UnionWithNext())
968+
.AddPattern(new RDFPattern(new RDFResource("ex:pluto"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).Union())
969+
.AddPattern(new RDFPattern(new RDFResource("ex:fido"), new RDFResource("ex:dogOf"), new RDFVariable("?X")).Union())
970970
.AddPattern(new RDFPattern(new RDFResource("ex:balto"), new RDFResource("ex:dogOf"), new RDFVariable("?X")))
971971
.AddPattern(new RDFPattern(new RDFVariable("?X"), new RDFResource("ex:hasName"), new RDFVariable("?N")).Optional()))
972972
.AddSubQuery(new RDFSelectQuery()
973973
.AddPatternGroup(new RDFPatternGroup()
974-
.AddPattern(new RDFPattern(new RDFResource("ex:baubau"), new RDFResource("ex:dogOf"), new RDFVariable("?Y")).UnionWithNext())
974+
.AddPattern(new RDFPattern(new RDFResource("ex:baubau"), new RDFResource("ex:dogOf"), new RDFVariable("?Y")).Union())
975975
.AddPattern(new RDFPattern(new RDFResource("ex:snoopie"), new RDFResource("ex:dogOf"), new RDFVariable("?Y")))
976976
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:hasColor"), new RDFVariable("?C")).Optional()))
977977
.Optional())
@@ -3119,7 +3119,7 @@ public void ShouldEvaluatePatternGroupWithNoResultsFromPattern()
31193119
]);
31203120

31213121
RDFPatternGroup patternGroup = new RDFPatternGroup()
3122-
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:dogOf2"), new RDFVariable("?X")).UnionWithNext())
3122+
.AddPattern(new RDFPattern(new RDFVariable("?Y"), new RDFResource("ex:dogOf2"), new RDFVariable("?X")).Union())
31233123
.AddPattern(new RDFPattern(new RDFResource("ex:balto"), new RDFResource("ex:hasName"), new RDFVariable("?N")).Optional());
31243124
RDFQueryEngine queryEngine = new RDFQueryEngine();
31253125
queryEngine.EvaluatePatternGroup(patternGroup, graph);

0 commit comments

Comments
 (0)