diff --git a/[refs] b/[refs] index 9b22f2964984c..61751e73fca14 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e -"refs/heads/CMSSW_7_1_X": 5e7ae5ea61c4d8311fe7c80fc90cc5c6fcbafaa7 +"refs/heads/CMSSW_7_1_X": 2fe3354157ce22369dfd77e1886c23f2bac1c783 diff --git a/trunk/DQMServices/Core/test/DQMBackEndInterfaceExample.cc b/trunk/DQMServices/Core/test/DQMBackEndInterfaceExample.cc index 81cb5286b937c..8ff07328503f0 100644 --- a/trunk/DQMServices/Core/test/DQMBackEndInterfaceExample.cc +++ b/trunk/DQMServices/Core/test/DQMBackEndInterfaceExample.cc @@ -185,11 +185,11 @@ void DQMStoreExample::integrityChecks() // contents of "C1/C2" (including subdirectories) contents.clear(); + contents.push_back(f1); contents.push_back(h5); + contents.push_back(h6); contents.push_back(i1); contents.push_back(h1); contents.push_back(h2); contents.push_back(h7); contents.push_back(s1); contents.push_back(h64); contents.push_back(h8); - contents.push_back(f1); contents.push_back(h5); - contents.push_back(h6); contents.push_back(i1); dbe_ret = dbe->getAllContents("C1/C2"); assert(dbe_ret == contents); dbe_ret = dbe->getAllContents("C1/C2/"); // w/ or w/o a "slash" at the end @@ -203,15 +203,14 @@ void DQMStoreExample::integrityChecks() // contents of "C1/C2": only histograms (including subdirectories) contents.clear(); + contents.push_back(h5); contents.push_back(h6); contents.push_back(h1); contents.push_back(h2); contents.push_back(h7); contents.push_back(h64); contents.push_back(h8); - contents.push_back(h5); - contents.push_back(h6); dbe_ret = dbe->getMatchingContents("C1/C2/*histo*"); assert(dbe_ret == contents); - contents.erase(contents.begin()); + contents.erase(contents.begin()+2); // h1 dbe_ret = dbe->getMatchingContents("C1/C2/*sto?"); assert(dbe_ret == contents); }