Trim empty lines when comparing text results in DumpRenderTree2 (c0f90a8f) · Commits · e / os / android_frameworks_base

tests/DumpRenderTree2/src/com/android/dumprendertree2/TextResult.java

+20 −10

Original line number	Diff line number	Diff line
		@@ -87,20 +87,30 @@ public class TextResult extends AbstractResult {

		@Override
		public ResultCode getResultCode() {
		if (mResultCode != null) {
		return mResultCode;
		}

		if (mResultCode == null) {
		if (mExpectedResult == null) {
		mResultCode = AbstractResult.ResultCode.NO_EXPECTED_RESULT;
		} else if (!mExpectedResult.equals(mActualResult)) {
		mResultCode = AbstractResult.ResultCode.RESULTS_DIFFER;
		} else {
		mResultCode = AbstractResult.ResultCode.RESULTS_MATCH;
		mResultCode = resultsMatch() ? AbstractResult.ResultCode.RESULTS_MATCH
		: AbstractResult.ResultCode.RESULTS_DIFFER;
		}
		}
		return mResultCode;
		}

		private boolean resultsMatch() {
		assert mExpectedResult != null;
		assert mActualResult != null;
		// Trim leading and trailing empty lines, as other WebKit platforms do.
		String leadingEmptyLines = "^\\n+";
		String trailingEmptyLines = "\\n+$";
		String trimmedExpectedResult = mExpectedResult.replaceFirst(leadingEmptyLines, "")
		.replaceFirst(trailingEmptyLines, "");
		String trimmedActualResult = mActualResult.replaceFirst(leadingEmptyLines, "")
		.replaceFirst(trailingEmptyLines, "");
		return trimmedExpectedResult.equals(trimmedActualResult);
		}

		@Override
		public boolean didCrash() {
		return false;