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
cd834774
Unverified
Commit
cd834774
authored
Sep 12, 2022
by
Jonah Williams
Committed by
GitHub
Sep 12, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[framework] work around to load self packages from packages/ (#111350)
parent
81fd386a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
0 deletions
+38
-0
test.dart
dev/bots/test.dart
+1
-0
foo.png
dev/integration_tests/ui/assets/foo.png
+0
-0
pubspec.yaml
dev/integration_tests/ui/pubspec.yaml
+2
-0
asset_test.dart
dev/integration_tests/ui/test/asset_test.dart
+19
-0
asset_bundle.dart
packages/flutter/lib/src/services/asset_bundle.dart
+16
-0
No files found.
dev/bots/test.dart
View file @
cd834774
...
@@ -964,6 +964,7 @@ Future<void> _runFrameworkTests() async {
...
@@ -964,6 +964,7 @@ Future<void> _runFrameworkTests() async {
await
_runDartTest
(
path
.
join
(
flutterRoot
,
'dev'
,
'conductor'
,
'core'
),
forceSingleCore:
true
);
await
_runDartTest
(
path
.
join
(
flutterRoot
,
'dev'
,
'conductor'
,
'core'
),
forceSingleCore:
true
);
// TODO(gspencergoog): Remove the exception for fatalWarnings once https://github.com/flutter/flutter/pull/91127 has landed.
// TODO(gspencergoog): Remove the exception for fatalWarnings once https://github.com/flutter/flutter/pull/91127 has landed.
await
_runFlutterTest
(
path
.
join
(
flutterRoot
,
'dev'
,
'integration_tests'
,
'android_semantics_testing'
),
fatalWarnings:
false
);
await
_runFlutterTest
(
path
.
join
(
flutterRoot
,
'dev'
,
'integration_tests'
,
'android_semantics_testing'
),
fatalWarnings:
false
);
await
_runFlutterTest
(
path
.
join
(
flutterRoot
,
'dev'
,
'integration_tests'
,
'ui'
));
await
_runFlutterTest
(
path
.
join
(
flutterRoot
,
'dev'
,
'manual_tests'
));
await
_runFlutterTest
(
path
.
join
(
flutterRoot
,
'dev'
,
'manual_tests'
));
await
_runFlutterTest
(
path
.
join
(
flutterRoot
,
'dev'
,
'tools'
,
'vitool'
));
await
_runFlutterTest
(
path
.
join
(
flutterRoot
,
'dev'
,
'tools'
,
'vitool'
));
await
_runFlutterTest
(
path
.
join
(
flutterRoot
,
'dev'
,
'tools'
,
'gen_defaults'
));
await
_runFlutterTest
(
path
.
join
(
flutterRoot
,
'dev'
,
'tools'
,
'gen_defaults'
));
...
...
dev/integration_tests/ui/assets/foo.png
0 → 100644
View file @
cd834774
This diff was suppressed by a .gitattributes entry.
dev/integration_tests/ui/pubspec.yaml
View file @
cd834774
...
@@ -79,5 +79,7 @@ dev_dependencies:
...
@@ -79,5 +79,7 @@ dev_dependencies:
flutter
:
flutter
:
uses-material-design
:
true
uses-material-design
:
true
assets
:
-
assets/foo.png
# PUBSPEC CHECKSUM: 8eeb
# PUBSPEC CHECKSUM: 8eeb
dev/integration_tests/ui/test/asset_test.dart
0 → 100644
View file @
cd834774
// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import
'package:flutter/material.dart'
;
import
'package:flutter_test/flutter_test.dart'
;
// Regression test for https://github.com/flutter/flutter/issues/111285
void
main
(
)
{
testWidgets
(
'Can load asset from same package without error'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
MaterialApp
(
home:
Scaffold
(
body:
Image
.
asset
(
'assets/foo.png'
,
package:
'integration_ui'
))));
await
tester
.
pumpAndSettle
();
// If this asset couldn't be loaded, the exception message would be
// "asset failed to load"
expect
(
tester
.
takeException
().
toString
(),
contains
(
'Invalid image data'
));
});
}
packages/flutter/lib/src/services/asset_bundle.dart
View file @
cd834774
...
@@ -266,6 +266,22 @@ class PlatformAssetBundle extends CachingAssetBundle {
...
@@ -266,6 +266,22 @@ class PlatformAssetBundle extends CachingAssetBundle {
final
ByteData
bytes
=
await
load
(
key
);
final
ByteData
bytes
=
await
load
(
key
);
return
ui
.
ImmutableBuffer
.
fromUint8List
(
bytes
.
buffer
.
asUint8List
());
return
ui
.
ImmutableBuffer
.
fromUint8List
(
bytes
.
buffer
.
asUint8List
());
}
}
bool
debugUsePlatformChannel
=
false
;
assert
(()
{
// dart:io is safe to use here since we early return for web
// above. If that code is changed, this needs to be gaurded on
// web presence. Override how assets are loaded in tests so that
// the old loader behavior that allows tests to load assets from
// the current package using the package prefix.
if
(
Platform
.
environment
.
containsKey
(
'UNIT_TEST_ASSETS'
))
{
debugUsePlatformChannel
=
true
;
}
return
true
;
}());
if
(
debugUsePlatformChannel
)
{
final
ByteData
bytes
=
await
load
(
key
);
return
ui
.
ImmutableBuffer
.
fromUint8List
(
bytes
.
buffer
.
asUint8List
());
}
try
{
try
{
return
await
ui
.
ImmutableBuffer
.
fromAsset
(
key
);
return
await
ui
.
ImmutableBuffer
.
fromAsset
(
key
);
}
on
Exception
{
}
on
Exception
{
...
...
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