-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This also fixes JXR-169
- Loading branch information
Showing
18 changed files
with
165 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,6 +25,7 @@ | |
import org.apache.maven.model.io.xpp3.MavenXpp3Reader; | ||
import org.apache.maven.plugin.testing.stubs.MavenProjectStub; | ||
|
||
import java.io.File; | ||
import java.io.FileReader; | ||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
@@ -33,7 +34,7 @@ | |
* @author <a href="mailto:[email protected]">Maria Odea Ching</a> | ||
*/ | ||
public class AggregateTestMavenProjectStub | ||
extends MavenProjectStub | ||
extends JxrProjectStub | ||
{ | ||
private List<ReportPlugin> reportPlugins = new ArrayList<>(); | ||
|
||
|
@@ -45,7 +46,7 @@ public AggregateTestMavenProjectStub() | |
try | ||
{ | ||
model = pomReader.read( new FileReader( | ||
getBasedir() + "/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml" ) ); | ||
getBasedir() + "/" + getPOM() ) ); | ||
setModel( model ); | ||
} | ||
catch ( Exception ignored ) | ||
|
@@ -61,7 +62,7 @@ public AggregateTestMavenProjectStub() | |
|
||
String basedir = getBasedir().getAbsolutePath(); | ||
List<String> compileSourceRoots = new ArrayList<>(); | ||
compileSourceRoots.add( basedir + "/src/test/resources/unit/aggregate-test/aggregate/test" ); | ||
compileSourceRoots.add( basedir + "/aggregate/test" ); | ||
setCompileSourceRoots( compileSourceRoots ); | ||
|
||
//set the report plugins | ||
|
@@ -78,4 +79,14 @@ public List<ReportPlugin> getReportPlugins() | |
{ | ||
return reportPlugins; | ||
} | ||
|
||
@Override | ||
public File getBasedir() { | ||
return new File( super.getBasedir() + "/aggregate-test" ); | ||
} | ||
|
||
@Override | ||
protected String getPOM() { | ||
return "aggregate-test-plugin-config.xml"; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,8 +23,8 @@ | |
import org.apache.maven.model.Model; | ||
import org.apache.maven.model.ReportPlugin; | ||
import org.apache.maven.model.io.xpp3.MavenXpp3Reader; | ||
import org.apache.maven.plugin.testing.stubs.MavenProjectStub; | ||
|
||
import java.io.File; | ||
import java.io.FileReader; | ||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
@@ -33,7 +33,7 @@ | |
* @author <a href="mailto:[email protected]">Maria Odea Ching</a> | ||
*/ | ||
public class DefaultConfigurationMavenProjectStub | ||
extends MavenProjectStub | ||
extends JxrProjectStub | ||
{ | ||
private List<ReportPlugin> reportPlugins = new ArrayList<>(); | ||
|
||
|
@@ -45,7 +45,7 @@ public DefaultConfigurationMavenProjectStub() | |
try | ||
{ | ||
model = pomReader.read( new FileReader( getBasedir() + | ||
"/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml" ) ); | ||
"/" + getPOM() ) ); | ||
setModel( model ); | ||
} | ||
catch ( Exception ignored ) | ||
|
@@ -61,7 +61,7 @@ public DefaultConfigurationMavenProjectStub() | |
|
||
String basedir = getBasedir().getAbsolutePath(); | ||
List<String> compileSourceRoots = new ArrayList<>(); | ||
compileSourceRoots.add( basedir + "/src/test/resources/unit/default-configuration/def/configuration" ); | ||
compileSourceRoots.add( basedir + "/def/configuration" ); | ||
setCompileSourceRoots( compileSourceRoots ); | ||
|
||
//set the report plugins | ||
|
@@ -79,4 +79,13 @@ public List<ReportPlugin> getReportPlugins() | |
return reportPlugins; | ||
} | ||
|
||
@Override | ||
public File getBasedir() { | ||
return new File( super.getBasedir() + "/default-configuration" ); | ||
} | ||
|
||
@Override | ||
protected String getPOM() { | ||
return "default-configuration-plugin-config.xml"; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.