-
Notifications
You must be signed in to change notification settings - Fork 250
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #208 from CppMicroServices/154-shrinkable-map-allo…
…ws-modification 154 shrinkable map allows modification
- Loading branch information
Showing
7 changed files
with
215 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /*============================================================================= | ||
| Library: CppMicroServices | ||
| Copyright (c) The CppMicroServices developers. See the COPYRIGHT | ||
| file at the top-level directory of this distribution and at | ||
| https://github.com/CppMicroServices/CppMicroServices/COPYRIGHT . | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| =============================================================================*/ | ||
|
|
||
| #include "cppmicroservices/ShrinkableMap.h" | ||
|
|
||
| #include "TestingConfig.h" | ||
| #include "TestingMacros.h" | ||
| #include "TestUtils.h" | ||
|
|
||
| namespace cppmicroservices { | ||
|
|
||
| // Fake a ServiceHooks class so we can create | ||
| // ShrinkableMap instances | ||
| class ServiceHooks { | ||
|
|
||
| public: | ||
|
|
||
| template<class K, class V> | ||
| static ShrinkableMap<K,V> MakeMap(std::map<K,V>& m) | ||
| { | ||
| return ShrinkableMap<K,V>(m); | ||
| } | ||
| }; | ||
|
|
||
| } | ||
|
|
||
| using namespace cppmicroservices; | ||
|
|
||
| int ShrinkableMapTest(int /*argc*/, char* /*argv*/[]) | ||
| { | ||
| US_TEST_BEGIN("ShrinkableMapTest"); | ||
|
|
||
| ShrinkableMap<int, std::string>::container_type m{ | ||
| { 1, "one" }, | ||
| { 2, "two" }, | ||
| { 3, "three" } | ||
| }; | ||
|
|
||
| auto shrinkable = ServiceHooks::MakeMap(m); | ||
|
|
||
| US_TEST_CONDITION(m.size() == 3, "Original size") | ||
| US_TEST_CONDITION(m.size() == shrinkable.size(), "Equal size") | ||
| US_TEST_CONDITION(shrinkable.at(1) == "one", "At access") | ||
|
|
||
| shrinkable.erase(shrinkable.find(1)); | ||
| US_TEST_CONDITION(m.size() == 2, "New size") | ||
| US_TEST_FOR_EXCEPTION(std::out_of_range, shrinkable.at(1)) | ||
| US_TEST_CONDITION(shrinkable.at(2) == "two", "back() access") | ||
|
|
||
| US_TEST_END() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /*============================================================================= | ||
| Library: CppMicroServices | ||
| Copyright (c) The CppMicroServices developers. See the COPYRIGHT | ||
| file at the top-level directory of this distribution and at | ||
| https://github.com/CppMicroServices/CppMicroServices/COPYRIGHT . | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| =============================================================================*/ | ||
|
|
||
| #include "cppmicroservices/ShrinkableVector.h" | ||
|
|
||
| #include "TestingConfig.h" | ||
| #include "TestingMacros.h" | ||
| #include "TestUtils.h" | ||
|
|
||
| namespace cppmicroservices { | ||
|
|
||
| // Fake a BundleHooks class so we can create | ||
| // ShrinkableVector instances | ||
| class BundleHooks { | ||
|
|
||
| public: | ||
|
|
||
| template<class E> | ||
| static ShrinkableVector<E> MakeVector(std::vector<E>& c) | ||
| { | ||
| return ShrinkableVector<E>(c); | ||
| } | ||
| }; | ||
|
|
||
| } | ||
|
|
||
| using namespace cppmicroservices; | ||
|
|
||
| int ShrinkableVectorTest(int /*argc*/, char* /*argv*/[]) | ||
| { | ||
| US_TEST_BEGIN("ShrinkableVectorTest"); | ||
|
|
||
| ShrinkableVector<int>::container_type vec{ 1, 2, 3 }; | ||
|
|
||
| auto shrinkable = BundleHooks::MakeVector(vec); | ||
|
|
||
| US_TEST_CONDITION(vec.size() == 3, "Original size") | ||
| US_TEST_CONDITION(vec.size() == shrinkable.size(), "Equal size") | ||
| US_TEST_CONDITION(shrinkable.at(0) == 1, "At access") | ||
| US_TEST_CONDITION(shrinkable.back() == 3, "back() access") | ||
|
|
||
| shrinkable.pop_back(); | ||
| US_TEST_CONDITION(shrinkable.back() == 2, "back() access") | ||
|
|
||
| US_TEST_FOR_EXCEPTION(std::out_of_range, shrinkable.at(3)) | ||
|
|
||
| US_TEST_END() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters