From 3f0203d92836c094245a360b421bea5892a5f769 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Mon, 24 Mar 2014 21:38:09 -0700 Subject: [PATCH] Clean up character set spec --- spec/compiler/rules/character_set_spec.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/spec/compiler/rules/character_set_spec.cc b/spec/compiler/rules/character_set_spec.cc index 551779a5..693edb20 100644 --- a/spec/compiler/rules/character_set_spec.cc +++ b/spec/compiler/rules/character_set_spec.cc @@ -67,7 +67,7 @@ describe("character sets", []() { AssertThat(set1, Equals(CharacterSet({ {'a', 'z'} }))); }); - it("works when one set spans the other", []() { + it("works when one set is a proper subset of the other", []() { CharacterSet set1({ {'a','z'} }); set1.remove_set(CharacterSet({ {'d', 's'} })); AssertThat(set1, Equals(CharacterSet({ {'a', 'c'}, {'t', 'z'} }))); @@ -95,24 +95,28 @@ describe("character sets", []() { CharacterSet set1({ {'a', 'd'} }); CharacterSet set2({ {'e', 'x'} }); AssertThat(set1.intersect(set2), Equals(CharacterSet())); + AssertThat(set2.intersect(set1), Equals(set1.intersect(set2))); }); - it("works for sets with a single overlapping range", []() { + it("works when one range overlaps another", []() { CharacterSet set1({ {'a', 'e'} }); CharacterSet set2({ {'c', 'x'} }); AssertThat(set1.intersect(set2), Equals(CharacterSet({ {'c', 'e'} }))); + AssertThat(set2.intersect(set1), Equals(set1.intersect(set2))); }); - it("works for sets with two overlapping ranges", []() { + it("works when one range overlaps two other ranges", []() { CharacterSet set1({ {'a', 'e'}, {'w', 'z'} }); CharacterSet set2({ {'c', 'y'} }); AssertThat(set1.intersect(set2), Equals(CharacterSet({ {'c', 'e'}, {'w', 'y'} }))); + AssertThat(set2.intersect(set1), Equals(set1.intersect(set2))); }); - it("works for some sets", []() { - CharacterSet set1({ {'i', 'i'} }); - CharacterSet set2({ {'a', 'z'} }); + it("works when one range is a proper subset of another", []() { + CharacterSet set1({ {'a', 'z'} }); + CharacterSet set2({ {'i', 'i'} }); AssertThat(set1.intersect(set2), Equals(CharacterSet({ {'i', 'i'} }))); + AssertThat(set2.intersect(set1), Equals(set1.intersect(set2))); }); }); });