Skip to content

Commit ed2f866

Browse files
argotriargotri
committed
Revamp
1 parent 916195a commit ed2f866

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+140
-137354
lines changed

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<plugin>
104104
<groupId>org.apache.maven.plugins</groupId>
105105
<artifactId>maven-plugin-plugin</artifactId>
106-
<version>3.3</version>
106+
<version>3.6.0</version>
107107
</plugin>
108108
<plugin>
109109
<artifactId>maven-assembly-plugin</artifactId>

‎src/main/java/com/gdn/qa/util/BadakReporter.java renamed to ‎src/main/java/com/blibli/oss/qa/util/BadakReporter.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.gdn.qa.util;
1+
package com.blibli.oss.qa.util;
22

3-
import com.gdn.qa.util.constant.SupportedReports;
4-
import com.gdn.qa.util.model.TestLinkData;
5-
import com.gdn.qa.util.reader.BaseTestResultReader;
6-
import com.gdn.qa.util.reader.CucumberTestResultReader;
7-
import com.gdn.qa.util.reader.EarlGreyTestResultReader;
8-
import com.gdn.qa.util.reader.JBehaveTestResultReader;
3+
import com.blibli.oss.qa.util.constant.SupportedReports;
4+
import com.blibli.oss.qa.util.model.TestLinkData;
5+
import com.blibli.oss.qa.util.reader.BaseTestResultReader;
6+
import com.blibli.oss.qa.util.reader.CucumberTestResultReader;
7+
import com.blibli.oss.qa.util.reader.EarlGreyTestResultReader;
8+
import com.blibli.oss.qa.util.reader.JBehaveTestResultReader;
99

1010
import java.io.File;
1111

‎src/main/java/com/blibli/oss/qa/util/Main.java

Lines changed: 67 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.blibli.oss.qa.util;
22

3+
import com.blibli.oss.qa.util.constant.ReportGeneratorPolicy;
4+
import com.blibli.oss.qa.util.constant.SupportedReports;
5+
import com.blibli.oss.qa.util.model.TestLinkData;
36
import org.apache.maven.plugin.AbstractMojo;
47
import org.apache.maven.plugin.MojoExecutionException;
58
import org.apache.maven.plugin.MojoFailureException;
@@ -20,85 +23,98 @@
2023
@Mojo(name = "testlink-serenity")
2124
public class Main extends AbstractMojo {
2225

26+
/**
27+
* @parameter
28+
*/
2329
@Parameter
2430
private String sourceDir;
2531

32+
/**
33+
* @parameter
34+
*/
2635
@Parameter
2736
private String testlinkURL;
37+
// private String testlinkURL = "";
2838

39+
/**
40+
* @parameter
41+
*/
2942
@Parameter
3043
private String devKey;
44+
// private String devKey="b5c1d6045227609983587bc8a4e499cf";
3145

46+
/**
47+
* @parameter
48+
*/
3249
@Parameter
3350
private String projectName;
51+
// private String projectName="Surabaya Sample Project Rest Assured";
3452

53+
/**
54+
* @parameter
55+
*/
3556
@Parameter
3657
private String testPlanName;
58+
// private String testPlanName="Rest Assured UAT1";
3759

60+
/**
61+
* @parameter
62+
*/
3863
@Parameter
3964
private String buildName;
65+
// private String buildName="BUILD UAT1";
4066

67+
/**
68+
* @parameter
69+
*/
4170
@Parameter
4271
private String platformName;
4372

73+
/**
74+
* @parameter
75+
*/
76+
@Parameter(defaultValue = "CUCUMBER")
77+
private String reportsFrom;
78+
79+
/**
80+
* @parameter
81+
*/
82+
@Parameter(defaultValue = "STRICT")
83+
private String reportPolicy;
84+
4485
@Override
4586
public void execute() throws MojoExecutionException, MojoFailureException {
46-
Banner.loadBanner();
47-
System.out.println("===Config===");
48-
System.out.println("Source Directory: " + sourceDir);
49-
System.out.println("testlink URL : " + testlinkURL);
50-
System.out.println("DevKey : " + devKey);
51-
System.out.println("Project Name : " + projectName);
52-
System.out.println("Test Plan Name : " + testPlanName);
53-
System.out.println("Build Name : " + buildName);
54-
System.out.println("Platform Name : " + platformName);
55-
System.out.println("===End Of Config===");
5687
System.out.println("===Process Started===");
57-
58-
// Scanning File under destination folder
59-
String cucumberFolder;
60-
if (sourceDir == null || sourceDir.isEmpty()) {
61-
cucumberFolder =
62-
System.getProperty("user.dir") + File.separator + "target/destination/";
63-
} else {
64-
cucumberFolder = sourceDir;
65-
}
66-
67-
try (Stream<Path> walk = Files.walk(Paths.get(cucumberFolder))) {
68-
List<String> cucumberPaths = walk.filter(Files::isRegularFile)
69-
.map(x -> x.toString()).filter(s -> s.toLowerCase().endsWith(".json")).collect(Collectors.toList());
70-
// check if cucumebr json exist
71-
System.out.print(" File Scanned : ");
72-
cucumberPaths.forEach(System.out::println);
73-
System.out.println("=================================================");
74-
cucumberPaths.parallelStream().forEach(cucumberPath -> {
75-
try {
76-
System.out.println("Cucumber Path : " + cucumberPath);
77-
File cucumberFile = new File(cucumberPath);
78-
TestResultReader testResultReader = new TestResultReader();
79-
testResultReader.initialize(testlinkURL,
80-
devKey,
81-
projectName,
82-
testPlanName,
83-
buildName,
84-
platformName);
85-
86-
if (!cucumberFile.exists()) {
87-
System.out.println("=== Run with Jbehave ===");
88-
testResultReader.readResult();
89-
} else {
90-
System.out.println("=== Run with Cucumber ===");
91-
testResultReader.readWithCucumber(cucumberPath);
92-
}
93-
} catch (Exception e) {
94-
e.printStackTrace();
95-
}
96-
});
97-
88+
ReportGeneratorPolicy policy = null;
89+
try {
90+
policy = BadakReporter.searchEnum(ReportGeneratorPolicy.class, reportPolicy);
9891
}catch (Exception e){
9992
e.printStackTrace();
10093
}
94+
if (policy == null) {
95+
policy = ReportGeneratorPolicy.STRICT;
96+
}
10197

98+
TestLinkData testLinkData = new TestLinkData().setUrlTestlink(testlinkURL)
99+
.setDEVKEY(devKey)
100+
.setTestProject(projectName)
101+
.setTestPlan(testPlanName)
102+
.setBuild(buildName)
103+
.setReportPolicy(policy)
104+
.setPlatFormName(platformName);
105+
try {
106+
SupportedReports type = BadakReporter.searchEnum(SupportedReports.class, reportsFrom);
107+
if (type == null) {
108+
type = SupportedReports.CUCUMBER;
109+
}
110+
if (sourceDir == null || sourceDir.trim().isEmpty()) {
111+
BadakReporter.getReader(type, testLinkData).writeToTestLink();
112+
} else {
113+
BadakReporter.getReader(type, testLinkData, sourceDir).writeToTestLink();
114+
}
115+
} catch (Exception e) {
116+
e.printStackTrace();
117+
}
102118
System.out.println("===Process Ended===");
103119
}
104120
}

‎src/main/java/com/gdn/qa/util/constant/CheckDuplicateTestStatus.java renamed to ‎src/main/java/com/blibli/oss/qa/util/constant/CheckDuplicateTestStatus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gdn.qa.util.constant;
1+
package com.blibli.oss.qa.util.constant;
22

33
/**
44
* @author yunaz.ramadhan on 1/30/2020

‎src/main/java/com/gdn/qa/util/constant/ReportGeneratorPolicy.java renamed to ‎src/main/java/com/blibli/oss/qa/util/constant/ReportGeneratorPolicy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gdn.qa.util.constant;
1+
package com.blibli.oss.qa.util.constant;
22

33
/**
44
* @author yunaz.ramadhan on 4/24/2020

‎src/main/java/com/gdn/qa/util/constant/SupportedReports.java renamed to ‎src/main/java/com/blibli/oss/qa/util/constant/SupportedReports.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gdn.qa.util.constant;
1+
package com.blibli.oss.qa.util.constant;
22

33
/**
44
* @author yunaz.ramadhan on 3/3/2020

‎src/main/java/com/gdn/qa/util/model/ScenarioData.java renamed to ‎src/main/java/com/blibli/oss/qa/util/model/ScenarioData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gdn.qa.util.model;
1+
package com.blibli.oss.qa.util.model;
22

33
import br.eti.kinoshita.testlinkjavaapi.model.TestCase;
44

‎src/main/java/com/gdn/qa/util/model/TagsReader.java renamed to ‎src/main/java/com/blibli/oss/qa/util/model/TagsReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gdn.qa.util.model;
1+
package com.blibli.oss.qa.util.model;
22

33
/**
44
* @author yunaz.ramadhan on 3/27/2020

‎src/main/java/com/gdn/qa/util/model/TestLinkData.java renamed to ‎src/main/java/com/blibli/oss/qa/util/model/TestLinkData.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.gdn.qa.util.model;
1+
package com.blibli.oss.qa.util.model;
22

3-
import com.gdn.qa.util.constant.ReportGeneratorPolicy;
3+
import com.blibli.oss.qa.util.constant.ReportGeneratorPolicy;
44

55
/**
66
* @author yunaz.ramadhan on 3/2/2020

‎src/main/java/com/blibli/oss/qa/util/model/cucumber/CucumberModel.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class CucumberModel {
2323
@JsonProperty("line")
2424
private Integer line;
2525
@JsonProperty("elements")
26-
private List<Element> elements = null;
26+
private List<Elements> elements = null;
2727
@JsonProperty("name")
2828
private String name;
2929
@JsonProperty("description")
@@ -50,12 +50,12 @@ public void setLine(Integer line) {
5050
}
5151

5252
@JsonProperty("elements")
53-
public List<Element> getElements() {
53+
public List<Elements> getElements() {
5454
return elements;
5555
}
5656

5757
@JsonProperty("elements")
58-
public void setElements(List<Element> elements) {
58+
public void setElements(List<Elements> elements) {
5959
this.elements = elements;
6060
}
6161

0 commit comments

Comments
 (0)