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

review chore: Upgrade JDT version #2052

Merged
merged 8 commits into from
Jun 13, 2018
Merged

review chore: Upgrade JDT version #2052

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d8b51c
Upgrade JDT library version
surli Jan 3, 2018
eba7039
Update pom.xml
surli Jun 6, 2018
45858c7
Fix MavenLauncherTest
surli Jun 11, 2018
c610586
Fix another assertion
surli Jun 11, 2018
7d46ca1
Fix assertions
surli Jun 12, 2018
d7a3006
Fix flaky test
surli Jun 12, 2018
9f01f88
Merge remote-tracking branch 'inria/master' into upgrade-jdt-version
surli Jun 12, 2018
0c1e27f
Push back the old assert
surli Jun 12, 2018
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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,9 @@

<dependencies>
<dependency>
<groupId>org.eclipse.tycho</groupId>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.13.50.v20171007-0855</version>
<version>3.13.102</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
13 changes: 11 additions & 2 deletions src/test/java/spoon/MavenLauncherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,22 @@ public void spoonMavenLauncherTest() {
// without the tests
MavenLauncher launcher = new MavenLauncher("./", MavenLauncher.SOURCE_TYPE.APP_SOURCE);

assertEquals(10, launcher.getEnvironment().getSourceClasspath().length);
// The sourceClasspath seems to change depending on the machine:
// I suspect that the config bring in .m2/settings.xml play a role
// on my machine (Simon U.) and on spoon3r CI machine we got 2 libraries less
Copy link
Collaborator

Choose a reason for hiding this comment

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

#2057 should fix it


//assertEquals(15, launcher.getEnvironment().getSourceClasspath().length);
assertTrue(launcher.getEnvironment().getSourceClasspath().length > 10);

// 56 because of the sub folders of src/main/java
assertEquals(58, launcher.getModelBuilder().getInputSources().size());

// with the tests
launcher = new MavenLauncher("./", MavenLauncher.SOURCE_TYPE.ALL_SOURCE);
assertEquals(17, launcher.getEnvironment().getSourceClasspath().length);

//assertEquals(22, launcher.getEnvironment().getSourceClasspath().length);
assertTrue(launcher.getEnvironment().getSourceClasspath().length >= 20);

// 236 because of the sub folders of src/main/java and src/test/java
assertTrue("size: "+launcher.getModelBuilder().getInputSources().size(), launcher.getModelBuilder().getInputSources().size() >= 220);

Expand Down