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.

Sign up for GitHub

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

Jump to bottom

Better indentation when adding GCP libraries to pom.xml #3511

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Better indentation when adding GCP libraries to pom.xml #3511

wants to merge 6 commits into from

Conversation

lak-proddev
Copy link
Contributor

@lak-proddev lak-proddev commented Jun 27, 2019 •
edited by elharo

Change-Id: I5d4a22b089f1516845e8597cf11c5198772dc4dd

fixes #3381

elharo
elharo reviewed Jun 27, 2019
View reviewed changes
Copy link
Contributor

@elharo elharo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not yet sure if this is the right approach but if it is, it needs a test.

@codecov
Copy link

codecov bot commented Jul 6, 2019 •
edited

Codecov Report

❗ No coverage uploaded for pull request base (master@f8c6895). Click here to learn what that means.
The diff coverage is 94.44%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #3511   +/-   ##
=========================================
  Coverage          ?   70.10%           
  Complexity        ?     2990           
=========================================
  Files             ?      376           
  Lines             ?    13632           
  Branches          ?     1605           
=========================================
  Hits              ?     9557           
  Misses            ?     3432           
  Partials          ?      643
Impacted Files Coverage Δ Complexity Δ
...e/cloud/tools/eclipse/appengine/libraries/Pom.java 86.90% <94.44%> (ø) 60.00 <5.00> (?)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f8c6895...741ded9. Read the comment docs.

elharo
elharo reviewed Jul 6, 2019
View reviewed changes
...ine.libraries.test/src/com/google/cloud/tools/eclipse/appengine/libraries/PomFormatTest.java Outdated
}
}
private static void assertFileContentsEqual(File actual, File expected) throws IOException {
assertArrayEquals(Files.readAllBytes(actual.toPath()), Files.readAllBytes(expected.toPath()));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

swap arguments since expected customarily comes before actual

...ine.libraries.test/src/com/google/cloud/tools/eclipse/appengine/libraries/PomFormatTest.java Outdated
URL fileURL = bundle.getEntry("/testdata/formatRemove.xml");
File expected = new File(FileLocator.resolve(fileURL).toURI());
URL fileUrl = bundle.getEntry("/testdata/formatRemove.xml");
File expected = new File(FileLocator.resolve(fileUrl).toURI());
assertFileContentsEqual(pomFile.getLocation().toFile(), expected);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

swap arguments since expected customarily comes before actual

elharo
elharo reviewed Jul 6, 2019
View reviewed changes
Copy link
Contributor

@elharo elharo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests are failing:

Tests run: 2, Failures: 2, Errors: 0, Skipped: 0, Time elapsed: 0.634 s <<< FAILURE! - in com.google.cloud.tools.eclipse.appengine.libraries.PomFormatTest
testAddDependencies(com.google.cloud.tools.eclipse.appengine.libraries.PomFormatTest) Time elapsed: 0.36 s <<< FAILURE!
java.lang.AssertionError: array lengths differed, expected.length=1168 actual.length=1135
at org.junit.Assert.fail(Assert.java:88)
at org.junit.internal.ComparisonCriteria.assertArraysAreSameLength(ComparisonCriteria.java:76)
at org.junit.internal.ComparisonCriteria.arrayEquals(ComparisonCriteria.java:37)
at org.junit.Assert.internalArrayEquals(Assert.java:532)

lak-proddev
lak-proddev commented Jul 7, 2019
View reviewed changes
Copy link
Contributor Author

@lak-proddev lak-proddev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests are failing:

Tests run: 2, Failures: 2, Errors: 0, Skipped: 0, Time elapsed: 0.634 s <<< FAILURE! - in com.google.cloud.tools.eclipse.appengine.libraries.PomFormatTest
testAddDependencies(com.google.cloud.tools.eclipse.appengine.libraries.PomFormatTest) Time elapsed: 0.36 s <<< FAILURE!
java.lang.AssertionError: array lengths differed, expected.length=1168 actual.length=1135

Not failing locally. will check

....eclipse.appengine.libraries/src/com/google/cloud/tools/eclipse/appengine/libraries/Pom.java
@@ -482,10 +482,29 @@ private static String getValue(Element dependency, String childName) {
private void writeDocument() throws CoreException, TransformerException {
Transformer transformer = transformerFactory.newTransformer();
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount","2"); //$NON-NLS-1$ //$NON-NLS-2$
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the core fix. Other changes are for removing extra spaces and blank line when add or removing libaries.

elharo
elharo reviewed Aug 20, 2019
View reviewed changes
Copy link
Contributor

@elharo elharo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry. Just noticed this was still out for review.

...ine.libraries.test/src/com/google/cloud/tools/eclipse/appengine/libraries/PomFormatTest.java
return;
}

final List<String> diff = new ArrayList<>();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Google style avoids final on local variables where not required.

....eclipse.appengine.libraries/src/com/google/cloud/tools/eclipse/appengine/libraries/Pom.java

private void addChild(Node parent, Node newChild) {
parent.appendChild(newChild);
removeWhiteSpaceBefore(newChild);// for child indentation
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: space before //

....eclipse.appengine.libraries/src/com/google/cloud/tools/eclipse/appengine/libraries/Pom.java
}

private static void removeWhiteSpaceBefore(Node node) {
Node prevElement = node.getPreviousSibling();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

previousElement

@elharo elharo changed the title Better indentation when adding GCP libraries to pom.xml #3381 Better indentation when adding GCP libraries to pom.xml Jun 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@elharo elharo elharo left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
cla: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Better indentation when adding GCP libraries to pom.xml
5 participants
@lak-proddev @elharo @googlebot @chanseokoh @kokoro-team