Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
white49
Alamofire
提交
0bab25fa
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,发现更多精彩内容 >>
未验证
提交
0bab25fa
编写于
7月 09, 2019
作者:
C
Christian Noon
提交者:
GitHub
7月 09, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Appending response serializer now resumes request if finished to handle races (#2862)
上级
7c743e58
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
39 addition
and
18 deletion
+39
-18
Source/AFError.swift
Source/AFError.swift
+0
-4
Source/Request.swift
Source/Request.swift
+1
-1
Tests/AFError+AlamofireTests.swift
Tests/AFError+AlamofireTests.swift
+0
-10
Tests/RequestTests.swift
Tests/RequestTests.swift
+38
-3
未找到文件。
Source/AFError.swift
浏览文件 @
0bab25fa
...
...
@@ -111,8 +111,6 @@ public enum AFError: Error {
case
decodingFailed
(
error
:
Error
)
/// Generic serialization failed for an empty response that wasn't type `Empty` but instead the associated type.
case
invalidEmptyResponse
(
type
:
String
)
/// A response serializer was added to the request after the request was already finished.
case
responseSerializerAddedAfterRequestFinished
}
/// Underlying reason a server trust evaluation error occurred.
...
...
@@ -541,8 +539,6 @@ extension AFError.ResponseSerializationFailureReason {
return
"Empty response could not be serialized to type:
\(
type
)
. Use Empty as the expected type for such responses."
case
.
decodingFailed
(
let
error
):
return
"Response could not be decoded because of error:
\n\(
error
.
localizedDescription
)
"
case
.
responseSerializerAddedAfterRequestFinished
:
return
"Response serializer was added to the request after it had already finished."
}
}
}
...
...
Source/Request.swift
浏览文件 @
0bab25fa
...
...
@@ -442,7 +442,7 @@ public class Request {
mutableState
.
responseSerializers
.
append
(
closure
)
if
mutableState
.
state
==
.
finished
{
mutableState
.
error
=
AFError
.
responseSerializationFailed
(
reason
:
.
responseSerializerAddedAfterRequestFinished
)
mutableState
.
state
=
.
resumed
}
if
mutableState
.
responseSerializerProcessingFinished
{
...
...
Tests/AFError+AlamofireTests.swift
浏览文件 @
0bab25fa
...
...
@@ -142,11 +142,6 @@ extension AFError {
return
false
}
var
isResponseSerializerAddedAfterRequestFinished
:
Bool
{
if
case
let
.
responseSerializationFailed
(
reason
)
=
self
,
reason
.
isResponseSerializerAddedAfterRequestFinished
{
return
true
}
return
false
}
// ResponseValidationFailureReason
var
isDataFileNil
:
Bool
{
...
...
@@ -295,11 +290,6 @@ extension AFError.ResponseSerializationFailureReason {
if
case
.
invalidEmptyResponse
=
self
{
return
true
}
return
false
}
var
isResponseSerializerAddedAfterRequestFinished
:
Bool
{
if
case
.
responseSerializerAddedAfterRequestFinished
=
self
{
return
true
}
return
false
}
}
// MARK: -
...
...
Tests/RequestTests.swift
浏览文件 @
0bab25fa
...
...
@@ -652,15 +652,16 @@ class RequestResponseTestCase: BaseTestCase {
XCTAssertEqual
(
response2
?
.
error
?
.
asAFError
?
.
isExplicitlyCancelledError
,
true
)
}
func
testThatAppendingResponseSerializerToCompletedRequest
CallsCompletion
()
{
func
testThatAppendingResponseSerializerToCompletedRequest
InsideCompletionResumesRequest
()
{
// Given
let
session
=
Session
()
var
response1
:
DataResponse
<
Any
>
?
var
response2
:
DataResponse
<
Any
>
?
var
response3
:
DataResponse
<
Any
>
?
let
expect
=
expectation
(
description
:
"both response serializer completions should be called"
)
expect
.
expectedFulfillmentCount
=
2
expect
.
expectedFulfillmentCount
=
3
// When
let
request
=
session
.
request
(
URLRequest
.
makeHTTPBinRequest
())
...
...
@@ -672,6 +673,11 @@ class RequestResponseTestCase: BaseTestCase {
request
.
responseJSON
{
resp
in
response2
=
resp
expect
.
fulfill
()
request
.
responseJSON
{
resp
in
response3
=
resp
expect
.
fulfill
()
}
}
}
...
...
@@ -679,7 +685,36 @@ class RequestResponseTestCase: BaseTestCase {
// Then
XCTAssertNotNil
(
response1
?
.
value
)
XCTAssertEqual
(
response2
?
.
error
?
.
asAFError
?
.
isResponseSerializerAddedAfterRequestFinished
,
true
)
XCTAssertNotNil
(
response2
?
.
value
)
XCTAssertNotNil
(
response3
?
.
value
)
}
func
testThatAppendingResponseSerializerToCompletedRequestOutsideCompletionResumesRequest
()
{
// Given
let
session
=
Session
()
let
request
=
session
.
request
(
URLRequest
.
makeHTTPBinRequest
())
var
response1
:
DataResponse
<
Any
>
?
var
response2
:
DataResponse
<
Any
>
?
var
response3
:
DataResponse
<
Any
>
?
// When
let
expect1
=
expectation
(
description
:
"response serializer 1 completion should be called"
)
request
.
responseJSON
{
response1
=
$0
;
expect1
.
fulfill
()
}
waitForExpectations
(
timeout
:
timeout
,
handler
:
nil
)
let
expect2
=
expectation
(
description
:
"response serializer 2 completion should be called"
)
request
.
responseJSON
{
response2
=
$0
;
expect2
.
fulfill
()
}
waitForExpectations
(
timeout
:
timeout
,
handler
:
nil
)
let
expect3
=
expectation
(
description
:
"response serializer 3 completion should be called"
)
request
.
responseJSON
{
response3
=
$0
;
expect3
.
fulfill
()
}
waitForExpectations
(
timeout
:
timeout
,
handler
:
nil
)
// Then
XCTAssertNotNil
(
response1
?
.
value
)
XCTAssertNotNil
(
response2
?
.
value
)
XCTAssertNotNil
(
response3
?
.
value
)
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录