diff options
| author | Federico Igne <federico.igne@cs.ox.ac.uk> | 2020-11-02 18:51:10 +0100 |
|---|---|---|
| committer | Federico Igne <federico.igne@cs.ox.ac.uk> | 2020-11-02 18:51:10 +0100 |
| commit | 6df3ffe815a5ea65da92e818c1eb48fca13bc5ce (patch) | |
| tree | 816b20e349ad9b8c5fdf5adcf1dec4e8468ae4ce /src | |
| parent | f755fae778fc2ff657ea2c9fdf84e3e804e44fb3 (diff) | |
| download | RSAComb-6df3ffe815a5ea65da92e818c1eb48fca13bc5ce.tar.gz RSAComb-6df3ffe815a5ea65da92e818c1eb48fca13bc5ce.zip | |
Simplify prettyprinting of queries in test
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/scala/rsacomb/FilteringProgramSpecs.scala | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/test/scala/rsacomb/FilteringProgramSpecs.scala b/src/test/scala/rsacomb/FilteringProgramSpecs.scala index 8d7b6d2..2dcf682 100644 --- a/src/test/scala/rsacomb/FilteringProgramSpecs.scala +++ b/src/test/scala/rsacomb/FilteringProgramSpecs.scala | |||
| @@ -303,36 +303,36 @@ class FilteringProgramSpec | |||
| 303 | } | 303 | } |
| 304 | } | 304 | } |
| 305 | 305 | ||
| 306 | query0.toString() should "have {?obj, ?pred} as bounded variables" in { | 306 | "Query 0" should "have {?obj, ?pred} as bounded variables" in { |
| 307 | val pred = Variable.create("obj") | 307 | val pred = Variable.create("obj") |
| 308 | val obj = Variable.create("pred") | 308 | val obj = Variable.create("pred") |
| 309 | val program = new FilteringProgram(query0, List()) | 309 | val program = new FilteringProgram(query0, List()) |
| 310 | program.bounded should contain theSameElementsAs List(pred, obj) | 310 | program.bounded should contain theSameElementsAs List(pred, obj) |
| 311 | } | 311 | } |
| 312 | 312 | ||
| 313 | query1.toString() should "have no bounded variable" in { | 313 | "Query 1" should "have no bounded variable" in { |
| 314 | val program = new FilteringProgram(query1, List()) | 314 | val program = new FilteringProgram(query1, List()) |
| 315 | program.bounded shouldBe empty | 315 | program.bounded shouldBe empty |
| 316 | } | 316 | } |
| 317 | 317 | ||
| 318 | query2.toString() should "have no bounded variable" in { | 318 | "Query 2" should "have no bounded variable" in { |
| 319 | val program = new FilteringProgram(query2, List()) | 319 | val program = new FilteringProgram(query2, List()) |
| 320 | program.bounded shouldBe empty | 320 | program.bounded shouldBe empty |
| 321 | } | 321 | } |
| 322 | 322 | ||
| 323 | query3.toString() should "have {?w, ?fp} as bounded variables" in { | 323 | "Query 3" should "have {?w, ?fp} as bounded variables" in { |
| 324 | val w = Variable.create("w") | 324 | val w = Variable.create("w") |
| 325 | val fp = Variable.create("fp") | 325 | val fp = Variable.create("fp") |
| 326 | val program = new FilteringProgram(query3, List()) | 326 | val program = new FilteringProgram(query3, List()) |
| 327 | program.bounded should contain theSameElementsAs List(w, fp) | 327 | program.bounded should contain theSameElementsAs List(w, fp) |
| 328 | } | 328 | } |
| 329 | 329 | ||
| 330 | query4.toString() should "have no bounded variable" in { | 330 | "Query 4" should "have no bounded variable" in { |
| 331 | val program = new FilteringProgram(query4, List()) | 331 | val program = new FilteringProgram(query4, List()) |
| 332 | program.bounded shouldBe empty | 332 | program.bounded shouldBe empty |
| 333 | } | 333 | } |
| 334 | 334 | ||
| 335 | query5.toString() should "have a non-empty bounded set" in { | 335 | "Query 5" should "have a non-empty bounded set" in { |
| 336 | val w = Variable.create("w") | 336 | val w = Variable.create("w") |
| 337 | val c_int = Variable.create("c_int") | 337 | val c_int = Variable.create("c_int") |
| 338 | val f_int = Variable.create("f_int") | 338 | val f_int = Variable.create("f_int") |
| @@ -346,14 +346,14 @@ class FilteringProgramSpec | |||
| 346 | ) | 346 | ) |
| 347 | } | 347 | } |
| 348 | 348 | ||
| 349 | query6.toString() should "have a non-empty bounded set" in { | 349 | "Query 6" should "have a non-empty bounded set" in { |
| 350 | val w = Variable.create("w") | 350 | val w = Variable.create("w") |
| 351 | val int = Variable.create("int") | 351 | val int = Variable.create("int") |
| 352 | val program = new FilteringProgram(query6, List()) | 352 | val program = new FilteringProgram(query6, List()) |
| 353 | program.bounded should contain theSameElementsAs List(w, int) | 353 | program.bounded should contain theSameElementsAs List(w, int) |
| 354 | } | 354 | } |
| 355 | 355 | ||
| 356 | query7.toString() should "have a non-empty bounded set" in { | 356 | "Query 7" should "have a non-empty bounded set" in { |
| 357 | val w = Variable.create("w") | 357 | val w = Variable.create("w") |
| 358 | val z = Variable.create("z") | 358 | val z = Variable.create("z") |
| 359 | val u = Variable.create("u") | 359 | val u = Variable.create("u") |
