Skip to content

Commit b1280b5

Browse files
committed
Fix tests after rebase
1 parent edf2a4e commit b1280b5

File tree

3 files changed

+15
-24
lines changed

3 files changed

+15
-24
lines changed

src/resources/resource_storage.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,10 @@ impl ResourceStorage {
286286
let mut result = String::new();
287287

288288
for dep in deps.iter() {
289-
if let ResourceContent::Text(content) = &dep.content {
290-
result += content;
291-
result += "\n";
292-
}
289+
if let ResourceContent::Text(content) = &dep.content {
290+
result += content;
291+
result += "\n";
292+
}
293293
}
294294

295295
result += &invokations;

tests/unit/engine.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ mod tests {
229229
let expected_hash: u64 = if cfg!(feature = "css-validation") {
230230
15959922653220214643
231231
} else {
232-
16953879754096715156
232+
17169786507112655088
233233
};
234234

235235
assert_eq!(hash(&data), expected_hash, "{}", HASH_MISMATCH_MSG);

tests/unit/resources/resource_storage.rs

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -813,35 +813,26 @@ mod shared_storage_tests {
813813

814814
use std::rc::Rc;
815815

816-
/// To be wrapped in [Rc] for shared access across engines.
817-
struct BraveCoreResourceStorageInner {
818-
/// Stores each resource by its canonical name
819-
resources: HashMap<String, Resource>,
820-
}
821-
822816
#[derive(Clone)]
823817
struct BraveCoreResourceStorage {
824-
shared_storage: Rc<BraveCoreResourceStorageInner>,
818+
shared_storage: Rc<InMemoryResourceStorage>,
825819
}
826820

827821
impl ResourceStorageBackend for BraveCoreResourceStorage {
828-
fn get_resource(&self, resource_ident: &str) -> Option<Resource> {
829-
self.shared_storage.resources.get(resource_ident).cloned()
822+
fn get_resource(&self, resource_ident: &str) -> Option<ResourceImpl> {
823+
self.shared_storage.get_resource(resource_ident)
830824
}
831825
}
832826

833827
#[test]
834828
fn share_resources() {
835-
let shared_storage = Rc::new(BraveCoreResourceStorageInner {
836-
resources: HashMap::from_iter([(
837-
"test-scriptlet.js".to_string(),
838-
Resource::simple(
839-
"test-scriptlet",
840-
MimeType::ApplicationJavascript,
841-
"success!",
842-
),
843-
)]),
844-
});
829+
let in_memory_storage = InMemoryResourceStorage::from_resources([Resource::simple(
830+
"test-scriptlet.js",
831+
MimeType::ApplicationJavascript,
832+
"success!",
833+
)]);
834+
835+
let shared_storage = Rc::new(in_memory_storage);
845836

846837
let mut engine1 =
847838
crate::Engine::from_rules(["example1.com##+js(test-scriptlet)"], Default::default());

0 commit comments

Comments
 (0)