Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ef78a89 authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

Fix test breakage due to naming collision in the linker. 

Test: hwui_unit_tests in question now run successfully.
Change-Id: If99865cd1cfa5c819338d062f5685700380a60a6
parent 050bb6a2

libs/hwui/tests/unit/CanvasContextTests.cpp

+5 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ RENDERTHREAD_TEST(CanvasContext, create) { 
    canvasContext->destroy(nullptr);

}



// This must be in an anonymous namespace as this class name is used in multiple

// cpp files for different purposes and without the namespace the linker can

// arbitrarily choose which class to link against.

namespace {

class TestFunctor : public Functor {

public:

    bool didProcess = false;
@@ -52,6 +56,7 @@ public: 
        return DrawGlInfo::kStatusDone;

    }

};

}; // end anonymous namespace



RENDERTHREAD_TEST(CanvasContext, invokeFunctor) {

    TestFunctor functor;

libs/hwui/tests/unit/SkiaDisplayListTests.cpp

+5 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ TEST(SkiaDisplayList, reuseDisplayList) { 
    ASSERT_EQ(availableList.get(), nullptr);

}



// This must be in an anonymous namespace as this class name is used in multiple

// cpp files for different purposes and without the namespace the linker can

// arbitrarily choose which class to link against.

namespace {

class TestFunctor : public Functor {

public:

    bool didSync = false;
@@ -100,6 +104,7 @@ public: 
        return DrawGlInfo::kStatusDone;

    }

};

}; // end anonymous namespace



TEST(SkiaDisplayList, syncContexts) {

    SkRect bounds = SkRect::MakeWH(200, 200);