Skip to content

Commit 1b3621b

Browse files
committed
Visualize log and html content
Visualize log and html content. At the moment we are reading the specific path: C:\testar\bin\output\
1 parent ab4d018 commit 1b3621b

2 files changed

Lines changed: 18 additions & 12 deletions

File tree

src/main/java/es/prodevelop/testar/api/model/TestarFile.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class TestarFile {
2020
private String name = null;
2121

2222
@JsonProperty("content")
23-
private byte[] content = null;
23+
private String content = null;
2424

2525
public TestarFile name(String name) {
2626
this.name = name;
@@ -42,7 +42,7 @@ public void setName(String name) {
4242
this.name = name;
4343
}
4444

45-
public TestarFile content(byte[] content) {
45+
public TestarFile content(String content) {
4646
this.content = content;
4747
return this;
4848
}
@@ -54,11 +54,11 @@ public TestarFile content(byte[] content) {
5454
@ApiModelProperty(value = "")
5555

5656
@Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")
57-
public byte[] getContent() {
57+
public String getContent() {
5858
return content;
5959
}
6060

61-
public void setContent(byte[] content) {
61+
public void setContent(String content) {
6262
this.content = content;
6363
}
6464

src/main/java/es/prodevelop/testar/api/service/SequenceService.java

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class SequenceService implements ISequenceService {
2121

2222
@Override
2323
public List<TestarFile> getFiles(String sequenceName) throws IOException {
24-
List<TestarFile> files = new ArrayList<TestarFile>();
24+
List<TestarFile> files = new ArrayList<>();
2525

2626
log.info("Get files of {} sequence", sequenceName);
2727
TestarFile testarFile;
@@ -30,20 +30,26 @@ public List<TestarFile> getFiles(String sequenceName) throws IOException {
3030
File sequencelog = new File(TESTAR_PATH + "\\output\\logs\\" + sequenceName + ".log");
3131
if(sequencelog.exists()) {
3232
testarFile = new TestarFile();
33-
testarFile.content(FileUtils.readFileToByteArray(sequencelog));
34-
testarFile.setName(sequencelog.getName());
33+
testarFile.content(FileUtils.readFileToString(sequencelog, "UTF-8"));
34+
testarFile.setName(sequencelog.getCanonicalPath());
3535
files.add(testarFile);
3636
}
3737

38-
File sequence = new File(TESTAR_PATH + "\\output\\sequences\\" + sequenceName);
39-
if(sequence.exists()) {
38+
File sequenceTestar = new File(TESTAR_PATH + "\\output\\sequences\\" + sequenceName + ".testar");
39+
if(sequenceTestar.exists()) {
4040
testarFile = new TestarFile();
41-
testarFile.content(FileUtils.readFileToByteArray(sequence));
42-
testarFile.setName(sequence.getName());
41+
testarFile.content("Replayable File");
42+
testarFile.setName(sequenceTestar.getCanonicalPath());
4343
files.add(testarFile);
4444
}
4545

46-
//TODO: HTML FILE
46+
File sequenceHtml = new File(TESTAR_PATH + "\\output\\htmls\\" + sequenceName + ".html");
47+
if(sequenceHtml.exists()) {
48+
testarFile = new TestarFile();
49+
testarFile.content(FileUtils.readFileToString(sequenceHtml, "UTF-8"));
50+
testarFile.setName(sequenceHtml.getCanonicalPath());
51+
files.add(testarFile);
52+
}
4753

4854

4955
return files;

0 commit comments

Comments
 (0)