Added test to testChannels unit-test to verify functionality of ChannelList::Iterator/ConstIterator

Signed-off-by: Aries Moczar <arcmantis@protulae.com>

Author: Arcmantis18

src/lib/OpenEXR/ImfChannelList.h

@@ -545,7 +545,7 @@ inline bool
 operator!= (
     const ChannelList::ConstIterator& x, ChannelList::Iterator& y)
 {
-    return !(x._i == y,_i);
+    return !(x._i == y._i);
 }
 
 OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_EXIT

src/test/OpenEXRTest/testChannels.cpp

@@ -218,13 +218,82 @@ writeRead (
     cout << endl;
 }
 
+void
+verifyIterators(void)
+{
+    ChannelList l1;
+
+    l1.insert("A", Channel(HALF));
+    l1.insert("B", Channel(HALF));
+    l1.insert("C", Channel(HALF));
+
+    ChannelList::Iterator it1 = l1.begin();
+    ChannelList::ConstIterator cit1 = l1.begin();
+
+    ChannelList::Iterator it2 = l1.end();
+    ChannelList::ConstIterator cit2 = l1.end();
+
+    // Test global '!=' overloads
+    assert(it1 != it2);
+    assert(it1 != cit2);
+    assert(cit1 != it2);
+    assert(cit1 != cit2);
+
+    // Test global '==' overloads
+    assert(it1 == it1);
+    assert(it1 == cit1);
+    assert(cit1 == it1);
+    assert(cit1 == cit1);
+
+    // Test post/pre '++' overloads
+    it1++;
+    ++it1;
+    cit1++;
+    ++cit1;
+    
+    // Test post/pre '--' overloads
+    it1--;
+    --it1;
+    cit1--;
+    --cit1;
+
+    assert(it1 == l1.begin());
+    assert(cit1 == l1.begin());
+     
+    while (it1 != l1.end())
+    {
+        
+        // Test '*' overloads
+        Channel& c = *it1;
+        const Channel& cc = *cit1;
+        assert(c.type == HALF);
+        assert(cc.type == HALF);
+        
+        // Test '->' overload
+        assert(it1->type == HALF);
+        assert(cit1->type == HALF);
+
+        // Test pre/post '++' overloads
+        it1++;
+        cit1++;
+
+    }
+
+    assert(it1 == l1.end());
+    assert(cit1 == l1.end());
+}
+
 } // namespace
 
 void
 testChannels (const std::string& tempDir)
 {
     try
     {
+        cout << "Testing ChannelList Iterator behavior" << endl;
+
+        verifyIterators ();
+
         cout << "Testing filling of missing channels" << endl;
 
         const int W = 117;