Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use TextDiffSubject to compare multi-line text #406

Merged
merged 1 commit into from Dec 10, 2019

Conversation

@weiminyu
Copy link
Collaborator

weiminyu commented Dec 10, 2019

It illustrates differences better. This affects GenerateSqlSchemaCommandTest.

Moved TextDiffSubject.java to the common project for sharing.


This change is Reviewable

It illustrates differences better.

Moved TextDiffSubject.java to the common project for sharing.
@weiminyu weiminyu requested a review from hstonec Dec 10, 2019
@googlebot googlebot added the cla: yes label Dec 10, 2019
Copy link
Collaborator

hstonec left a comment

Reviewed 23 of 23 files at r1.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @weiminyu)


common/src/test/resources/google/registry/testing/truth/text-sidebyside-diff.txt, line 5 at r1 (raw file):

|with ~three~ lines and terminates ~without~ a newline.|                                                     |

nit: possible to add a new line after this? I am thinking it may reduce the interference if there is a new line after the comparison.

Copy link
Collaborator Author

weiminyu left a comment

Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @hstonec)


common/src/test/resources/google/registry/testing/truth/text-sidebyside-diff.txt, line 5 at r1 (raw file):

Previously, hstonec (Shicong Huang) wrote…
|with ~three~ lines and terminates ~without~ a newline.|                                                     |

nit: possible to add a new line after this? I am thinking it may reduce the interference if there is a new line after the comparison.

This is the diff output as is. We'll have to manually insert a newline, which could create problems when the actual
text has empty lines at the end.

@weiminyu weiminyu merged commit 3aad8b6 into google:master Dec 10, 2019
7 checks passed
7 checks passed
LGTM analysis: JavaScript No code changes detected
Details
LGTM analysis: Python No code changes detected
Details
LGTM analysis: Java No new or fixed alerts
Details
cla/google All necessary CLAs are signed
code-review/reviewable 23 files reviewed
Details
kokoro-foss Kokoro build finished
Details
kokoro-internal Kokoro build finished
Details
@weiminyu weiminyu deleted the weiminyu:text-diff branch Dec 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.