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

Commit ec99ff6c authored by Doris Liu's avatar Doris Liu Committed by Android (Google) Code Review
Browse files

Merge "Use array instead of vector for test data set"

parents ae2e9831 b89610c0

libs/hwui/unit_tests/PathParserTests.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ struct TestData { 
    const std::function<void(SkPath*)> skPathLamda;

    const std::function<void(SkPath*)> skPathLamda;

};

};





const static std::vector<TestData> testDataSet = {

const static TestData sTestDataSet[] = {

    // TestData with scientific notation -2e3 etc.

    // TestData with scientific notation -2e3 etc.

    {

    {

        // Path

        // Path
@@ -165,7 +165,7 @@ const static std::vector<TestData> testDataSet = { 
};

};





TEST(PathParser, parseStringForData) {

TEST(PathParser, parseStringForData) {

    for (TestData testData: testDataSet) {

    for (TestData testData: sTestDataSet) {

        // Test generated path data against the given data.

        // Test generated path data against the given data.

        PathData pathData;

        PathData pathData;

        size_t length = strlen(testData.pathString);

        size_t length = strlen(testData.pathString);
@@ -177,7 +177,7 @@ TEST(PathParser, parseStringForData) { 
}

}





TEST(PathParser, createSkPathFromPathData) {

TEST(PathParser, createSkPathFromPathData) {

    for (TestData testData: testDataSet) {

    for (TestData testData: sTestDataSet) {

        SkPath expectedPath;

        SkPath expectedPath;

        testData.skPathLamda(&expectedPath);

        testData.skPathLamda(&expectedPath);

        SkPath actualPath;

        SkPath actualPath;
@@ -187,7 +187,7 @@ TEST(PathParser, createSkPathFromPathData) { 
}

}





TEST(PathParser, parseStringForSkPath) {

TEST(PathParser, parseStringForSkPath) {

    for (TestData testData: testDataSet) {

    for (TestData testData: sTestDataSet) {

        size_t length = strlen(testData.pathString);

        size_t length = strlen(testData.pathString);

        // Check the return value as well as the SkPath generated.

        // Check the return value as well as the SkPath generated.

        SkPath actualPath;

        SkPath actualPath;