Skip to content

Commit 42a7a96

Browse files
silvolusilvolu
committed
Lint fixes
1 parent 4f3ab49 commit 42a7a96

File tree

2 files changed

+93
-78
lines changed

2 files changed

+93
-78
lines changed

‎tests/general/ApiMediaFileUploadTest.php‎

Lines changed: 55 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -21,68 +21,75 @@
2121
require_once 'BaseTest.php';
2222
require_once 'Google/Http/MediaFileUpload.php';
2323

24-
class ApiMediaFileUploadTest extends BaseTest {
25-
public function testMediaFile() {
24+
class ApiMediaFileUploadTest extends BaseTest
25+
{
26+
public function testMediaFile()
27+
{
2628
$client = $this->getClient();
2729
$request = new Google_Http_Request('http://www.example.com', 'POST');
28-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', base64_decode('data:image/png;base64,a'));
30+
$media = new Google_Http_MediaFileUpload(
31+
$client,
32+
$request,
33+
'image/png',
34+
base64_decode('data:image/png;base64,a')
35+
);
2936

3037
$this->assertEquals(0, $media->getProgress());
3138
$this->assertGreaterThan(0, strlen($request->getPostBody()));
3239
}
3340

34-
public function testGetUploadType() {
35-
$client = $this->getClient();
36-
$request = new Google_Http_Request('http://www.example.com', 'POST');
41+
public function testGetUploadType()
42+
{
43+
$client = $this->getClient();
44+
$request = new Google_Http_Request('http://www.example.com', 'POST');
3745

38-
// Test resumable upload
39-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', true);
40-
$params = array('mediaUpload' => array('value' => $media));
41-
$this->assertEquals('resumable',
42-
$media->getUploadType(null));
46+
// Test resumable upload
47+
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', true);
48+
$params = array('mediaUpload' => array('value' => $media));
49+
$this->assertEquals('resumable', $media->getUploadType(null));
4350

44-
// Test data *only* uploads
45-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', false);
46-
$this->assertEquals('media',
47-
$media->getUploadType(null));
51+
// Test data *only* uploads
52+
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', false);
53+
$this->assertEquals('media', $media->getUploadType(null));
4854

49-
// Test multipart uploads
50-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', false);
51-
$this->assertEquals('multipart',
52-
$media->getUploadType(array('a' => 'b')));
53-
}
55+
// Test multipart uploads
56+
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', false);
57+
$this->assertEquals('multipart', $media->getUploadType(array('a' => 'b')));
58+
}
5459

55-
public function testResultCode() {
56-
$client = $this->getClient();
57-
$request = new Google_Http_Request('http://www.example.com', 'POST');
60+
public function testResultCode()
61+
{
62+
$client = $this->getClient();
63+
$request = new Google_Http_Request('http://www.example.com', 'POST');
5864

59-
// Test resumable upload
60-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', true);
61-
$this->assertEquals(null, $media->getHttpResultCode());
62-
}
65+
// Test resumable upload
66+
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', 'a', true);
67+
$this->assertEquals(null, $media->getHttpResultCode());
68+
}
6369

64-
public function testProcess() {
65-
$client = $this->getClient();
66-
$data = 'foo';
70+
public function testProcess()
71+
{
72+
$client = $this->getClient();
73+
$data = 'foo';
6774

68-
// Test data *only* uploads.
69-
$request = new Google_Http_Request('http://www.example.com', 'POST');
70-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', $data, false);
71-
$this->assertEquals($data, $request->getPostBody());
75+
// Test data *only* uploads.
76+
$request = new Google_Http_Request('http://www.example.com', 'POST');
77+
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', $data, false);
78+
$this->assertEquals($data, $request->getPostBody());
7279

73-
// Test resumable (meta data) - we want to send the metadata, not the app data.
74-
$request = new Google_Http_Request('http://www.example.com', 'POST');
75-
$reqData = json_encode("hello");
76-
$request->setPostBody($reqData);
77-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', $data, true);
78-
$this->assertEquals(json_decode($reqData), $request->getPostBody());
80+
// Test resumable (meta data) - we want to send the metadata, not the app data.
81+
$request = new Google_Http_Request('http://www.example.com', 'POST');
82+
$reqData = json_encode("hello");
83+
$request->setPostBody($reqData);
84+
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', $data, true);
85+
$this->assertEquals(json_decode($reqData), $request->getPostBody());
7986

80-
// Test multipart - we are sending encoded meta data and post data
81-
$request = new Google_Http_Request('http://www.example.com', 'POST');
82-
$reqData = json_encode("hello");
83-
$request->setPostBody($reqData);
84-
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', $data, false);
85-
$this->assertContains($reqData, $request->getPostBody());
86-
$this->assertContains(base64_encode($data), $request->getPostBody());
87-
}
87+
// Test multipart - we are sending encoded meta data and post data
88+
$request = new Google_Http_Request('http://www.example.com', 'POST');
89+
$reqData = json_encode("hello");
90+
$request->setPostBody($reqData);
91+
$media = new Google_Http_MediaFileUpload($client, $request, 'image/png', $data, false);
92+
$this->assertContains($reqData, $request->getPostBody());
93+
$this->assertContains(base64_encode($data), $request->getPostBody());
94+
}
8895
}

‎tests/general/ApiModelTest.php‎

Lines changed: 38 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,46 @@ class ApiModelTest extends BaseTest
2525
{
2626
public function testModelMutation()
2727
{
28-
$data = json_decode('{"kind": "calendar#event",
29-
"etag": "\"-kteSF26GsdKQ5bfmcd4H3_-u3g/MTE0NTUyNTAxOTk0MjAwMA\"",
30-
"id": "1234566",
31-
"status": "confirmed",
32-
"htmlLink": "https://www.google.com/calendar/event?eid=NWdpMmFjNDkzbm5yZzh2N2poZXNhZmdldDggaWFuLmJhcmJlckBt",
33-
"created": "2006-04-13T14:22:08.000Z",
34-
"updated": "2006-04-20T09:23:39.942Z",
35-
"summary": "Evening Jolt Q3 CTFL",
36-
"description": "6.30 - Adminning\n9.30 - Game",
37-
"creator": {
38-
"email": "ian@example.com",
39-
"displayName": "Ian Test",
40-
"self": true
41-
},
42-
"organizer": {
43-
"email": "ian@example.com",
44-
"displayName": "Ian Test",
45-
"self": true
46-
},
47-
"start": {
48-
"date": "2006-04-23"
49-
},
50-
"end": {
51-
"date": "2006-04-24"
52-
},
53-
"iCalUID": "5gi2ac493nnrfdfd7jhesafget8@google.com",
54-
"sequence": 0,
55-
"reminders": {
56-
"useDefault": false
57-
}}', true);
28+
$htmlLink = 'https://www.google.com/calendar/event?'
29+
. 'eid=NWdpMmFjNDkzbm5yZzh2N2poZXNhZmdldDggaWFuLmJhcmJlckBt';
30+
$data = json_decode(
31+
'{
32+
"kind": "calendar#event",
33+
"etag": "\"-kteSF26GsdKQ5bfmcd4H3_-u3g/MTE0NTUyNTAxOTk0MjAwMA\"",
34+
"id": "1234566",
35+
"status": "confirmed",
36+
"htmlLink": "' . $htmlLink . '",
37+
"created": "2006-04-13T14:22:08.000Z",
38+
"updated": "2006-04-20T09:23:39.942Z",
39+
"summary": "Evening Jolt Q3 CTFL",
40+
"description": "6.30 - Adminning\n9.30 - Game",
41+
"creator": {
42+
"email": "ian@example.com",
43+
"displayName": "Ian Test",
44+
"self": true
45+
},
46+
"organizer": {
47+
"email": "ian@example.com",
48+
"displayName": "Ian Test",
49+
"self": true
50+
},
51+
"start": {
52+
"date": "2006-04-23"
53+
},
54+
"end": {
55+
"date": "2006-04-24"
56+
},
57+
"iCalUID": "5gi2ac493nnrfdfd7jhesafget8@google.com",
58+
"sequence": 0,
59+
"reminders": {
60+
"useDefault": false
61+
}
62+
}',
63+
true
64+
);
5865
$event = new Google_Service_Calendar_Event($data);
5966
$date = new Google_Service_Calendar_EventDateTime();
67+
date_default_timezone_set('UTC');
6068
$dateString = Date("c");
6169
$summary = "hello";
6270
$date->setDate($dateString);

0 commit comments

Comments
 (0)