bug 4739 - fixing equals() method for structures

1 files changed, 303 insertions, 0 deletions

diff --git a/cpp/test/Slice/structure/Client.cpp b/cpp/test/Slice/structure/Client.cpp
new file mode 100644
index 00000000000..b3b25fdccd5
--- /dev/null
+++ b/cpp/test/Slice/structure/Client.cpp
@@ -0,0 +1,303 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/Ice.h>
+#include <TestCommon.h>
+#include <Test.h>
+
+using namespace std;
+using namespace Test;
+
+void
+allTests(const Ice::CommunicatorPtr& communicator)
+{
+    cout << "testing equals() for Slice structures... " << flush;
+
+    //
+    // Define some default values.
+    //
+    S2 def_s2;
+    def_s2.bo = true;
+    def_s2.by = 98;
+    def_s2.sh = 99;
+    def_s2.i = 100;
+    def_s2.l = 101;
+    def_s2.f = 1.0;
+    def_s2.d = 2.0;
+    def_s2.str = "string";
+    def_s2.ss.push_back("one");
+    def_s2.ss.push_back("two");
+    def_s2.ss.push_back("three");
+    def_s2.il.push_back(1);
+    def_s2.il.push_back(2);
+    def_s2.il.push_back(3);
+    def_s2.sd["abc"] = "def";
+    def_s2.s = new S1("name");
+    def_s2.cls = new C(5);
+    def_s2.prx = communicator->stringToProxy("test");
+
+    //
+    // Compare default-constructed structures.
+    //
+    {
+        test(S2() == S2());
+    }
+
+    //
+    // Change one primitive member at a time.
+    //
+    {
+        S2 v;
+
+        v = def_s2;
+        test(v == def_s2);
+
+        v = def_s2;
+        v.bo = false;
+        test(v != def_s2);
+
+        v = def_s2;
+        v.by--;
+        test(v != def_s2);
+
+        v = def_s2;
+        v.sh--;
+        test(v != def_s2);
+
+        v = def_s2;
+        v.i--;
+        test(v != def_s2);
+
+        v = def_s2;
+        v.l--;
+        test(v != def_s2);
+
+        v = def_s2;
+        v.f--;
+        test(v != def_s2);
+
+        v = def_s2;
+        v.d--;
+        test(v != def_s2);
+
+        v = def_s2;
+        v.str = "";
+        test(v != def_s2);
+    }
+
+    //
+    // String member
+    //
+    {
+        S2 v1, v2;
+
+        v1 = def_s2;
+        v1.str = "string";
+        test(v1 == def_s2);
+
+        v1 = def_s2;
+        v2 = def_s2;
+        v1.str.clear();
+        test(v1 != v2);
+
+        v1 = def_s2;
+        v2 = def_s2;
+        v2.str.clear();
+        test(v1 != v2);
+
+        v1 = def_s2;
+        v2 = def_s2;
+        v1.str.clear();
+        v2.str.clear();
+        test(v1 == v2);
+    }
+
+    //
+    // Sequence member
+    //
+    {
+        S2 v1, v2;
+
+        v1 = def_s2;
+        v1.ss = def_s2.ss;
+        test(v1 == def_s2);
+
+        v1 = def_s2;
+        v2 = def_s2;
+        v1.ss.clear();
+        test(v1 != v2);
+
+        v1 = def_s2;
+        v2 = def_s2;
+        v2.ss.clear();
+        test(v1 != v2);
+    }
+
+    //
+    // Custom sequence member
+    //
+    {
+        S2 v1, v2;
+
+        v1 = def_s2;
+        v1.il = def_s2.il;
+        test(v1 == def_s2);
+
+        v1 = def_s2;
+        v2 = def_s2;
+        v1.il.clear();
+        test(v1 != v2);
+
+        v1 = def_s2;
+        v2 = def_s2;
+        v2.il.clear();
+        test(v1 != v2);
+    }
+
+    //
+    // Dictionary member
+    //
+    {
+        S2 v1, v2;
+
+        v1 = def_s2;
+        v1.sd = def_s2.sd;
+        test(v1 == def_s2);
+
+        v1 = def_s2;
+        v2 = def_s2;
+        v1.sd.clear();
+        test(v1 != v2);
+
+        v1 = def_s2;
+        v2 = def_s2;
+        v2.sd.clear();
+        test(v1 != v2);
+    }
+
+    //
+    // Struct member
+    //
+    {
+        S2 v1, v2;
+
+        v1 = def_s2;
+        v1.s = new S1(def_s2.s->name);
+        test(v1 == def_s2);
+
+        v1 = def_s2;
+        v1.s = new S1("name");
+        test(v1 == def_s2);
+
+        v1 = def_s2;
+        v1.s = new S1("noname");
+        test(v1 != def_s2);
+
+        v1 = def_s2;
+        v2 = def_s2;
+        v1.s = 0;
+        test(v1 != v2);
+
+        v1 = def_s2;
+        v2 = def_s2;
+        v2.s = 0;
+        test(v1 != v2);
+    }
+
+    //
+    // Class member
+    //
+    {
+        S2 v1, v2;
+
+        v1 = def_s2;
+        v1.cls = new C(def_s2.cls->i);
+        test(v1 != def_s2);
+
+        v1 = def_s2;
+        v2 = def_s2;
+        v1.cls = 0;
+        test(v1 != v2);
+
+        v1 = def_s2;
+        v2 = def_s2;
+        v2.cls = 0;
+        test(v1 != v2);
+    }
+
+    //
+    // Proxy member
+    //
+    {
+        S2 v1, v2;
+
+        v1 = def_s2;
+        v1.prx = communicator->stringToProxy("test");
+        test(v1 == def_s2);
+
+        v1 = def_s2;
+        v1.prx = communicator->stringToProxy("test2");
+        test(v1 != def_s2);
+
+        v1 = def_s2;
+        v2 = def_s2;
+        v1.prx = 0;
+        test(v1 != v2);
+
+        v1 = def_s2;
+        v2 = def_s2;
+        v2.prx = 0;
+        test(v1 != v2);
+    }
+
+    cout << "ok" << endl;
+}
+
+int
+run(const Ice::CommunicatorPtr& communicator)
+{
+    allTests(communicator);
+
+    return EXIT_SUCCESS;
+}
+
+int
+main(int argc, char* argv[])
+{
+    int status;
+    Ice::CommunicatorPtr communicator;
+
+    try
+    {
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties(argc, argv);
+        communicator = Ice::initialize(argc, argv, initData);
+        status = run(communicator);
+    }
+    catch(const Ice::Exception& ex)
+    {
+        cerr << ex << endl;
+        status = EXIT_FAILURE;
+    }
+
+    if(communicator)
+    {
+        try
+        {
+            communicator->destroy();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cerr << ex << endl;
+            status = EXIT_FAILURE;
+        }
+    }
+
+    return status;
+}