Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
white49
Alamofire
提交
316fce5c
A
Alamofire
项目概览
white49
/
Alamofire
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
Alamofire
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
316fce5c
编写于
5月 19, 2015
作者:
C
Christian Noon
提交者:
Christian Noon
5月 20, 2015
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Small formatting fixes and more detailed expectation descriptions.
上级
30b64459
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
32 addition
and
32 deletion
+32
-32
Source/Download.swift
Source/Download.swift
+1
-1
Tests/DownloadTests.swift
Tests/DownloadTests.swift
+4
-4
Tests/RequestTests.swift
Tests/RequestTests.swift
+24
-24
Tests/UploadTests.swift
Tests/UploadTests.swift
+3
-3
未找到文件。
Source/Download.swift
浏览文件 @
316fce5c
...
...
@@ -121,7 +121,7 @@ extension Request {
*/
public
class
func
suggestedDownloadDestination
(
directory
:
NSSearchPathDirectory
=
.
DocumentDirectory
,
domain
:
NSSearchPathDomainMask
=
.
UserDomainMask
)
->
DownloadFileDestination
{
return
{
(
temporaryURL
,
response
)
->
(
NSURL
)
in
return
{
temporaryURL
,
response
->
NSURL
in
if
let
directoryURL
=
NSFileManager
.
defaultManager
()
.
URLsForDirectory
(
directory
,
inDomains
:
domain
)[
0
]
as?
NSURL
{
return
directoryURL
.
URLByAppendingPathComponent
(
response
.
suggestedFilename
!
)
}
...
...
Tests/DownloadTests.swift
浏览文件 @
316fce5c
...
...
@@ -35,18 +35,18 @@ class DownloadResponseTestCase: BaseTestCase {
func
testDownloadRequest
()
{
// Given
let
numberOfLines
=
100
let
URL
=
"http://httpbin.org/stream/
\(
numberOfLines
)
"
let
URL
String
=
"http://httpbin.org/stream/
\(
numberOfLines
)
"
let
destination
=
Alamofire
.
Request
.
suggestedDownloadDestination
(
directory
:
searchPathDirectory
,
domain
:
searchPathDomain
)
let
expectation
=
expectationWithDescription
(
URL
)
let
expectation
=
expectationWithDescription
(
"Download request should download data to file:
\(
URLString
)
"
)
var
request
:
NSURLRequest
?
var
response
:
NSHTTPURLResponse
?
var
error
:
NSError
?
// When
Alamofire
.
download
(
.
GET
,
URL
,
destination
)
Alamofire
.
download
(
.
GET
,
URL
String
,
destination
)
.
response
{
responseRequest
,
responseResponse
,
_
,
responseError
in
request
=
responseRequest
response
=
responseResponse
...
...
@@ -97,7 +97,7 @@ class DownloadResponseTestCase: BaseTestCase {
}
}
func
testDownloadRequestWithProgress
2
()
{
func
testDownloadRequestWithProgress
()
{
// Given
let
randomBytes
=
4
*
1024
*
1024
let
URLString
=
"http://httpbin.org/bytes/
\(
randomBytes
)
"
...
...
Tests/RequestTests.swift
浏览文件 @
316fce5c
...
...
@@ -27,27 +27,27 @@ import XCTest
class
RequestInitializationTestCase
:
BaseTestCase
{
func
testRequestClassMethodWithMethodAndURL
()
{
// Given
let
URL
=
"http://httpbin.org/"
let
URL
String
=
"http://httpbin.org/"
// When
let
request
=
Alamofire
.
request
(
.
GET
,
URL
)
let
request
=
Alamofire
.
request
(
.
GET
,
URL
String
)
// Then
XCTAssertNotNil
(
request
.
request
,
"request should not be nil"
)
XCTAssertEqual
(
request
.
request
.
URL
!
,
NSURL
(
string
:
URL
)
!
,
"request URL should be equal"
)
XCTAssertEqual
(
request
.
request
.
URL
!
,
NSURL
(
string
:
URL
String
)
!
,
"request URL should be equal"
)
XCTAssertNil
(
request
.
response
,
"response should be nil"
)
}
func
testRequestClassMethodWithMethodAndURLAndParameters
()
{
// Given
let
URL
=
"http://httpbin.org/get"
let
URL
String
=
"http://httpbin.org/get"
// When
let
request
=
Alamofire
.
request
(
.
GET
,
URL
,
parameters
:
[
"foo"
:
"bar"
])
let
request
=
Alamofire
.
request
(
.
GET
,
URL
String
,
parameters
:
[
"foo"
:
"bar"
])
// Then
XCTAssertNotNil
(
request
.
request
,
"request should not be nil"
)
XCTAssertNotEqual
(
request
.
request
.
URL
!
,
NSURL
(
string
:
URL
)
!
,
"request URL should be equal"
)
XCTAssertNotEqual
(
request
.
request
.
URL
!
,
NSURL
(
string
:
URL
String
)
!
,
"request URL should be equal"
)
XCTAssertEqual
(
request
.
request
.
URL
?
.
query
??
""
,
"foo=bar"
,
"query is incorrect"
)
XCTAssertNil
(
request
.
response
,
"response should be nil"
)
}
...
...
@@ -58,10 +58,10 @@ class RequestInitializationTestCase: BaseTestCase {
class
RequestResponseTestCase
:
BaseTestCase
{
func
testRequestResponse
()
{
// Given
let
URL
=
"http://httpbin.org/get"
let
URL
String
=
"http://httpbin.org/get"
let
serializer
=
Alamofire
.
Request
.
stringResponseSerializer
(
encoding
:
NSUTF8StringEncoding
)
let
expectation
=
expectationWithDescription
(
"
\(
URL
)
"
)
let
expectation
=
expectationWithDescription
(
"
GET request should succeed:
\(
URLString
)
"
)
var
request
:
NSURLRequest
?
var
response
:
NSHTTPURLResponse
?
...
...
@@ -69,7 +69,7 @@ class RequestResponseTestCase: BaseTestCase {
var
error
:
NSError
?
// When
Alamofire
.
request
(
.
GET
,
URL
,
parameters
:
[
"foo"
:
"bar"
])
Alamofire
.
request
(
.
GET
,
URL
String
,
parameters
:
[
"foo"
:
"bar"
])
.
response
(
serializer
:
serializer
)
{
responseRequest
,
responseResponse
,
responseString
,
responseError
in
request
=
responseRequest
response
=
responseResponse
...
...
@@ -160,11 +160,11 @@ class RequestResponseTestCase: BaseTestCase {
class
RequestDescriptionTestCase
:
BaseTestCase
{
func
testRequestDescription
()
{
// Given
let
URL
=
"http://httpbin.org/get"
let
request
=
Alamofire
.
request
(
.
GET
,
URL
)
let
URL
String
=
"http://httpbin.org/get"
let
request
=
Alamofire
.
request
(
.
GET
,
URL
String
)
let
initialRequestDescription
=
request
.
description
let
expectation
=
expectationWithDescription
(
"
\(
URL
)
"
)
let
expectation
=
expectationWithDescription
(
"
Request description should update:
\(
URLString
)
"
)
var
finalRequestDescription
:
String
?
var
response
:
NSHTTPURLResponse
?
...
...
@@ -200,38 +200,38 @@ class RequestDebugDescriptionTestCase: BaseTestCase {
func
testGETRequestDebugDescription
()
{
// Given
let
URL
=
"http://httpbin.org/get"
let
URL
String
=
"http://httpbin.org/get"
// When
let
request
=
manager
.
request
(
.
GET
,
URL
)
let
request
=
manager
.
request
(
.
GET
,
URL
String
)
let
components
=
cURLCommandComponents
(
request
)
// Then
XCTAssertEqual
(
components
[
0
..<
3
],
[
"$"
,
"curl"
,
"-i"
],
"components should be equal"
)
XCTAssertFalse
(
contains
(
components
,
"-X"
),
"command should not contain explicit -X flag"
)
XCTAssertEqual
(
components
.
last
??
""
,
"
\"\(
URL
)\"
"
,
"URL component should be equal"
)
XCTAssertEqual
(
components
.
last
??
""
,
"
\"\(
URL
String
)\"
"
,
"URL component should be equal"
)
}
func
testPOSTRequestDebugDescription
()
{
// Given
let
URL
=
"http://httpbin.org/post"
let
URL
String
=
"http://httpbin.org/post"
// When
let
request
=
manager
.
request
(
.
POST
,
URL
)
let
request
=
manager
.
request
(
.
POST
,
URL
String
)
let
components
=
cURLCommandComponents
(
request
)
// Then
XCTAssertEqual
(
components
[
0
..<
3
],
[
"$"
,
"curl"
,
"-i"
],
"components should be equal"
)
XCTAssertEqual
(
components
[
3
..<
5
],
[
"-X"
,
"POST"
],
"command should contain explicit -X flag"
)
XCTAssertEqual
(
components
.
last
??
""
,
"
\"\(
URL
)\"
"
,
"URL component should be equal"
)
XCTAssertEqual
(
components
.
last
??
""
,
"
\"\(
URL
String
)\"
"
,
"URL component should be equal"
)
}
func
testPOSTRequestWithJSONParametersDebugDescription
()
{
// Given
let
URL
=
"http://httpbin.org/post"
let
URL
String
=
"http://httpbin.org/post"
// When
let
request
=
manager
.
request
(
.
POST
,
URL
,
parameters
:
[
"foo"
:
"bar"
],
encoding
:
.
JSON
)
let
request
=
manager
.
request
(
.
POST
,
URL
String
,
parameters
:
[
"foo"
:
"bar"
],
encoding
:
.
JSON
)
let
components
=
cURLCommandComponents
(
request
)
// Then
...
...
@@ -239,12 +239,12 @@ class RequestDebugDescriptionTestCase: BaseTestCase {
XCTAssertEqual
(
components
[
3
..<
5
],
[
"-X"
,
"POST"
],
"command should contain explicit -X flag"
)
XCTAssertTrue
(
request
.
debugDescription
.
rangeOfString
(
"-H
\"
Content-Type: application/json
\"
"
)
!=
nil
,
"command should contain 'application/json' Content-Type"
)
XCTAssertTrue
(
request
.
debugDescription
.
rangeOfString
(
"-d
\"
{
\\\"
foo
\\\"
:
\\\"
bar
\\\"
}
\"
"
)
!=
nil
,
"command data should contain JSON encoded parameters"
)
XCTAssertEqual
(
components
.
last
??
""
,
"
\"\(
URL
)\"
"
,
"URL component should be equal"
)
XCTAssertEqual
(
components
.
last
??
""
,
"
\"\(
URL
String
)\"
"
,
"URL component should be equal"
)
}
func
testPOSTRequestWithCookieDebugDescription
()
{
// Given
let
URL
=
"http://httpbin.org/post"
let
URL
String
=
"http://httpbin.org/post"
let
properties
=
[
NSHTTPCookieDomain
:
"httpbin.org"
,
...
...
@@ -256,13 +256,13 @@ class RequestDebugDescriptionTestCase: BaseTestCase {
manager
.
session
.
configuration
.
HTTPCookieStorage
?
.
setCookie
(
cookie
)
// When
let
request
=
manager
.
request
(
.
POST
,
URL
)
let
request
=
manager
.
request
(
.
POST
,
URL
String
)
let
components
=
cURLCommandComponents
(
request
)
// Then
XCTAssertEqual
(
components
[
0
..<
3
],
[
"$"
,
"curl"
,
"-i"
],
"components should be equal"
)
XCTAssertEqual
(
components
[
3
..<
5
],
[
"-X"
,
"POST"
],
"command should contain explicit -X flag"
)
XCTAssertEqual
(
components
.
last
??
""
,
"
\"\(
URL
)\"
"
,
"URL component should be equal"
)
XCTAssertEqual
(
components
.
last
??
""
,
"
\"\(
URL
String
)\"
"
,
"URL component should be equal"
)
#if !os(OSX)
XCTAssertEqual
(
components
[
5
..<
6
],
[
"-b"
],
"command should contain -b flag"
)
...
...
Tests/UploadTests.swift
浏览文件 @
316fce5c
...
...
@@ -27,17 +27,17 @@ import XCTest
class
UploadResponseTestCase
:
BaseTestCase
{
func
testUploadRequest
()
{
// Given
let
URL
=
"http://httpbin.org/post"
let
URL
String
=
"http://httpbin.org/post"
let
data
=
"Lorem ipsum dolor sit amet"
.
dataUsingEncoding
(
NSUTF8StringEncoding
,
allowLossyConversion
:
false
)
!
let
expectation
=
expectationWithDescription
(
URL
)
let
expectation
=
expectationWithDescription
(
"Upload request should succeed:
\(
URLString
)
"
)
var
request
:
NSURLRequest
?
var
response
:
NSHTTPURLResponse
?
var
error
:
NSError
?
// When
Alamofire
.
upload
(
.
POST
,
URL
,
data
)
Alamofire
.
upload
(
.
POST
,
URL
String
,
data
)
.
response
{
responseRequest
,
responseResponse
,
_
,
responseError
in
request
=
responseRequest
response
=
responseResponse
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录