Merge lp:~elopio/cloudspacesclient/download_file_with_contents into lp:cloudspacesclient

[Leo Arias]

Added a test to download file with content

[lp:~elopio/cloudspacesclient/download_file_with_contents]

45. By Leo Arias on 2013-12-06

Fixed pep8.

46. By Leo Arias on 2013-12-06

Refactored existing tests.

47. By Leo Arias on 2013-12-06

Fixed pep8.

[Richard Huddie (rhuddie)]

review: Approve

=== modified file 'src/cloudspacesclient/tests/conformance/test_cloudspaces_api.py'
--- src/cloudspacesclient/tests/conformance/test_cloudspaces_api.py	2013-12-06 16:29:10 +0000
+++ src/cloudspacesclient/tests/conformance/test_cloudspaces_api.py	2013-12-06 18:45:35 +0000
@@ -242,8 +242,7 @@
         test_file_name = 'new_test_file.txt'
         test_file_mimetype = 'text/plain'
 
-        metadata = self.cloudspaces_api_client.make_file(
-            self.root_node_id, test_file_name)
+        metadata = self._make_file(self.root_node_id, test_file_name)
 
         validictory.validate(
             metadata, schemas.GET_FILE_METADATA_RESPONSE_SCHEMA)
@@ -266,30 +265,35 @@
         # TODO check the user_id. --elopio - 2013-11-27
         # TODO Check the volume_id field. --elopio - 2013-11-27
 
+    def _make_file(self, folder_node_id, file_name, contents=''):
+        metadata = self.cloudspaces_api_client.make_file(
+            folder_node_id, file_name)
+        file_node_id = metadata.get('node_id')
+        if contents:
+            metadata = self.cloudspaces_api_client.put_file(
+                file_node_id, contents)
+        return metadata
+
     def test_upload_file(self):
         test_file_name = 'file_to_upload.txt'
         test_file_mimetype = 'text/plain'
 
-        new_file_metadata = self.cloudspaces_api_client.make_file(
-            self.root_node_id, test_file_name)
-        file_node_id = new_file_metadata.get('node_id')
-
-        file_upload_metadata = self.cloudspaces_api_client.put_file(
-            file_node_id, 'test contents')
+        metadata = self._make_file(
+            self.root_node_id, test_file_name, 'test contents')
 
         validictory.validate(
-            file_upload_metadata, schemas.GET_FILE_METADATA_RESPONSE_SCHEMA)
+            metadata, schemas.GET_FILE_METADATA_RESPONSE_SCHEMA)
 
         root_path = self.test_server.get_root_path()
         expected = dict(
             filename=test_file_name, is_deleted=False, is_folder=False,
             mimetype=test_file_mimetype, parent_node_id=self.root_node_id,
             path=root_path, size=13)
-        self._assert_json_object_values(expected, file_upload_metadata)
+        self._assert_json_object_values(expected, metadata)
 
         # Assert that the file has just been modified.
         self.assert_datetime_limits(
-            parser.parse(file_upload_metadata.get('server_modified')),
+            parser.parse(metadata.get('server_modified')),
             self.start_datetime, self._get_now_datetime())
         # TODO update the spec because it says checksum instead of hash.
         # --elopio - 2013-11-27
@@ -301,14 +305,27 @@
         # --elopio - 2013-12-06
 
     def test_download_empty_file(self):
-        test_file_name = 'test_file_to_download.txt'
-        create_metadata = self.cloudspaces_api_client.make_file(
-            self.root_node_id, test_file_name)
+        test_file_name = 'test_empty_file_to_download.txt'
+        create_metadata = self._make_file(self.root_node_id, test_file_name)
         file_node_id = create_metadata.get('node_id')
 
         contents = list(self.cloudspaces_api_client.get_file(file_node_id))
         self.assertEqual(contents, [])
 
+    def test_download_file_with_content(self):
+        test_file_name = 'test_file_to_download.txt'
+        test_file_content = 'content of test file to download.'
+        create_metadata = self._make_file(
+            self.root_node_id, test_file_name, test_file_content)
+        file_node_id = create_metadata.get('node_id')
+
+        content = self.cloudspaces_api_client.get_file(file_node_id)
+        self._assert_file_content(content, test_file_content)
+
+    def _assert_file_content(self, response, expected):
+        content = list(response)
+        self.assertEqual(b''.join(content).decode(), expected)
+
     def test_delete_file(self):
         test_file_name = 'test_file_to_delete.txt'
         test_file_mimetype = 'text/plain'
@@ -484,5 +501,5 @@
             parser.parse(metadata.get('server_modified')), self.start_datetime,
             self._get_now_datetime())
         # get the latest version and compare with expected content
-        content = list(self.cloudspaces_api_client.get_file(file_node_id))
-        self.assertEqual(b''.join(content).decode(), content_v2)
+        content = self.cloudspaces_api_client.get_file(file_node_id)
+        self._assert_file_content(content, content_v2)