Merge branch 'development' into upstream

Signed-off-by: Manoj Srivastava <srivasta@debian.org>

# Conflicts:
#	src/.gitignore
#	src/maid-x11.c
#	src/quest.pkg

1 files changed, 105 insertions, 0 deletions

diff --git a/vendor/bandit/specs/matchers/be_less_than.cpp b/vendor/bandit/specs/matchers/be_less_than.cpp
new file mode 100644
index 00000000..30f60c47
--- /dev/null
+++ b/vendor/bandit/specs/matchers/be_less_than.cpp
@@ -0,0 +1,105 @@
+#include <specs/specs.h>
+
+using namespace bandit::Matchers;
+
+SPEC_BEGIN(Matchers::BeLessThan)
+
+describe("be_less_than matcher", []{
+    describe("when the actual value is a built-in type", [&]{
+        int actualValue = 10;
+
+        describe("and the expected value is the same built-in type", [&]{
+            int expectedValue;
+
+            describe("and the actual value is greater than the expected value", [&]{
+                before_each([&]{
+                    expectedValue = 1;
+                });
+
+		it("must pass a negative match", [&]{
+		    actualValue must_not be_less_than(expectedValue);
+		});
+
+		it("must reject a positive match", [&]{
+		    AssertThrows(std::exception, [&]{ actualValue must be_less_than(expectedValue); }());
+		});
+            });
+
+            describe("and the actual value is less than the expected value", [&]{
+                before_each([&]{
+                    expectedValue = 100;
+                });
+
+		it("must pass a positive match", [&]{
+		    actualValue must be_less_than(expectedValue);
+		});
+
+		it("must reject a negative match", [&]{
+		    AssertThrows(std::exception, [&]{ actualValue must_not be_less_than(expectedValue); }());
+		});
+            });
+
+            describe("and the actual value equals the expected value", [&]{
+                before_each([&]{
+                    expectedValue = actualValue;
+                });
+
+		it("must pass a negative match", [&]{
+		    actualValue must_not be_less_than(expectedValue);
+		});
+
+		it("must reject a positive match", [&]{
+		    AssertThrows(std::exception, [&]{ actualValue must be_less_than(expectedValue); }());
+		});
+            });
+        });
+
+        describe("and the expected value is a different, but comparable, built-in type", [&]{
+            float expectedValue;
+
+            describe("and the actual value is greater than the expected value", [&]{
+                before_each([&]{
+                    expectedValue = 1.1;
+                });
+
+		it("must pass a negative match", [&]{
+		    actualValue must_not be_less_than(expectedValue);
+		});
+
+		it("must reject a positive match", [&]{
+		    AssertThrows(std::exception, [&]{ actualValue must be_less_than(expectedValue); }());
+		});
+            });
+
+            describe("and the actual value is less than the expected value", [&]{
+                before_each([&]{
+                    expectedValue = 100.1;
+                });
+
+		it("must pass a positive match", [&]{
+		    actualValue must be_less_than(expectedValue);
+		});
+
+		it("must reject a negative match", [&]{
+		    AssertThrows(std::exception, [&]{ actualValue must_not be_less_than(expectedValue); }());
+		});
+            });
+
+            describe("and the actual value equals the expected value", [&]{
+                before_each([&]{
+                    expectedValue = actualValue;
+                });
+
+		it("must pass a negative match", [&]{
+		    actualValue must_not be_less_than(expectedValue);
+		});
+
+		it("must reject a positive match", [&]{
+		    AssertThrows(std::exception, [&]{ actualValue must be_less_than(expectedValue); }());
+		});
+            });
+        });
+    });
+});
+
+SPEC_END