Skip to content

Lookup correct "properties" key for Eclipse #12

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

Merged
merged 1 commit into from
Aug 29, 2015
Merged

Lookup correct "properties" key for Eclipse #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...piler-eclipse/src/main/java/org/codehaus/plexus/compiler/eclipse/EclipseJavaCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,10 @@ public CompilerResult performCompile( CompilerConfiguration config )

settings.putAll( extras );

if ( settings.containsKey( "-properties" ) )
if ( settings.containsKey( "properties" ) )
{
initializeWarnings( settings.get( "-properties" ), settings );
settings.remove( "-properties" );
initializeWarnings( settings.get( "properties" ), settings );
settings.remove( "properties" );
}

IProblemFactory problemFactory = new DefaultProblemFactory( Locale.getDefault() );
Expand Down
20 changes: 20 additions & 0 deletions ...piler-eclipse/src/test/java/org/codehaus/plexus/compiler/eclipse/EclipseCompilerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,26 @@ public void testCustomArgumentCleanup()

}

public void testInitializeWarningsForPropertiesArgument()
throws Exception
{
org.codehaus.plexus.compiler.Compiler compiler = (Compiler) lookup( Compiler.ROLE, getRoleHint() );

CompilerConfiguration compilerConfig = createMinimalCompilerConfig();

compilerConfig.addCompilerCustomArgument( "-properties", "file_does_not_exist" );

try
{
compiler.performCompile( compilerConfig );
fail( "looking up the properties file should have thrown an exception" );
}
catch ( IllegalArgumentException e )
{
assertEquals( "Properties file not exist", e.getMessage() );
}
}

private CompilerConfiguration createMinimalCompilerConfig()
{
CompilerConfiguration compilerConfig = new CompilerConfiguration();
Expand Down