1 files changed, 59 insertions, 9 deletions

diff --git a/test/controls/control_list.cpp b/test/controls/control_list.cpp
index 70cf61b8..bb35aab7 100644
--- a/test/controls/control_list.cpp
+++ b/test/controls/control_list.cpp
@@ -50,7 +50,7 @@ protected:
 			return TestFail;
 		}
 
-		if (list.contains(controls::Brightness)) {
+		if (list.get(controls::Brightness)) {
 			cout << "List should not contain Brightness control" << endl;
 			return TestFail;
 		}
@@ -80,7 +80,7 @@ protected:
 			return TestFail;
 		}
 
-		if (!list.contains(controls::Brightness)) {
+		if (!list.get(controls::Brightness)) {
 			cout << "List should contain Brightness control" << endl;
 			return TestFail;
 		}
@@ -99,7 +99,7 @@ protected:
 			return TestFail;
 		}
 
-		if (list.contains(controls::Contrast)) {
+		if (list.get(controls::Contrast)) {
 			cout << "List should not contain Contract control" << endl;
 			return TestFail;
 		}
@@ -108,8 +108,8 @@ protected:
 		list.set(controls::Brightness, 0.0f);
 		list.set(controls::Contrast, 1.5f);
 
-		if (!list.contains(controls::Brightness) ||
-		    !list.contains(controls::Contrast)) {
+		if (!list.get(controls::Brightness) ||
+		    !list.get(controls::Contrast)) {
 			cout << "List should contain Brightness and Contrast controls"
 			     << endl;
 			return TestFail;
@@ -145,7 +145,7 @@ protected:
 		 */
 		list.set(controls::AwbEnable, true);
 
-		if (list.contains(controls::AwbEnable)) {
+		if (list.get(controls::AwbEnable)) {
 			cout << "List shouldn't contain AwbEnable control" << endl;
 			return TestFail;
 		}
@@ -171,9 +171,9 @@ protected:
 			return TestFail;
 		}
 
-		if (!mergeList.contains(controls::Brightness) ||
-		    !mergeList.contains(controls::Contrast) ||
-		    !mergeList.contains(controls::Saturation)) {
+		if (!mergeList.get(controls::Brightness) ||
+		    !mergeList.get(controls::Contrast) ||
+		    !mergeList.get(controls::Saturation)) {
 			cout << "Merged list does not contain all controls" << endl;
 			return TestFail;
 		}
@@ -196,6 +196,56 @@ protected:
 			return TestFail;
 		}
 
+		/*
+		 * Create two lists with overlapping controls. Merge them with
+		 * overwriteExisting = true, verifying that the existing control
+		 * values *get* overwritten.
+		 */
+		mergeList.clear();
+		mergeList.set(controls::Brightness, 0.7f);
+		mergeList.set(controls::Saturation, 0.4f);
+
+		list.clear();
+		list.set(controls::Brightness, 0.5f);
+		list.set(controls::Contrast, 1.1f);
+
+		mergeList.merge(list, ControlList::MergePolicy::OverwriteExisting);
+		if (mergeList.size() != 3) {
+			cout << "Merged list should contain three elements" << endl;
+			return TestFail;
+		}
+
+		if (list.size() != 2) {
+			cout << "The list to merge should contain two elements"
+			     << endl;
+			return TestFail;
+		}
+
+		if (!mergeList.get(controls::Brightness) ||
+		    !mergeList.get(controls::Contrast) ||
+		    !mergeList.get(controls::Saturation)) {
+			cout << "Merged list does not contain all controls" << endl;
+			return TestFail;
+		}
+
+		if (mergeList.get(controls::Brightness) != 0.5f) {
+			cout << "Brightness control value did not change after merging lists"
+			     << endl;
+			return TestFail;
+		}
+
+		if (mergeList.get(controls::Contrast) != 1.1f) {
+			cout << "Contrast control value changed after merging lists"
+			     << endl;
+			return TestFail;
+		}
+
+		if (mergeList.get(controls::Saturation) != 0.4f) {
+			cout << "Saturation control value changed after merging lists"
+			     << endl;
+			return TestFail;
+		}
+
 		return TestPass;
 	}
 };