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

When skipTests, do not check expected Galleon layers #33

Merged
merged 1 commit into from
Dec 4, 2023
Merged

When skipTests, do not check expected Galleon layers #33

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
91 changes: 48 additions & 43 deletions arquillian-plugin/src/main/java/org/wildfly/glow/plugin/arquillian/ScanMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,56 +306,61 @@ public void execute() throws MojoExecutionException, MojoFailureException {
setOutput(OutputFormat.PROVISIONING_XML).build();
ScanResults results = GlowSession.scan(artifactResolver,
arguments, writer);
if (expectedDiscovery != null) {
String compact = results.getCompactInformation();
if (!expectedDiscovery.equals(compact)) {
throw new MojoExecutionException("Error in glow discovery.\n"
+ "-Expected: " + expectedDiscovery + "\n"
+ "-Found : " + compact);
}
}
if (results.getErrorSession().hasErrors()) {
if (expectedErrors.isEmpty()) {
results.outputInformation(writer);
throw new MojoExecutionException("An error has been reported and expected-errors has not been set.");
}
List<IdentifiedError> errors = new ArrayList<>();
for (IdentifiedError err : results.getErrorSession().getErrors()) {
if(!err.isFixed()) {
errors.add(err);
boolean skipTests = Boolean.getBoolean("maven.test.skip") || Boolean.getBoolean("skipTests");
if (skipTests) {
getLog().warn("Tests are disabled, not checking for expected discovered layers.");
} else {
if (expectedDiscovery != null) {
String compact = results.getCompactInformation();
if (!expectedDiscovery.equals(compact)) {
throw new MojoExecutionException("Error in glow discovery.\n"
+ "-Expected: " + expectedDiscovery + "\n"
+ "-Found : " + compact);
}
}
if (expectedErrors.size() != errors.size()) {
List<String> descriptions = new ArrayList<>();
for(IdentifiedError err : errors) {
descriptions.add(err.getDescription());
if (results.getErrorSession().hasErrors()) {
if (expectedErrors.isEmpty()) {
results.outputInformation(writer);
throw new MojoExecutionException("An error has been reported and expected-errors has not been set.");
}
throw new MojoExecutionException("Number of expected errors mismatch. Expected "
+ expectedErrors.size() + " reported " + errors.size() + ".\n" +
"Reported Errors " + descriptions + "\n" +
"Expected Errors " + expectedErrors);
}
Iterator<IdentifiedError> it = errors.iterator();
while (it.hasNext()) {
IdentifiedError err = it.next();
if (expectedErrors.contains(err.getDescription())) {
it.remove();
List<IdentifiedError> errors = new ArrayList<>();
for (IdentifiedError err : results.getErrorSession().getErrors()) {
if (!err.isFixed()) {
errors.add(err);
}
}
}
it = errors.iterator();
if (it.hasNext()) {
StringBuilder builder = new StringBuilder();
if (expectedErrors.size() != errors.size()) {
List<String> descriptions = new ArrayList<>();
for (IdentifiedError err : errors) {
descriptions.add(err.getDescription());
}
throw new MojoExecutionException("Number of expected errors mismatch. Expected "
+ expectedErrors.size() + " reported " + errors.size() + ".\n"
+ "Reported Errors " + descriptions + "\n"
+ "Expected Errors " + expectedErrors);
}
Iterator<IdentifiedError> it = errors.iterator();
while (it.hasNext()) {
IdentifiedError err = it.next();
builder.append(err.getDescription()).append("\n");
if (expectedErrors.contains(err.getDescription())) {
it.remove();
}
}
it = errors.iterator();
if (it.hasNext()) {
StringBuilder builder = new StringBuilder();
while (it.hasNext()) {
IdentifiedError err = it.next();
builder.append(err.getDescription()).append("\n");
}
throw new MojoExecutionException("The following errors are unexpected:\n" + builder.toString());
}
getLog().info("Expected errors found in glow scanning results. "
+ " The test execution should fix them (eg: add missing datasources)");
} else {
if (!expectedErrors.isEmpty()) {
throw new MojoExecutionException("expected-errors contains errors but no error reported.");
}
throw new MojoExecutionException("The following errors are unexpected:\n" + builder.toString());
}
getLog().info("Expected errors found in glow scanning results. "
+ " The test execution should fix them (eg: add missing datasources)");
} else {
if (!expectedErrors.isEmpty()) {
throw new MojoExecutionException("expected-errors contains errors but no error reported.");
}
}
if (enableVerboseOutput || getLog().isDebugEnabled()) {
Expand Down
Loading