| 1 |
commit: 1a3f3a54a35473811acf16057529703199a3df76 |
| 2 |
Author: zongyu <zzy2529420793 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Aug 5 04:20:07 2020 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 5 07:49:29 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=1a3f3a54 |
| 7 |
|
| 8 |
make java-ebuilder able to recogize junit-5 and cucumber testing frameworks |
| 9 |
|
| 10 |
Signed-off-by: zongyu <zzy2529420793 <AT> gmail.com> |
| 11 |
|
| 12 |
.../org/gentoo/java/ebuilder/maven/MavenEbuilder.java | 18 ++++++++++++------ |
| 13 |
.../org/gentoo/java/ebuilder/maven/MavenProject.java | 2 +- |
| 14 |
2 files changed, 13 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java |
| 17 |
index b9778ef..e73a1fd 100644 |
| 18 |
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java |
| 19 |
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java |
| 20 |
@@ -211,11 +211,9 @@ public class MavenEbuilder { |
| 21 |
*/ |
| 22 |
private String determineTestingFrameworkByDependency( |
| 23 |
final MavenDependency dependency) { |
| 24 |
- /** TODO: missing support for |
| 25 |
- * "org.junit.vintage:junit-vintage-engine" tests |
| 26 |
+ /** TODO: missing determination for |
| 27 |
* "POJO" tests |
| 28 |
* "spock" tests |
| 29 |
- * "cucumber" tests |
| 30 |
*/ |
| 31 |
if ("junit".equals(dependency.getGroupId()) |
| 32 |
&& "junit".equals(dependency.getArtifactId())) { |
| 33 |
@@ -224,9 +222,17 @@ public class MavenEbuilder { |
| 34 |
&& "testng".equals(dependency.getArtifactId())) { |
| 35 |
return "testng"; |
| 36 |
} else if ("org.junit.jupiter".equals(dependency.getGroupId()) |
| 37 |
- && "junit-jupiter-engine". |
| 38 |
- equals(dependency.getArtifactId())) { |
| 39 |
- return "junit-5"; |
| 40 |
+ && "junit-jupiter-engine".equals(dependency.getArtifactId())) { |
| 41 |
+ // java-pkg-simple do not support now |
| 42 |
+ return "junit-juniper"; |
| 43 |
+ } else if ("org.junit.vintage".equals(dependency.getGroupId()) |
| 44 |
+ && "junit-vintage-engine".equals(dependency.getArtifactId())) { |
| 45 |
+ // java-pkg-simple do not support now |
| 46 |
+ return "junit-vintage"; |
| 47 |
+ } else if ("io.cucumber".equals(dependency.getGroupId()) |
| 48 |
+ && "cucumber-junit".equals(dependency.getArtifactId())) { |
| 49 |
+ // java-pkg-simple do not support now |
| 50 |
+ return "cucumber"; |
| 51 |
} else { |
| 52 |
return null; |
| 53 |
} |
| 54 |
|
| 55 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java |
| 56 |
index 51ec844..794f992 100644 |
| 57 |
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java |
| 58 |
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java |
| 59 |
@@ -276,7 +276,7 @@ public class MavenProject { |
| 60 |
* @param description {@link #description} |
| 61 |
*/ |
| 62 |
public void setDescription(final String description) { |
| 63 |
- this.description = description; |
| 64 |
+ this.description = description.replaceAll("[\n ]+", " "); |
| 65 |
} |
| 66 |
|
| 67 |
/** |
Archives