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

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

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d028af
Better indentation when adding GCP libraries to pom.xml #3381
lak-proddev Jun 27, 2019
5f56823
#3381 - test case added
lak-proddev Jul 6, 2019
8194366
#3381 - test case updated
lak-proddev Jul 6, 2019
45c771d
#3381 - test case updated
lak-proddev Jul 6, 2019
38d59ea
#3381 - test case updated
lak-proddev Jul 7, 2019
741ded9
Typo
lak-proddev Jul 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 14 additions & 36 deletions ...se/appengine/libraries/POMFormatTest.java → ...se/appengine/libraries/PomFormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@

package com.google.cloud.tools.eclipse.appengine.libraries;

import static org.junit.Assert.fail;
import static org.junit.Assert.assertArrayEquals;

import com.google.cloud.tools.eclipse.appengine.libraries.model.Library;
import com.google.cloud.tools.eclipse.appengine.libraries.model.LibraryFile;
import com.google.cloud.tools.eclipse.test.util.project.TestProjectCreator;
import com.google.cloud.tools.eclipse.util.ArtifactRetriever;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
Expand All @@ -39,13 +37,14 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.xml.sax.SAXException;

public class POMFormatTest {
public class PomFormatTest {

@Rule
public final TestProjectCreator projectCreator = new TestProjectCreator();
Expand All @@ -66,6 +65,11 @@ public void setUp() throws SAXException, IOException, CoreException {
logger.setLevel(Level.OFF);
}

@After
public void tearDown() {
Logger logger = Logger.getLogger(ArtifactRetriever.class.getName());
logger.setLevel(null);
}

@Test
public void testAddDependencies() throws Exception {
Expand All @@ -81,8 +85,8 @@ public void testAddDependencies() throws Exception {
pom.addDependencies(libraries);

Bundle bundle = Platform.getBundle("com.google.cloud.tools.eclipse.appengine.libraries.test");
URL fileURL = bundle.getEntry("/testdata/formatAdd.xml");
File expected = new File(FileLocator.resolve(fileURL).toURI());
URL fileUrl = bundle.getEntry("/testdata/formatAdd.xml");
File expected = new File(FileLocator.resolve(fileUrl).toURI());
assertFileContentsEqual(pomFile.getLocation().toFile(), expected);

}
Expand All @@ -97,38 +101,12 @@ public void testRemoveUnusedDependencies() throws Exception {
pom.addDependencies(Arrays.asList(library1, library2));

Bundle bundle = Platform.getBundle("com.google.cloud.tools.eclipse.appengine.libraries.test");
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

}

public static void assertFileContentsEqual(File actual, File expected) throws IOException {
boolean areEqual = true;
try (BufferedReader reader1 = new BufferedReader(new FileReader(actual));
BufferedReader reader2 = new BufferedReader(new FileReader(expected));) {
String line1 = reader1.readLine();
String line2 = reader2.readLine();

int lineNum = 1;

while (line1 != null || line2 != null) {
if (line1 == null || line2 == null) {
areEqual = false;
break;
} else if (!line1.equalsIgnoreCase(line2)) {
areEqual = false;
break;
}
line1 = reader1.readLine();
line2 = reader2.readLine();
lineNum++;
}
if (!areEqual) {
String message = "Two files have different content. They differ at line " + lineNum + " \""
+ actual.getName() + "\" has " + line1 + " and \"" + expected.getName() + "\" has "
+ line2 + " at line " + lineNum + "\n";
fail(message);
}
}
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

}
}