diff options
author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-16 23:05:54 +0100 |
---|---|---|
committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-16 23:05:54 +0100 |
commit | bb9f382d1024e60f672b9c484031f40772a54a4b (patch) | |
tree | 32ca1fa8894b54aca1e0fbed596e4f7b1f0adaca /src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java | |
parent | 9da8be3cb31159c4d44d72f98de663c8350ff770 (diff) | |
download | maven-nar-plugin-bb9f382d1024e60f672b9c484031f40772a54a4b.tar.gz maven-nar-plugin-bb9f382d1024e60f672b9c484031f40772a54a4b.tar.bz2 maven-nar-plugin-bb9f382d1024e60f672b9c484031f40772a54a4b.tar.xz maven-nar-plugin-bb9f382d1024e60f672b9c484031f40772a54a4b.zip |
Reformat
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java')
-rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java index b81de03..d8b9858 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java @@ -97,7 +97,9 @@ public class NarIntegrationTestMojo { Library lib = (Library) i.next(); if ( lib.getType().equals( Library.JNI ) ) + { return true; + } } return false; } @@ -591,13 +593,19 @@ public class NarIntegrationTestMojo System.setProperties( originalSystemProperties ); } - if ( result == 0 ) return; + if ( result == 0 ) + { + return; + } String msg; if ( result == SurefireBooter.NO_TESTS_EXIT_CODE ) { - if ( ( failIfNoTests == null ) || !failIfNoTests.booleanValue() ) return; + if ( ( failIfNoTests == null ) || !failIfNoTests.booleanValue() ) + { + return; + } // TODO: i18n throw new MojoFailureException( "No tests were executed! (Set -DfailIfNoTests=false to ignore this error.)" ); } else { @@ -919,7 +927,9 @@ public class NarIntegrationTestMojo // DUNS if ( project.getPackaging().equals( "nar" ) || ( getNarManager().getNarDependencies( "test" ).size() > 0 ) ) + { forkMode = "pertest"; + } fork.setForkMode( forkMode ); @@ -966,7 +976,9 @@ public class NarIntegrationTestMojo // BEGINDUNS if ( argLine == null ) + { argLine = ""; + } StringBuffer javaLibraryPath = new StringBuffer(); if ( testJNIModule() ) @@ -977,7 +989,9 @@ public class NarIntegrationTestMojo { getLog().debug( "Adding library directory to java.library.path: " + jniLibraryPathEntry ); if ( javaLibraryPath.length() > 0 ) + { javaLibraryPath.append( File.pathSeparator ); + } javaLibraryPath.append( jniLibraryPathEntry ); } @@ -986,7 +1000,9 @@ public class NarIntegrationTestMojo { getLog().debug( "Adding library directory to java.library.path: " + sharedLibraryPathEntry ); if ( javaLibraryPath.length() > 0 ) + { javaLibraryPath.append( File.pathSeparator ); + } javaLibraryPath.append( sharedLibraryPathEntry ); } @@ -1019,7 +1035,9 @@ public class NarIntegrationTestMojo { getLog().debug( "Adding dependency directory to java.library.path: " + depLibPathEntry ); if ( javaLibraryPath.length() > 0 ) + { javaLibraryPath.append( File.pathSeparator ); + } javaLibraryPath.append( depLibPathEntry ); } } |