RDBC-680 RavenDB_15080Test::getCountersForDocumentShouldReturnNamesInTheirOriginalCasing

Author: poissoncorp

ravendb/tests/jvm_migrated_tests/issues_tests/test_ravenDB_15080.py

@@ -215,3 +215,21 @@ def test_counter_session_cache_should_be_case_insensitive_to_counter_name(self):
             self.assertEqual(3, session.advanced.number_of_requests)
             self.assertIsNotNone(counter)
             self.assertEqual(999, counter)
+
+    def test_get_counters_for_document_should_return_names_in_their_original_casing(self):
+        with self.store.open_session() as session:
+            session.store(User(), "users/1")
+            counters_for = session.counters_for("users/1")
+            counters_for.increment("AviV")
+            counters_for.increment("Karmel")
+            counters_for.increment("PAWEL")
+
+            session.save_changes()
+
+        with self.store.open_session() as session:
+            # get_all should return counter names in their original casing
+            all_counters = session.counters_for("users/1").get_all()
+            self.assertEqual(3, len(all_counters))
+
+            keys = all_counters.keys()
+            self.assertSequenceContainsElements(keys, "AviV", "Karmel", "PAWEL")

ravendb/tools/utils.py

@@ -157,38 +157,48 @@ def from_json(cls, json_dict: Dict) -> Size:
         return cls(json_dict["SizeInBytes"], json_dict["HumaneSize"])
 
 
+# todo: https://issues.hibernatingrhinos.com/issue/RDBC-686
 class CaseInsensitiveDict(dict, Generic[_TKey, _TVal]):
     @classmethod
-    def _k(cls, key):
+    def _lower_if_str(cls, key):
         return key.lower() if isinstance(key, str) else key
 
     def __init__(self, *args, **kwargs):
         super(CaseInsensitiveDict, self).__init__(*args, **kwargs)
+        self._original_values: Dict[_TKey, _TKey] = {}
         self._convert_keys()
 
-    def __getitem__(self, key) -> Tuple[_TKey, _TVal]:
-        return super(CaseInsensitiveDict, self).__getitem__(self.__class__._k(key))
+    def _convert_key_back(self, lowered_key: _TKey) -> _TKey:
+        return self._original_values[lowered_key]
+
+    def _convert_item_back(self, item: Tuple[_TKey, _TVal]) -> Tuple[_TKey, _TVal]:
+        return self._convert_key_back(item[0]), item[1]
+
+    def __getitem__(self, key) -> _TVal:
+        return super(CaseInsensitiveDict, self).__getitem__(self.__class__._lower_if_str(key))
 
     def __setitem__(self, key, value):
-        super(CaseInsensitiveDict, self).__setitem__(self.__class__._k(key), value)
+        adjusted_key = self.__class__._lower_if_str(key)
+        self._original_values[adjusted_key] = key
+        super(CaseInsensitiveDict, self).__setitem__(adjusted_key, value)
 
     def __delitem__(self, key):
-        return super(CaseInsensitiveDict, self).__delitem__(self.__class__._k(key))
+        return super(CaseInsensitiveDict, self).__delitem__(self.__class__._lower_if_str(key))
 
     def __contains__(self, key):
-        return super(CaseInsensitiveDict, self).__contains__(self.__class__._k(key))
+        return super(CaseInsensitiveDict, self).__contains__(self.__class__._lower_if_str(key))
 
-    def pop(self, key, *args, **kwargs) -> Tuple[_TKey, _TVal]:
-        return super(CaseInsensitiveDict, self).pop(self.__class__._k(key), *args, **kwargs)
+    def pop(self, key, *args, **kwargs) -> _TVal:
+        return super(CaseInsensitiveDict, self).pop(self.__class__._lower_if_str(key), *args, **kwargs)
 
     def remove(self, key, *args, **kwargs) -> Optional[_TVal]:
         return self.pop(key, *args, **kwargs) if key in self else None
 
     def get(self, key, *args, **kwargs) -> _TVal:
-        return super(CaseInsensitiveDict, self).get(self.__class__._k(key), *args, **kwargs)
+        return super(CaseInsensitiveDict, self).get(self.__class__._lower_if_str(key), *args, **kwargs)
 
     def setdefault(self, key, *args, **kwargs):
-        return super(CaseInsensitiveDict, self).setdefault(self.__class__._k(key), *args, **kwargs)
+        return super(CaseInsensitiveDict, self).setdefault(self.__class__._lower_if_str(key), *args, **kwargs)
 
     def update(self, e=None, **f):
         super(CaseInsensitiveDict, self).update(self.__class__(e))
@@ -199,6 +209,9 @@ def _convert_keys(self):
             v = super(CaseInsensitiveDict, self).pop(k)
             self.__setitem__(k, v)
 
+    def keys(self) -> List[_TKey]:
+        return list(self._original_values.values())
+
 
 class CaseInsensitiveSet(set):
     @classmethod