Commit 5a26585e authored by Pavel Vainerman's avatar Pavel Vainerman

(tests): добавил для UniXML::iterator операции --it, ++it

parent 95d5e8b5
...@@ -87,10 +87,12 @@ class UniXML_iterator: ...@@ -87,10 +87,12 @@ class UniXML_iterator:
UniXML_iterator operator+(int); UniXML_iterator operator+(int);
UniXML_iterator operator++(int); UniXML_iterator operator++(int);
UniXML_iterator operator+=(int); UniXML_iterator operator+=(int);
UniXML_iterator operator++();
// Перейти к предыдущему узлу // Перейти к предыдущему узлу
UniXML_iterator operator-(int); UniXML_iterator operator-(int);
UniXML_iterator operator--(int); UniXML_iterator operator--(int);
UniXML_iterator operator--();
UniXML_iterator operator-=(int); UniXML_iterator operator-=(int);
/*! Перейти на один уровень выше /*! Перейти на один уровень выше
......
...@@ -472,6 +472,11 @@ bool UniXML_iterator::find( const std::string& searchnode ) ...@@ -472,6 +472,11 @@ bool UniXML_iterator::find( const std::string& searchnode )
return false; return false;
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
UniXML_iterator UniXML_iterator::operator++()
{
return (*this)+1;
}
// -------------------------------------------------------------------------
UniXML_iterator UniXML_iterator::operator++(int) UniXML_iterator UniXML_iterator::operator++(int)
{ {
return (*this)+1; return (*this)+1;
...@@ -504,6 +509,11 @@ UniXML_iterator UniXML_iterator::operator--(int) ...@@ -504,6 +509,11 @@ UniXML_iterator UniXML_iterator::operator--(int)
return (*this)-1; return (*this)-1;
} }
UniXML_iterator UniXML_iterator::operator--()
{
return (*this)-1;
}
UniXML_iterator UniXML_iterator::operator-=(int s) UniXML_iterator UniXML_iterator::operator-=(int s)
{ {
return (*this)-s; return (*this)-s;
......
...@@ -73,6 +73,12 @@ TEST_CASE("UniXML", "[UniXML]" ) ...@@ -73,6 +73,12 @@ TEST_CASE("UniXML", "[UniXML]" )
it--; it--;
CHECK( it.getName() == "UserData" ); CHECK( it.getName() == "UserData" );
++it;
CHECK( it.getName() == "UniSet" );
--it;
CHECK( it.getName() == "UserData" );
it = uxml.begin(); it = uxml.begin();
CHECK( it.findName("TestNode","TestNode1") != 0 ); CHECK( it.findName("TestNode","TestNode1") != 0 );
it = uxml.begin(); it = uxml.begin();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment