Skip to content

Commit

Permalink
Fixed line ending problems on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
John Kelly committed Jul 27, 2012
1 parent beb1810 commit b0f28e8
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 37 deletions.
66 changes: 31 additions & 35 deletions tests/ZendService/Amazon/Authentication/S3Test.php
View file
Expand Up @@ -54,11 +54,10 @@ public function testGetGeneratesCorrectSignature()
$ret = $this->_amazon->generateSignature('GET', 'http://s3.amazonaws.com/johnsmith/photos/puppy.jpg', $headers);

$this->assertEquals('AWS 0PN5J17HBGZHT7JJ3X82:soqB4L9flQ6AHG4d5FVnKj26D2s=', $headers['Authorization']);
$this->assertEquals($ret, "GET
Tue, 27 Mar 2007 19:36:42 +0000
//johnsmith/photos/puppy.jpg");
$rawHttpResponse = "GET\n\n\n"
. "Tue, 27 Mar 2007 19:36:42 +0000\n"
. "//johnsmith/photos/puppy.jpg";
$this->assertEquals($ret, $rawHttpResponse);
}

public function testPutGeneratesCorrectSignature()
Expand All @@ -71,11 +70,11 @@ public function testPutGeneratesCorrectSignature()
$ret = $this->_amazon->generateSignature('PUT', 'http://s3.amazonaws.com/johnsmith/photos/puppy.jpg', $headers);

$this->assertEquals('AWS 0PN5J17HBGZHT7JJ3X82:88cf7BdpjrBlCsIiWWLn8wLpWzI=', $headers['Authorization']);
$this->assertEquals($ret, "PUT
image/jpeg
Tue, 27 Mar 2007 21:15:45 +0000
//johnsmith/photos/puppy.jpg");
$rawHttpResponse = "PUT\n\n"
. "image/jpeg\n"
. "Tue, 27 Mar 2007 21:15:45 +0000\n"
. "//johnsmith/photos/puppy.jpg";
$this->assertEquals($ret, $rawHttpResponse);
}

public function testListGeneratesCorrectSignature()
Expand All @@ -86,11 +85,10 @@ public function testListGeneratesCorrectSignature()
$ret = $this->_amazon->generateSignature('GET', 'http://s3.amazonaws.com/johnsmith/?prefix=photos&max-keys=50&marker=puppy', $headers);

$this->assertEquals('AWS 0PN5J17HBGZHT7JJ3X82:pm3Adv2BIFCCJiUSikcLcGYFtiA=', $headers['Authorization']);
$this->assertEquals($ret, "GET
Tue, 27 Mar 2007 19:42:41 +0000
//johnsmith/");
$rawHttpResponse = "GET\n\n\n"
. "Tue, 27 Mar 2007 19:42:41 +0000\n"
. "//johnsmith/";
$this->assertEquals($ret, $rawHttpResponse);
}

public function testFetchGeneratesCorrectSignature()
Expand All @@ -101,11 +99,10 @@ public function testFetchGeneratesCorrectSignature()
$ret = $this->_amazon->generateSignature('GET', 'http://s3.amazonaws.com/johnsmith/?acl', $headers);

$this->assertEquals('AWS 0PN5J17HBGZHT7JJ3X82:TCNlZPuxY41veihZbxjnjw8P93w=', $headers['Authorization']);
$this->assertEquals($ret, "GET
Tue, 27 Mar 2007 19:44:46 +0000
//johnsmith/?acl");
$rawHttpResponse = "GET\n\n\n"
. "Tue, 27 Mar 2007 19:44:46 +0000\n"
. "//johnsmith/?acl";
$this->assertEquals($ret, $rawHttpResponse);
}

public function testDeleteGeneratesCorrectSignature()
Expand All @@ -117,12 +114,10 @@ public function testDeleteGeneratesCorrectSignature()
$ret = $this->_amazon->generateSignature('DELETE', 'http://s3.amazonaws.com/johnsmith/photos/puppy.jpg', $headers);

$this->assertEquals('AWS 0PN5J17HBGZHT7JJ3X82:O9AsSXUIowhjTiJC5escAqjsAyk=', $headers['Authorization']);
$this->assertEquals($ret, "DELETE
x-amz-date:Tue, 27 Mar 2007 21:20:26 +0000
//johnsmith/photos/puppy.jpg");
$rawHttpResponse = "DELETE\n\n\n\n"
. "x-amz-date:Tue, 27 Mar 2007 21:20:26 +0000\n"
. "//johnsmith/photos/puppy.jpg";
$this->assertEquals($ret, $rawHttpResponse);
}

public function testUploadGeneratesCorrectSignature()
Expand All @@ -144,15 +139,16 @@ public function testUploadGeneratesCorrectSignature()
$ret = $this->_amazon->generateSignature('PUT', 'http://s3.amazonaws.com/static.johnsmith.net/db-backup.dat.gz', $headers);

$this->assertEquals('AWS 0PN5J17HBGZHT7JJ3X82:IQh2zwCpX2xqRgP2rbIkXL/GVbA=', $headers['Authorization']);
$this->assertEquals($ret, "PUT
4gJE4saaMU4BqNR0kLY+lw==
application/x-download
Tue, 27 Mar 2007 21:06:08 +0000
x-amz-acl:public-read
x-amz-meta-checksumalgorithm:crc32
x-amz-meta-filechecksum:0x02661779
x-amz-meta-reviewedby:joe@johnsmith.net,jane@johnsmith.net
//static.johnsmith.net/db-backup.dat.gz");
$rawHttpResponse = "PUT\n"
. "4gJE4saaMU4BqNR0kLY+lw==\n"
. "application/x-download\n"
. "Tue, 27 Mar 2007 21:06:08 +0000\n"
. "x-amz-acl:public-read\n"
. "x-amz-meta-checksumalgorithm:crc32\n"
. "x-amz-meta-filechecksum:0x02661779\n"
. "x-amz-meta-reviewedby:joe@johnsmith.net,jane@johnsmith.net\n"
. "//static.johnsmith.net/db-backup.dat.gz";
$this->assertEquals($ret, $rawHttpResponse);
}

}
Expand Down
4 changes: 2 additions & 2 deletions tests/ZendService/Amazon/Authentication/V2Test.php
View file
Expand Up @@ -58,7 +58,7 @@ public function testGenerateEc2PostSignature()
$ret = $this->_amazon->generateSignature($url, $params);

$this->assertEquals('8B2cxwK/dfezT49KEzD+wjo1ZbJCddyFOLA0RNZobbc=', $params['Signature']);
$this->assertEquals(file_get_contents(dirname(__FILE__) . '/_files/ec2_v2_return.txt'), $ret);
$this->assertEquals(str_replace("\r\n", "\n", file_get_contents(dirname(__FILE__) . '/_files/ec2_v2_return.txt')), $ret);
}

public function testGenerateSqsGetSignature()
Expand All @@ -74,7 +74,7 @@ public function testGenerateSqsGetSignature()
$ret = $this->_amazon->generateSignature($url, $params);

$this->assertEquals('YSw7HXDqokM/A6DhLz8kG+sd+oD5eMjqx3a02A0+GkE=', $params['Signature']);
$this->assertEquals(file_get_contents(dirname(__FILE__) . '/_files/sqs_v2_get_return.txt'), $ret);
$this->assertEquals(str_replace("\r\n", "\n", file_get_contents(dirname(__FILE__) . '/_files/sqs_v2_get_return.txt')), $ret);
}

}
Expand Down

0 comments on commit b0f28e8

Please sign in to comment.