-
-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #277 from CycloneDX/simplify-its
simplify ITs code
- Loading branch information
Showing
11 changed files
with
133 additions
and
196 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
package org.cyclonedx.maven; | ||
|
||
import io.takari.maven.testing.TestResources; | ||
import io.takari.maven.testing.executor.MavenRuntime; | ||
import io.takari.maven.testing.executor.MavenRuntime.MavenRuntimeBuilder; | ||
|
||
import java.io.BufferedReader; | ||
import java.io.File; | ||
import java.io.FileInputStream; | ||
import java.io.IOException; | ||
import java.io.InputStreamReader; | ||
import java.util.Properties; | ||
import org.junit.Rule; | ||
|
||
public class BaseMavenVerifier { | ||
|
||
@Rule | ||
public final TestResources resources = new TestResources("target/test-classes", "target/test-classes/transformed-projects"); | ||
|
||
public final MavenRuntime verifier; | ||
|
||
public BaseMavenVerifier(MavenRuntimeBuilder runtimeBuilder) throws Exception { | ||
this.verifier = runtimeBuilder/*.withCliOptions(opts)*/.build(); | ||
} | ||
|
||
public String getCurrentVersion() throws IOException { | ||
// extract current cyclonedx-maven-plugin version from test.properties https://github.com/takari/takari-plugin-testing-project/blob/master/testproperties.md | ||
Properties props = new Properties(); | ||
props.load(this.getClass().getClassLoader().getResourceAsStream("test.properties")); | ||
return (String) props.get("project.version"); | ||
} | ||
|
||
// source: https://github.com/takari/takari-plugin-testing-project/blob/master/takari-plugin-testing/src/main/java/io/takari/maven/testing/AbstractTestResources.java#L103 | ||
protected static String fileRead(File file, boolean normalizeEOL) throws IOException { | ||
StringBuilder sb = new StringBuilder(); | ||
try (BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(file)))) { | ||
if (normalizeEOL) { | ||
String str; | ||
while ((str = r.readLine()) != null) { | ||
sb.append(str).append('\n'); | ||
} | ||
} else { | ||
int ch; | ||
while ((ch = r.read()) != -1) { | ||
sb.append((char) ch); | ||
} | ||
} | ||
} | ||
return sb.toString(); | ||
} | ||
} |
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
Oops, something went wrong.