Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
0ab7047b
Commit
0ab7047b
authored
Jul 17, 2019
by
Matan Shukry
Committed by
Kate Lovett
Jul 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Using custom exception class for network loading error (#35335)
Using custom exception class for network loading error
parent
7a4665f1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
50 additions
and
1 deletion
+50
-1
_network_image_io.dart
packages/flutter/lib/src/painting/_network_image_io.dart
+1
-1
image_provider.dart
packages/flutter/lib/src/painting/image_provider.dart
+22
-0
image_provider_test.dart
packages/flutter/test/painting/image_provider_test.dart
+27
-0
No files found.
packages/flutter/lib/src/painting/_network_image_io.dart
View file @
0ab7047b
...
@@ -87,7 +87,7 @@ class NetworkImage extends image_provider.ImageProvider<image_provider.NetworkIm
...
@@ -87,7 +87,7 @@ class NetworkImage extends image_provider.ImageProvider<image_provider.NetworkIm
});
});
final
HttpClientResponse
response
=
await
request
.
close
();
final
HttpClientResponse
response
=
await
request
.
close
();
if
(
response
.
statusCode
!=
HttpStatus
.
ok
)
if
(
response
.
statusCode
!=
HttpStatus
.
ok
)
throw
Exception
(
'HTTP request failed, statusCode:
${response?.statusCode}
,
$resolved
'
);
throw
image_provider
.
NetworkImageLoadException
(
statusCode:
response
.
statusCode
,
uri:
resolved
);
final
Uint8List
bytes
=
await
consolidateHttpClientResponseBytes
(
final
Uint8List
bytes
=
await
consolidateHttpClientResponseBytes
(
response
,
response
,
...
...
packages/flutter/lib/src/painting/image_provider.dart
View file @
0ab7047b
...
@@ -780,3 +780,25 @@ class _ErrorImageCompleter extends ImageStreamCompleter {
...
@@ -780,3 +780,25 @@ class _ErrorImageCompleter extends ImageStreamCompleter {
);
);
}
}
}
}
/// The exception thrown when the HTTP request to load a network image fails.
class
NetworkImageLoadException
implements
Exception
{
/// Creates a [NetworkImageLoadException] with the specified http status
/// [code] and the [uri]
NetworkImageLoadException
({
@required
this
.
statusCode
,
@required
this
.
uri
})
:
assert
(
uri
!=
null
),
assert
(
statusCode
!=
null
),
_message
=
'HTTP request failed, statusCode:
$statusCode
,
$uri
'
;
/// The HTTP status code from the server.
final
int
statusCode
;
/// A human-readable error message.
final
String
_message
;
/// Resolved URI of the requested image.
final
Uri
uri
;
@override
String
toString
()
=>
_message
;
}
packages/flutter/test/painting/image_provider_test.dart
View file @
0ab7047b
...
@@ -11,6 +11,7 @@ import 'package:flutter/foundation.dart';
...
@@ -11,6 +11,7 @@ import 'package:flutter/foundation.dart';
import
'package:flutter/painting.dart'
;
import
'package:flutter/painting.dart'
;
import
'package:flutter_test/flutter_test.dart'
;
import
'package:flutter_test/flutter_test.dart'
;
import
'package:mockito/mockito.dart'
;
import
'package:mockito/mockito.dart'
;
import
'package:test_api/test_api.dart'
show
TypeMatcher
;
import
'../rendering/rendering_tester.dart'
;
import
'../rendering/rendering_tester.dart'
;
import
'image_data.dart'
;
import
'image_data.dart'
;
...
@@ -154,6 +155,32 @@ void main() {
...
@@ -154,6 +155,32 @@ void main() {
debugNetworkImageHttpClientProvider
=
null
;
debugNetworkImageHttpClientProvider
=
null
;
});
});
test
(
'Expect thrown exception with statusCode'
,
()
async
{
final
int
errorStatusCode
=
HttpStatus
.
notFound
;
const
String
requestUrl
=
'foo-url'
;
final
MockHttpClientRequest
request
=
MockHttpClientRequest
();
final
MockHttpClientResponse
response
=
MockHttpClientResponse
();
when
(
httpClient
.
getUrl
(
any
)).
thenAnswer
((
_
)
=>
Future
<
HttpClientRequest
>.
value
(
request
));
when
(
request
.
close
()).
thenAnswer
((
_
)
=>
Future
<
HttpClientResponse
>.
value
(
response
));
when
(
response
.
statusCode
).
thenReturn
(
errorStatusCode
);
final
Completer
<
dynamic
>
caughtError
=
Completer
<
dynamic
>();
final
ImageProvider
imageProvider
=
NetworkImage
(
nonconst
(
requestUrl
));
final
ImageStream
result
=
imageProvider
.
resolve
(
ImageConfiguration
.
empty
);
result
.
addListener
(
ImageStreamListener
((
ImageInfo
info
,
bool
syncCall
)
{
},
onError:
(
dynamic
error
,
StackTrace
stackTrace
)
{
caughtError
.
complete
(
error
);
}));
final
dynamic
err
=
await
caughtError
.
future
;
expect
(
err
,
const
TypeMatcher
<
NetworkImageLoadException
>()
.
having
((
NetworkImageLoadException
e
)
=>
e
.
statusCode
,
'statusCode'
,
errorStatusCode
)
.
having
((
NetworkImageLoadException
e
)
=>
e
.
uri
,
'uri'
,
Uri
.
base
.
resolve
(
requestUrl
))
);
});
test
(
'Disallows null urls'
,
()
{
test
(
'Disallows null urls'
,
()
{
expect
(()
{
expect
(()
{
NetworkImage
(
nonconst
(
null
));
NetworkImage
(
nonconst
(
null
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment