diff options
author | Mike Reed <reed@google.com> | 2017-12-08 21:09:12 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-08 21:09:19 +0000 |
commit | cca230055921d2df8708ed6f9abcc2d43468dc7f (patch) | |
tree | de54889d81021104dc9394680903db87994ebfe5 /tests | |
parent | 27372888a5c7698f51069bd5b5beea3e85b66668 (diff) |
Revert "resources: remove most uses of GetResourcePath()"
This reverts commit 5093a539def3ae09df324018f2343827009b2e05.
Reason for revert: google3 seems broken
Original change's description:
> resources: remove most uses of GetResourcePath()
>
> Going forward, we will standardize on GetResourceAsData(), which will
> make it easier to run tests in environments without access to the
> filesystem.
>
> Also: GetResourceAsData() complains when a resource is missing.
> This is usually an error.
>
> Change-Id: Iaf70b71b0ca5ed8cd1a5538a60ef185ae8736188
> Reviewed-on: https://skia-review.googlesource.com/82642
> Reviewed-by: Hal Canary <halcanary@google.com>
> Commit-Queue: Hal Canary <halcanary@google.com>
TBR=halcanary@google.com,scroggo@google.com
Change-Id: Ic5a7c0167c995a672e6b06dc92abe00564432214
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/83001
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/CodecTest.cpp | 21 | ||||
-rw-r--r-- | tests/ColorSpaceTest.cpp | 18 | ||||
-rw-r--r-- | tests/GifTest.cpp | 8 | ||||
-rw-r--r-- | tests/ICCTest.cpp | 18 | ||||
-rw-r--r-- | tests/ImageIsOpaqueTest.cpp | 9 | ||||
-rw-r--r-- | tests/PDFJpegEmbedTest.cpp | 3 | ||||
-rw-r--r-- | tests/SerializationTest.cpp | 6 |
7 files changed, 45 insertions, 38 deletions
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index 787e8549fc..ab21e4a2c1 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -846,8 +846,9 @@ private: // Test that the RawCodec works also for not asset stream. This will test the code path using // SkRawBufferedStream instead of SkRawAssetStream. DEF_TEST(Codec_raw_notseekable, r) { - constexpr char path[] = "images/dng_with_preview.dng"; - sk_sp<SkData> data(GetResourceAsData(path)); + const char* path = "images/dng_with_preview.dng"; + SkString fullPath(GetResourcePath(path)); + sk_sp<SkData> data(SkData::MakeFromFileName(fullPath.c_str())); if (!data) { SkDebugf("Missing resource '%s'\n", path); return; @@ -864,8 +865,9 @@ DEF_TEST(Codec_raw_notseekable, r) { // Test that even if webp_parse_header fails to peek enough, it will fall back to read() // + rewind() and succeed. DEF_TEST(Codec_webp_peek, r) { - constexpr char path[] = "images/baby_tux.webp"; - auto data = GetResourceAsData(path); + const char* path = "images/baby_tux.webp"; + SkString fullPath(GetResourcePath(path)); + auto data = SkData::MakeFromFileName(fullPath.c_str()); if (!data) { SkDebugf("Missing resource '%s'\n", path); return; @@ -1001,7 +1003,8 @@ static void check_color_xform(skiatest::Reporter* r, const char* path) { const int dstWidth = subsetWidth / opts.fSampleSize; const int dstHeight = subsetHeight / opts.fSampleSize; - sk_sp<SkData> data = GetResourceAsData("icc_profiles/HP_ZR30w.icc"); + sk_sp<SkData> data = SkData::MakeFromFileName( + GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); sk_sp<SkColorSpace> colorSpace = SkColorSpace::MakeICC(data->data(), data->size()); SkImageInfo dstInfo = codec->getInfo().makeWH(dstWidth, dstHeight) .makeColorType(kN32_SkColorType) @@ -1383,14 +1386,12 @@ DEF_TEST(Codec_InvalidImages, r) { } static void test_invalid_header(skiatest::Reporter* r, const char* path) { - auto data = GetResourceAsData(path); - if (!data) { - return; - } - std::unique_ptr<SkStreamAsset> stream(new SkMemoryStream(std::move(data))); + SkString resourcePath = GetResourcePath(path); + auto stream = SkFILEStream::Make(resourcePath.c_str()); if (!stream) { return; } + std::unique_ptr<SkCodec> codec(SkCodec::MakeFromStream(std::move(stream))); REPORTER_ASSERT(r, !codec); } diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp index d180cda425..19e1044162 100644 --- a/tests/ColorSpaceTest.cpp +++ b/tests/ColorSpaceTest.cpp @@ -245,13 +245,14 @@ DEF_TEST(ColorSpace_Serialize, r) { test_serialize(r, SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named).get(), true); test_serialize(r, SkColorSpace::MakeSRGBLinear().get(), true); - sk_sp<SkData> monitorData = GetResourceAsData("icc_profiles/HP_ZR30w.icc"); + sk_sp<SkData> monitorData = SkData::MakeFromFileName( + GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); test_serialize(r, SkColorSpace::MakeICC(monitorData->data(), monitorData->size()).get(), false); - monitorData = GetResourceAsData("icc_profiles/HP_Z32x.icc"); + monitorData = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str()); test_serialize(r, SkColorSpace::MakeICC(monitorData->data(), monitorData->size()).get(), false); - monitorData = GetResourceAsData("icc_profiles/upperLeft.icc"); + monitorData = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str()); test_serialize(r, SkColorSpace::MakeICC(monitorData->data(), monitorData->size()).get(), false); - monitorData = GetResourceAsData("icc_profiles/upperRight.icc"); + monitorData = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str()); test_serialize(r, SkColorSpace::MakeICC(monitorData->data(), monitorData->size()).get(), false); SkColorSpaceTransferFn fn; @@ -269,13 +270,14 @@ DEF_TEST(ColorSpace_Serialize, r) { DEF_TEST(ColorSpace_Equals, r) { sk_sp<SkColorSpace> srgb = SkColorSpace::MakeSRGB(); sk_sp<SkColorSpace> adobe = SkColorSpace_Base::MakeNamed(SkColorSpace_Base::kAdobeRGB_Named); - sk_sp<SkData> data = GetResourceAsData("icc_profiles/HP_ZR30w.icc"); + sk_sp<SkData> data = SkData::MakeFromFileName( + GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); sk_sp<SkColorSpace> z30 = SkColorSpace::MakeICC(data->data(), data->size()); - data = GetResourceAsData("icc_profiles/HP_Z32x.icc"); + data = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str()); sk_sp<SkColorSpace> z32 = SkColorSpace::MakeICC(data->data(), data->size()); - data = GetResourceAsData("icc_profiles/upperLeft.icc"); + data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str()); sk_sp<SkColorSpace> upperLeft = SkColorSpace::MakeICC(data->data(), data->size()); - data = GetResourceAsData("icc_profiles/upperRight.icc"); + data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str()); sk_sp<SkColorSpace> upperRight = SkColorSpace::MakeICC(data->data(), data->size()); SkColorSpaceTransferFn fn; diff --git a/tests/GifTest.cpp b/tests/GifTest.cpp index 0de5fc586d..5219825f1b 100644 --- a/tests/GifTest.cpp +++ b/tests/GifTest.cpp @@ -225,12 +225,12 @@ DEF_TEST(Gif, reporter) { // Regression test for decoding a gif image with sampleSize of 4, which was // previously crashing. DEF_TEST(Gif_Sampled, r) { - auto data = GetResourceAsData("images/test640x479.gif"); - REPORTER_ASSERT(r, data); - if (!data) { + auto stream = SkFILEStream::Make(GetResourcePath("images/test640x479.gif").c_str()); + REPORTER_ASSERT(r, stream); + if (!stream) { return; } - std::unique_ptr<SkStreamAsset> stream(new SkMemoryStream(std::move(data))); + std::unique_ptr<SkAndroidCodec> codec(SkAndroidCodec::MakeFromStream(std::move(stream))); REPORTER_ASSERT(r, codec); if (!codec) { diff --git a/tests/ICCTest.cpp b/tests/ICCTest.cpp index 4933155148..4bff6546ef 100644 --- a/tests/ICCTest.cpp +++ b/tests/ICCTest.cpp @@ -39,7 +39,8 @@ DEF_TEST(ICC_ToXYZD50, r) { 0.74519f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, }; - sk_sp<SkData> data = GetResourceAsData("icc_profiles/HP_ZR30w.icc"); + sk_sp<SkData> data = SkData::MakeFromFileName( + GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); sk_sp<SkICC> z30 = SkICC::Make(data->data(), data->size()); test_to_xyz_d50(r, z30.get(), true, z30Reference); @@ -48,15 +49,15 @@ DEF_TEST(ICC_ToXYZD50, r) { 0.75368f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, }; - data = GetResourceAsData("icc_profiles/HP_Z32x.icc"); + data = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str()); sk_sp<SkICC> z32 = SkICC::Make(data->data(), data->size()); test_to_xyz_d50(r, z32.get(), true, z32Reference); - data = GetResourceAsData("icc_profiles/upperLeft.icc"); + data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str()); sk_sp<SkICC> upperLeft = SkICC::Make(data->data(), data->size()); test_to_xyz_d50(r, upperLeft.get(), false, z32Reference); - data = GetResourceAsData("icc_profiles/upperRight.icc"); + data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str()); sk_sp<SkICC> upperRight = SkICC::Make(data->data(), data->size()); test_to_xyz_d50(r, upperRight.get(), false, z32Reference); } @@ -81,19 +82,20 @@ DEF_TEST(ICC_IsNumericalTransferFn, r) { referenceFn.fF = 0.0f; referenceFn.fG = 2.2f; - sk_sp<SkData> data = GetResourceAsData("icc_profiles/HP_ZR30w.icc"); + sk_sp<SkData> data = SkData::MakeFromFileName( + GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); sk_sp<SkICC> z30 = SkICC::Make(data->data(), data->size()); test_is_numerical_transfer_fn(r, z30.get(), true, referenceFn); - data = GetResourceAsData("icc_profiles/HP_Z32x.icc"); + data = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str()); sk_sp<SkICC> z32 = SkICC::Make(data->data(), data->size()); test_is_numerical_transfer_fn(r, z32.get(), true, referenceFn); - data = GetResourceAsData("icc_profiles/upperLeft.icc"); + data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str()); sk_sp<SkICC> upperLeft = SkICC::Make(data->data(), data->size()); test_is_numerical_transfer_fn(r, upperLeft.get(), false, referenceFn); - data = GetResourceAsData("icc_profiles/upperRight.icc"); + data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str()); sk_sp<SkICC> upperRight = SkICC::Make(data->data(), data->size()); test_is_numerical_transfer_fn(r, upperRight.get(), false, referenceFn); } diff --git a/tests/ImageIsOpaqueTest.cpp b/tests/ImageIsOpaqueTest.cpp index 38f9b6ae90..9b4837a76f 100644 --- a/tests/ImageIsOpaqueTest.cpp +++ b/tests/ImageIsOpaqueTest.cpp @@ -40,13 +40,14 @@ static void test_flatten(skiatest::Reporter* reporter, const SkImageInfo& info) } DEF_TEST(ImageInfo_flattening, reporter) { - sk_sp<SkData> data = GetResourceAsData("icc_profiles/HP_ZR30w.icc"); + sk_sp<SkData> data = + SkData::MakeFromFileName(GetResourcePath("icc_profiles/HP_ZR30w.icc").c_str()); sk_sp<SkColorSpace> space0 = SkColorSpace::MakeICC(data->data(), data->size()); - data = GetResourceAsData("icc_profiles/HP_Z32x.icc"); + data = SkData::MakeFromFileName( GetResourcePath("icc_profiles/HP_Z32x.icc").c_str()); sk_sp<SkColorSpace> space1 = SkColorSpace::MakeICC(data->data(), data->size()); - data = GetResourceAsData("icc_profiles/upperLeft.icc"); + data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperLeft.icc").c_str()); sk_sp<SkColorSpace> space2 = SkColorSpace::MakeICC(data->data(), data->size()); - data = GetResourceAsData("icc_profiles/upperRight.icc"); + data = SkData::MakeFromFileName(GetResourcePath("icc_profiles/upperRight.icc").c_str()); sk_sp<SkColorSpace> space3 = SkColorSpace::MakeICC(data->data(), data->size()); sk_sp<SkColorSpace> spaces[] = { diff --git a/tests/PDFJpegEmbedTest.cpp b/tests/PDFJpegEmbedTest.cpp index aaac2b9f18..b62b166fc1 100644 --- a/tests/PDFJpegEmbedTest.cpp +++ b/tests/PDFJpegEmbedTest.cpp @@ -32,7 +32,8 @@ static bool is_subset_of(SkData* smaller, SkData* larger) { static sk_sp<SkData> load_resource( skiatest::Reporter* r, const char* test, const char* filename) { - sk_sp<SkData> data = GetResourceAsData(filename); + SkString path(GetResourcePath(filename)); + sk_sp<SkData> data(SkData::MakeFromFileName(path.c_str())); if (!data) { INFOF(r, "\n%s: Resource '%s' can not be found.\n", test, filename); diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp index 2543870667..4cf605a2fc 100644 --- a/tests/SerializationTest.cpp +++ b/tests/SerializationTest.cpp @@ -358,8 +358,8 @@ static void serialize_and_compare_typeface(sk_sp<SkTypeface> typeface, const cha static void TestPictureTypefaceSerialization(skiatest::Reporter* reporter) { { // Load typeface from file to test CreateFromFile with index. - auto data = GetResourceAsData("fonts/test.ttc"); - auto typeface = SkTypeface::MakeFromStream(new SkMemoryStream(std::move(data)), 1); + SkString filename = GetResourcePath("/fonts/test.ttc"); + sk_sp<SkTypeface> typeface(SkTypeface::MakeFromFile(filename.c_str(), 1)); if (!typeface) { INFOF(reporter, "Could not run fontstream test because test.ttc not found."); } else { @@ -369,7 +369,7 @@ static void TestPictureTypefaceSerialization(skiatest::Reporter* reporter) { { // Load typeface as stream to create with axis settings. - std::unique_ptr<SkStreamAsset> distortable(GetResourceAsStream("fonts/Distortable.ttf")); + std::unique_ptr<SkStreamAsset> distortable(GetResourceAsStream("/fonts/Distortable.ttf")); if (!distortable) { INFOF(reporter, "Could not run fontstream test because Distortable.ttf not found."); } else { |