OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2013 Google Inc. | 2 * Copyright 2013 Google Inc. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
6 */ | 6 */ |
7 #ifndef gm_expectations_DEFINED | 7 #ifndef gm_expectations_DEFINED |
8 #define gm_expectations_DEFINED | 8 #define gm_expectations_DEFINED |
9 | 9 |
10 #include "gm.h" | 10 #include "gm.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 /** | 44 /** |
45 * Assembles rootPath and relativePath into a single path, like this: | 45 * Assembles rootPath and relativePath into a single path, like this: |
46 * rootPath/relativePath | 46 * rootPath/relativePath |
47 * | 47 * |
48 * Uses SkPATH_SEPARATOR, to work on all platforms. | 48 * Uses SkPATH_SEPARATOR, to work on all platforms. |
49 * | 49 * |
50 * TODO(epoger): This should probably move into SkOSFile.h | 50 * TODO(epoger): This should probably move into SkOSFile.h |
51 */ | 51 */ |
52 SkString SkPathJoin(const char *rootPath, const char *relativePath); | 52 SkString SkPathJoin(const char *rootPath, const char *relativePath); |
53 | 53 |
54 SkString make_filename(const char path[], | |
55 const char renderModeDescriptor[], | |
56 const char *name, | |
57 const char suffix[]); | |
58 | |
59 Json::Value ActualResultAsJsonValue(const SkHashDigest& result); | 54 Json::Value ActualResultAsJsonValue(const SkHashDigest& result); |
60 | 55 |
61 Json::Value CreateJsonTree(Json::Value expectedResults, | 56 Json::Value CreateJsonTree(Json::Value expectedResults, |
62 Json::Value actualResultsFailed, | 57 Json::Value actualResultsFailed, |
63 Json::Value actualResultsFailureIgnored, | 58 Json::Value actualResultsFailureIgnored, |
64 Json::Value actualResultsNoComparison, | 59 Json::Value actualResultsNoComparison, |
65 Json::Value actualResultsSucceeded); | 60 Json::Value actualResultsSucceeded); |
66 | 61 |
67 /** | 62 /** |
68 * Test expectations (allowed image checksums, etc.) | 63 * Test expectations (allowed image checksums, etc.) |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 * Returns true if successful. | 216 * Returns true if successful. |
222 */ | 217 */ |
223 static bool Parse(const char *jsonPath, Json::Value *jsonRoot); | 218 static bool Parse(const char *jsonPath, Json::Value *jsonRoot); |
224 | 219 |
225 Json::Value fJsonRoot; | 220 Json::Value fJsonRoot; |
226 Json::Value fJsonExpectedResults; | 221 Json::Value fJsonExpectedResults; |
227 }; | 222 }; |
228 | 223 |
229 } | 224 } |
230 #endif | 225 #endif |
OLD | NEW |