-
Notifications
You must be signed in to change notification settings - Fork 4
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 #36 from SergeiZagriychuk/stf-client-improvements
Feature with saving of session logs
- Loading branch information
Showing
7 changed files
with
327 additions
and
13 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
67 changes: 67 additions & 0 deletions
67
src/main/java/com/zebrunner/mcloud/grid/models/appium/LogTypes.java
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,67 @@ | ||
| /******************************************************************************* | ||
| * Copyright 2018-2021 Zebrunner (https://zebrunner.com/). | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| *******************************************************************************/ | ||
|
|
||
| package com.zebrunner.mcloud.grid.models.appium; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonAnyGetter; | ||
| import com.fasterxml.jackson.annotation.JsonAnySetter; | ||
| import com.fasterxml.jackson.annotation.JsonIgnore; | ||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
|
|
||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.Setter; | ||
|
|
||
| @Getter | ||
| @Setter | ||
| @NoArgsConstructor | ||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| public class LogTypes { | ||
|
|
||
| private List<String> value; | ||
| private String sessionId; | ||
| private int status; | ||
|
|
||
| public enum LogType { | ||
| // android | ||
| logcat, | ||
| bugreport, | ||
| // ios | ||
| syslog, | ||
| crashlog, | ||
| performance, | ||
| // common | ||
| server; | ||
| } | ||
|
|
||
| @JsonIgnore | ||
| private Map<String, Object> additionalProperties = new HashMap<>(); | ||
|
|
||
| @JsonAnyGetter | ||
| public Map<String, Object> getAdditionalProperties() { | ||
| return this.additionalProperties; | ||
| } | ||
|
|
||
| @JsonAnySetter | ||
| public void setAdditionalProperty(String name, Object value) { | ||
| this.additionalProperties.put(name, value); | ||
| } | ||
|
|
||
| } |
59 changes: 59 additions & 0 deletions
59
src/main/java/com/zebrunner/mcloud/grid/models/appium/LogValue.java
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,59 @@ | ||
| /******************************************************************************* | ||
| * Copyright 2018-2021 Zebrunner (https://zebrunner.com/). | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| *******************************************************************************/ | ||
|
|
||
| package com.zebrunner.mcloud.grid.models.appium; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonAnyGetter; | ||
| import com.fasterxml.jackson.annotation.JsonAnySetter; | ||
| import com.fasterxml.jackson.annotation.JsonIgnore; | ||
| import com.fasterxml.jackson.annotation.JsonInclude; | ||
|
|
||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.Setter; | ||
|
|
||
| @Getter | ||
| @Setter | ||
| @NoArgsConstructor | ||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| public class LogValue { | ||
|
|
||
| private String timestamp; | ||
| private String level; | ||
| private String message; | ||
|
|
||
| @JsonIgnore | ||
| private Map<String, Object> additionalProperties = new HashMap<>(); | ||
|
|
||
| @JsonAnyGetter | ||
| public Map<String, Object> getAdditionalProperties() { | ||
| return this.additionalProperties; | ||
| } | ||
|
|
||
| @JsonAnySetter | ||
| public void setAdditionalProperty(String name, Object value) { | ||
| this.additionalProperties.put(name, value); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return String.format("%s: [%s] %s", timestamp, level, message); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.