sync reops

Author: moderakh

python.pyproj

@@ -12,6 +12,7 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <IsWindowsApplication>False</IsWindowsApplication>
+    <InterpreterId>{9a7a9026-48c1-4688-9d5d-e5699d47d074}</InterpreterId>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'" />
   <PropertyGroup Condition="'$(Configuration)' == 'Release'" />
@@ -52,6 +53,8 @@
     <Compile Include="pydocumentdb\utils.py" />
     <Compile Include="setup.py" />
     <Compile Include="test\crud_tests.py" />
+    <Compile Include="test\encoding_tests.py" />
+    <Compile Include="test\query_tests.py" />
     <Compile Include="test\orderby_tests.py" />
     <Compile Include="test\aggregate_tests.py" />
     <Compile Include="test\globaldb_tests.py" />
@@ -65,7 +68,7 @@
     <Compile Include="test\session_container_tests.py" />
     <Compile Include="test\test_config.py" />
     <Compile Include="test\ttl_tests.py" />
-	<Compile Include="test\ru_per_min_tests.py" />
+    <Compile Include="test\ru_per_min_tests.py" />
     <Compile Include="pydocumentdb\auth.py" />
     <Compile Include="pydocumentdb\base.py" />
     <Compile Include="pydocumentdb\documents.py" />
@@ -76,6 +79,7 @@
     <Compile Include="test\__init__.py" />
     <Content Include="requirements.txt" />
     <Content Include="test-requirements.txt" />
+    <Content Include="test\test-requirements.txt" />
     <Content Include="tox.ini" />
     <Content Include="test\BaselineTest.PathParser.json" />
   </ItemGroup>
@@ -86,6 +90,10 @@
     <Folder Include="test" />
     <Folder Include="test\routing\" />
   </ItemGroup>
+  <ItemGroup>
+    <InterpreterReference Include="{9a7a9026-48c1-4688-9d5d-e5699d47d074}\2.7" />
+    <InterpreterReference Include="{9a7a9026-48c1-4688-9d5d-e5699d47d074}\3.4" />
+  </ItemGroup>
   <Import Project="$(PtvsTargetsFile)" Condition="Exists($(PtvsTargetsFile))" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" Condition="!Exists($(PtvsTargetsFile))" />
 </Project>

test/encoding_tests.py

@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+
+import unittest
+import pydocumentdb.document_client as document_client
+import pydocumentdb.documents as documents
+import test.test_config as test_config
+
+class EncodingTest(unittest.TestCase):
+    """Test to ensure escaping of non-ascii characters from partition key"""
+
+    host = test_config._test_config.host
+    masterKey = test_config._test_config.masterKey
+    testDbName = 'testDatabase'
+    testCollectionName = 'testCollection'
+
+    @classmethod
+    def cleanUpTestDatabase(cls):
+        global client
+        client = document_client.DocumentClient(cls.host,
+                                                {'masterKey': cls.masterKey})
+        query_iterable = client.QueryDatabases('SELECT * FROM root r WHERE r.id=\'' + cls.testDbName + '\'')
+        it = iter(query_iterable)
+
+        test_db = next(it, None)
+        if test_db is not None:
+            client.DeleteDatabase(test_db['_self'])
+
+    @classmethod
+    def tearDownClass(cls):
+        EncodingTest.cleanUpTestDatabase()
+
+    def setUp(self):
+        global created_collection
+
+        EncodingTest.cleanUpTestDatabase()
+        created_db = client.CreateDatabase({ 'id': self.testDbName })
+
+        collection_definition = { 'id': self.testCollectionName, 'partitionKey': {'paths': ['/pk'],'kind': 'Hash'} }
+        collection_options = { 'offerThroughput': 10100 }
+        created_collection = client.CreateCollection(created_db['_self'], collection_definition, collection_options)
+
+    def test_unicode_characters_in_partition_key (self):
+        test_string = u'€€ کلید پارتیشن विभाजन कुंजी 	123'
+        document_definition = {'pk': test_string, 'id':'myid'}
+        created_doc = client.CreateDocument(created_collection['_self'], document_definition)
+
+        read_options = {'partitionKey': test_string }
+        read_doc = client.ReadDocument(created_doc['_self'], read_options)
+        self.assertEqual(read_doc['pk'], test_string)
+
+    def test_create_document_with_line_separator_para_seperator_next_line_unicodes (self):
+
+        test_string = u'Line Separator (
) & Paragraph Separator (
) & Next Line (…) & نیم‌فاصله'
+        document_definition = {'pk': 'pk', 'id':'myid', 'unicode_content':test_string }
+        created_doc = client.CreateDocument(created_collection['_self'], document_definition)
+
+        read_options = {'partitionKey': 'pk' }
+        read_doc = client.ReadDocument(created_doc['_self'], read_options)
+        self.assertEqual(read_doc['unicode_content'], test_string)
+
+    def test_create_stored_procedure_with_line_separator_para_seperator_next_line_unicodes (self):
+
+        test_string = 'Line Separator (
) & Paragraph Separator (
) & Next Line (…) & نیم‌فاصله'
+
+        test_string_unicode = u'Line Separator (
) & Paragraph Separator (
) & Next Line (…) & نیم‌فاصله'
+
+        stored_proc_definition = {'id':'myid', 'body': test_string}
+        created_sp = client.CreateStoredProcedure(created_collection['_self'], stored_proc_definition)
+
+        read_sp = client.ReadStoredProcedure(created_sp['_self'], dict())
+        self.assertEqual(read_sp['body'], test_string_unicode)
+if __name__ == '__main__':
+    unittest.main()

test/query_tests.py

@@ -0,0 +1,52 @@
+import unittest
+import pydocumentdb.document_client as document_client
+import pydocumentdb.documents as documents
+import test.test_config as test_config
+
+class QueryTest(unittest.TestCase):
+    """Test to ensure escaping of non-ascii characters from partition key"""
+
+    host = test_config._test_config.host
+    masterKey = test_config._test_config.masterKey
+    testDbName = 'testDatabase'
+    testCollectionName = 'testCollection'
+
+    @classmethod
+    def cleanUpTestDatabase(cls):
+        global client
+        client = document_client.DocumentClient(cls.host,
+                                                {'masterKey': cls.masterKey})
+        query_iterable = client.QueryDatabases('SELECT * FROM root r WHERE r.id=\'' + cls.testDbName + '\'')
+        it = iter(query_iterable)
+
+        test_db = next(it, None)
+        if test_db is not None:
+            client.DeleteDatabase("/dbs/" + cls.testDbName + "/") 
+            """ change """
+
+    @classmethod
+    def tearDownClass(cls):
+        QueryTest.cleanUpTestDatabase()
+
+    def setUp(self):
+        global created_collection
+
+        QueryTest.cleanUpTestDatabase()
+        created_db = client.CreateDatabase({ 'id': self.testDbName })
+
+        collection_definition = { 'id': self.testCollectionName, 'partitionKey': {'paths': ['/pk'],'kind': 'Hash'} }
+        collection_options = { 'offerThroughput': 10100 }
+        created_collection = client.CreateCollection(created_db['_self'], collection_definition, collection_options)
+
+    def test_first_and_last_slashes_trimmed_for_query_string (self):
+        document_definition = {'pk': 'pk', 'id':'myId'}
+        created_doc = client.CreateDocument(created_collection['_self'], document_definition)
+
+        query_options = {'partitionKey': 'pk'}
+        collectionLink = '/dbs/' + self.testDbName + '/colls/' + self.testCollectionName + '/'
+        query = 'SELECT * from ' + self.testCollectionName
+        query_iterable = client.QueryDocuments(collectionLink, query, query_options)
+
+        iter_list = list(query_iterable)
+        self.assertEqual(iter_list[0]['id'], 'myId')
+

test/ru_per_min_tests.py

@@ -107,7 +107,6 @@ def test_create_collection_with_ru_pm(self):
         self.assertIsNotNone(offer)
         self.assertEqual(offer['offerType'], "Invalid")
         self.assertIsNotNone(offer['content'])
-        self.assertEqual(offer['content']['offerIsRUPerMinuteThroughputEnabled'], True)
 
     def test_create_collection_without_ru_pm(self):        
         # create a non ru pm collection
@@ -130,8 +129,6 @@ def test_create_collection_without_ru_pm(self):
         self.assertIsNotNone(offer)
         self.assertEqual(offer['offerType'], "Invalid")
         self.assertIsNotNone(offer['content'])
-        self.assertEqual(offer['content']['offerIsRUPerMinuteThroughputEnabled'], True)
-
 
     def test_create_collection_disable_ru_pm_on_request(self):        
         # create a non ru pm collection