improve nix equality to match Java Slime

2 files changed, 10 insertions, 0 deletions

diff --git a/vespalib/src/tests/slime/slime_test.cpp b/vespalib/src/tests/slime/slime_test.cpp
index fae61f4194b..7e70dc3538e 100644
--- a/vespalib/src/tests/slime/slime_test.cpp
+++ b/vespalib/src/tests/slime/slime_test.cpp
@@ -362,6 +362,15 @@ TEST("require that slime objects can be compared") {
     EXPECT_NOT_EQUAL(Slime().setArray(), Slime().setObject());
 }
 
+TEST("require that nix equality checks validity") {
+    const Inspector &good_nix = *vespalib::slime::NixValue::instance();
+    const Inspector &bad_nix = *vespalib::slime::NixValue::invalid();
+    EXPECT_EQUAL(good_nix, good_nix);
+    EXPECT_EQUAL(bad_nix, bad_nix);
+    EXPECT_NOT_EQUAL(good_nix, bad_nix);
+    EXPECT_NOT_EQUAL(bad_nix, good_nix);
+}
+
 TEST("require that we can resolve to symbol table from a cursor") {
     Slime slime;
     Cursor &c1 = slime.setObject();
diff --git a/vespalib/src/vespa/vespalib/data/slime/inspector.cpp b/vespalib/src/vespa/vespalib/data/slime/inspector.cpp
index 1f5631accc6..fe03e2f8ed3 100644
--- a/vespalib/src/vespa/vespalib/data/slime/inspector.cpp
+++ b/vespalib/src/vespa/vespalib/data/slime/inspector.cpp
@@ -45,6 +45,7 @@ bool operator == (const Inspector & a, const Inspector & b)
     if (equal) {
         switch (a.type().getId()) {
         case NIX::ID:
+            equal = a.valid() == b.valid();
             break;
         case BOOL::ID:
             equal = a.asBool() == b.asBool();