diff --git a/gauge-proto b/gauge-proto index 74a75b6..5dc343c 160000 --- a/gauge-proto +++ b/gauge-proto @@ -1 +1 @@ -Subproject commit 74a75b6d9dd1affcf745be729f0c71f2cacf13d7 +Subproject commit 5dc343c6567076292afb6ab44b35bbced2d1fff6 diff --git a/gauge_messages/spec.pb.go b/gauge_messages/spec.pb.go index 8c8da6e..56290ff 100644 --- a/gauge_messages/spec.pb.go +++ b/gauge_messages/spec.pb.go @@ -45,7 +45,7 @@ func (x ExecutionStatus) String() string { return proto.EnumName(ExecutionStatus_name, int32(x)) } func (ExecutionStatus) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{0} + return fileDescriptor_spec_17d5ce73e0227e31, []int{0} } // / Enumerates various item types that the proto item can contain. Valid types are: Step, Comment, Concept, Scenario, TableDrivenScenario, Table, Tags @@ -84,7 +84,7 @@ func (x ProtoItem_ItemType) String() string { return proto.EnumName(ProtoItem_ItemType_name, int32(x)) } func (ProtoItem_ItemType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{1, 0} + return fileDescriptor_spec_17d5ce73e0227e31, []int{1, 0} } // / Enum representing the types of Fragment @@ -108,7 +108,7 @@ func (x Fragment_FragmentType) String() string { return proto.EnumName(Fragment_FragmentType_name, int32(x)) } func (Fragment_FragmentType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{8, 0} + return fileDescriptor_spec_17d5ce73e0227e31, []int{8, 0} } // / Enum representing types of Parameter. @@ -141,7 +141,7 @@ func (x Parameter_ParameterType) String() string { return proto.EnumName(Parameter_ParameterType_name, int32(x)) } func (Parameter_ParameterType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{9, 0} + return fileDescriptor_spec_17d5ce73e0227e31, []int{9, 0} } type ProtoExecutionResult_ErrorType int32 @@ -164,7 +164,7 @@ func (x ProtoExecutionResult_ErrorType) String() string { return proto.EnumName(ProtoExecutionResult_ErrorType_name, int32(x)) } func (ProtoExecutionResult_ErrorType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{14, 0} + return fileDescriptor_spec_17d5ce73e0227e31, []int{14, 0} } type Error_ErrorType int32 @@ -187,7 +187,7 @@ func (x Error_ErrorType) String() string { return proto.EnumName(Error_ErrorType_name, int32(x)) } func (Error_ErrorType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{18, 0} + return fileDescriptor_spec_17d5ce73e0227e31, []int{18, 0} } // / A proto object representing a Specification @@ -228,7 +228,7 @@ func (m *ProtoSpec) Reset() { *m = ProtoSpec{} } func (m *ProtoSpec) String() string { return proto.CompactTextString(m) } func (*ProtoSpec) ProtoMessage() {} func (*ProtoSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{0} + return fileDescriptor_spec_17d5ce73e0227e31, []int{0} } func (m *ProtoSpec) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoSpec.Unmarshal(m, b) @@ -368,7 +368,7 @@ func (m *ProtoItem) Reset() { *m = ProtoItem{} } func (m *ProtoItem) String() string { return proto.CompactTextString(m) } func (*ProtoItem) ProtoMessage() {} func (*ProtoItem) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{1} + return fileDescriptor_spec_17d5ce73e0227e31, []int{1} } func (m *ProtoItem) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoItem.Unmarshal(m, b) @@ -495,7 +495,7 @@ func (m *ProtoScenario) Reset() { *m = ProtoScenario{} } func (m *ProtoScenario) String() string { return proto.CompactTextString(m) } func (*ProtoScenario) ProtoMessage() {} func (*ProtoScenario) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{2} + return fileDescriptor_spec_17d5ce73e0227e31, []int{2} } func (m *ProtoScenario) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoScenario.Unmarshal(m, b) @@ -674,7 +674,7 @@ func (m *Span) Reset() { *m = Span{} } func (m *Span) String() string { return proto.CompactTextString(m) } func (*Span) ProtoMessage() {} func (*Span) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{3} + return fileDescriptor_spec_17d5ce73e0227e31, []int{3} } func (m *Span) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Span.Unmarshal(m, b) @@ -737,7 +737,7 @@ func (m *ProtoTableDrivenScenario) Reset() { *m = ProtoTableDrivenScenar func (m *ProtoTableDrivenScenario) String() string { return proto.CompactTextString(m) } func (*ProtoTableDrivenScenario) ProtoMessage() {} func (*ProtoTableDrivenScenario) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{4} + return fileDescriptor_spec_17d5ce73e0227e31, []int{4} } func (m *ProtoTableDrivenScenario) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoTableDrivenScenario.Unmarshal(m, b) @@ -798,7 +798,7 @@ func (m *ProtoStep) Reset() { *m = ProtoStep{} } func (m *ProtoStep) String() string { return proto.CompactTextString(m) } func (*ProtoStep) ProtoMessage() {} func (*ProtoStep) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{5} + return fileDescriptor_spec_17d5ce73e0227e31, []int{5} } func (m *ProtoStep) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoStep.Unmarshal(m, b) @@ -893,7 +893,7 @@ func (m *ProtoConcept) Reset() { *m = ProtoConcept{} } func (m *ProtoConcept) String() string { return proto.CompactTextString(m) } func (*ProtoConcept) ProtoMessage() {} func (*ProtoConcept) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{6} + return fileDescriptor_spec_17d5ce73e0227e31, []int{6} } func (m *ProtoConcept) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoConcept.Unmarshal(m, b) @@ -947,7 +947,7 @@ func (m *ProtoTags) Reset() { *m = ProtoTags{} } func (m *ProtoTags) String() string { return proto.CompactTextString(m) } func (*ProtoTags) ProtoMessage() {} func (*ProtoTags) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{7} + return fileDescriptor_spec_17d5ce73e0227e31, []int{7} } func (m *ProtoTags) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoTags.Unmarshal(m, b) @@ -992,7 +992,7 @@ func (m *Fragment) Reset() { *m = Fragment{} } func (m *Fragment) String() string { return proto.CompactTextString(m) } func (*Fragment) ProtoMessage() {} func (*Fragment) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{8} + return fileDescriptor_spec_17d5ce73e0227e31, []int{8} } func (m *Fragment) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Fragment.Unmarshal(m, b) @@ -1052,7 +1052,7 @@ func (m *Parameter) Reset() { *m = Parameter{} } func (m *Parameter) String() string { return proto.CompactTextString(m) } func (*Parameter) ProtoMessage() {} func (*Parameter) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{9} + return fileDescriptor_spec_17d5ce73e0227e31, []int{9} } func (m *Parameter) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Parameter.Unmarshal(m, b) @@ -1113,7 +1113,7 @@ func (m *ProtoComment) Reset() { *m = ProtoComment{} } func (m *ProtoComment) String() string { return proto.CompactTextString(m) } func (*ProtoComment) ProtoMessage() {} func (*ProtoComment) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{10} + return fileDescriptor_spec_17d5ce73e0227e31, []int{10} } func (m *ProtoComment) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoComment.Unmarshal(m, b) @@ -1155,7 +1155,7 @@ func (m *ProtoTable) Reset() { *m = ProtoTable{} } func (m *ProtoTable) String() string { return proto.CompactTextString(m) } func (*ProtoTable) ProtoMessage() {} func (*ProtoTable) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{11} + return fileDescriptor_spec_17d5ce73e0227e31, []int{11} } func (m *ProtoTable) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoTable.Unmarshal(m, b) @@ -1202,7 +1202,7 @@ func (m *ProtoTableRow) Reset() { *m = ProtoTableRow{} } func (m *ProtoTableRow) String() string { return proto.CompactTextString(m) } func (*ProtoTableRow) ProtoMessage() {} func (*ProtoTableRow) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{12} + return fileDescriptor_spec_17d5ce73e0227e31, []int{12} } func (m *ProtoTableRow) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoTableRow.Unmarshal(m, b) @@ -1248,7 +1248,7 @@ func (m *ProtoStepExecutionResult) Reset() { *m = ProtoStepExecutionResu func (m *ProtoStepExecutionResult) String() string { return proto.CompactTextString(m) } func (*ProtoStepExecutionResult) ProtoMessage() {} func (*ProtoStepExecutionResult) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{13} + return fileDescriptor_spec_17d5ce73e0227e31, []int{13} } func (m *ProtoStepExecutionResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoStepExecutionResult.Unmarshal(m, b) @@ -1322,7 +1322,7 @@ type ProtoExecutionResult struct { // / Type of the Error. Valid values: ASSERTION, VERIFICATION. Default: ASSERTION ErrorType ProtoExecutionResult_ErrorType `protobuf:"varint,8,opt,name=errorType,proto3,enum=gauge.messages.ProtoExecutionResult_ErrorType" json:"errorType,omitempty"` // / Bytes containing screenshot taken at the time of failure. - FailedScreenshot []byte `protobuf:"bytes,9,opt,name=failedScreenshot,proto3" json:"failedScreenshot,omitempty"` + FailureScreenshot []byte `protobuf:"bytes,9,opt,name=failureScreenshot,proto3" json:"failureScreenshot,omitempty"` // / Bytes array containing screenshots at the time of it invoked Screenshots [][]byte `protobuf:"bytes,10,rep,name=screenshots,proto3" json:"screenshots,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1334,7 +1334,7 @@ func (m *ProtoExecutionResult) Reset() { *m = ProtoExecutionResult{} } func (m *ProtoExecutionResult) String() string { return proto.CompactTextString(m) } func (*ProtoExecutionResult) ProtoMessage() {} func (*ProtoExecutionResult) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{14} + return fileDescriptor_spec_17d5ce73e0227e31, []int{14} } func (m *ProtoExecutionResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoExecutionResult.Unmarshal(m, b) @@ -1411,9 +1411,9 @@ func (m *ProtoExecutionResult) GetErrorType() ProtoExecutionResult_ErrorType { return ProtoExecutionResult_ASSERTION } -func (m *ProtoExecutionResult) GetFailedScreenshot() []byte { +func (m *ProtoExecutionResult) GetFailureScreenshot() []byte { if m != nil { - return m.FailedScreenshot + return m.FailureScreenshot } return nil } @@ -1437,7 +1437,7 @@ type ProtoHookFailure struct { // / Contains table row index corresponding to datatable rows TableRowIndex int32 `protobuf:"varint,4,opt,name=tableRowIndex,proto3" json:"tableRowIndex,omitempty"` // /Bytes holding the screenshot taken at the time of failure. - FailedScreenshot []byte `protobuf:"bytes,5,opt,name=failedScreenshot,proto3" json:"failedScreenshot,omitempty"` + FailureScreenshot []byte `protobuf:"bytes,5,opt,name=failureScreenshot,proto3" json:"failureScreenshot,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1447,7 +1447,7 @@ func (m *ProtoHookFailure) Reset() { *m = ProtoHookFailure{} } func (m *ProtoHookFailure) String() string { return proto.CompactTextString(m) } func (*ProtoHookFailure) ProtoMessage() {} func (*ProtoHookFailure) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{15} + return fileDescriptor_spec_17d5ce73e0227e31, []int{15} } func (m *ProtoHookFailure) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoHookFailure.Unmarshal(m, b) @@ -1496,9 +1496,9 @@ func (m *ProtoHookFailure) GetTableRowIndex() int32 { return 0 } -func (m *ProtoHookFailure) GetFailedScreenshot() []byte { +func (m *ProtoHookFailure) GetFailureScreenshot() []byte { if m != nil { - return m.FailedScreenshot + return m.FailureScreenshot } return nil } @@ -1549,7 +1549,7 @@ func (m *ProtoSuiteResult) Reset() { *m = ProtoSuiteResult{} } func (m *ProtoSuiteResult) String() string { return proto.CompactTextString(m) } func (*ProtoSuiteResult) ProtoMessage() {} func (*ProtoSuiteResult) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{16} + return fileDescriptor_spec_17d5ce73e0227e31, []int{16} } func (m *ProtoSuiteResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoSuiteResult.Unmarshal(m, b) @@ -1728,7 +1728,7 @@ func (m *ProtoSpecResult) Reset() { *m = ProtoSpecResult{} } func (m *ProtoSpecResult) String() string { return proto.CompactTextString(m) } func (*ProtoSpecResult) ProtoMessage() {} func (*ProtoSpecResult) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{17} + return fileDescriptor_spec_17d5ce73e0227e31, []int{17} } func (m *ProtoSpecResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoSpecResult.Unmarshal(m, b) @@ -1837,7 +1837,7 @@ func (m *Error) Reset() { *m = Error{} } func (m *Error) String() string { return proto.CompactTextString(m) } func (*Error) ProtoMessage() {} func (*Error) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{18} + return fileDescriptor_spec_17d5ce73e0227e31, []int{18} } func (m *Error) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Error.Unmarshal(m, b) @@ -1902,7 +1902,7 @@ func (m *ProtoStepValue) Reset() { *m = ProtoStepValue{} } func (m *ProtoStepValue) String() string { return proto.CompactTextString(m) } func (*ProtoStepValue) ProtoMessage() {} func (*ProtoStepValue) Descriptor() ([]byte, []int) { - return fileDescriptor_spec_ee48e41a426f85dd, []int{19} + return fileDescriptor_spec_17d5ce73e0227e31, []int{19} } func (m *ProtoStepValue) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ProtoStepValue.Unmarshal(m, b) @@ -1972,129 +1972,129 @@ func init() { proto.RegisterEnum("gauge.messages.Error_ErrorType", Error_ErrorType_name, Error_ErrorType_value) } -func init() { proto.RegisterFile("spec.proto", fileDescriptor_spec_ee48e41a426f85dd) } +func init() { proto.RegisterFile("spec.proto", fileDescriptor_spec_17d5ce73e0227e31) } -var fileDescriptor_spec_ee48e41a426f85dd = []byte{ - // 1934 bytes of a gzipped FileDescriptorProto +var fileDescriptor_spec_17d5ce73e0227e31 = []byte{ + // 1935 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xdd, 0x8e, 0x1b, 0x49, 0x15, 0x9e, 0x76, 0xb7, 0xff, 0x8e, 0x7f, 0xa6, 0x53, 0x33, 0x84, 0x26, 0x0a, 0x89, 0xd5, 0x9a, 0xd5, 0x9a, 0x28, 0x6b, 0xc2, 0xac, 0xc8, 0x0a, 0x21, 0x81, 0x66, 0xc7, 0x9e, 0x8d, 0x21, 0x3b, - 0x19, 0x95, 0x4d, 0x84, 0xf6, 0x66, 0xe9, 0xf4, 0x54, 0x3c, 0xbd, 0xb1, 0xbb, 0xad, 0xee, 0x72, - 0x66, 0x16, 0xee, 0x79, 0x00, 0x6e, 0x78, 0x07, 0x24, 0xae, 0x78, 0x01, 0x24, 0x24, 0x6e, 0x88, - 0x78, 0x04, 0xc4, 0xa3, 0xa0, 0x3a, 0x55, 0xfd, 0xeb, 0xf6, 0x8c, 0x8d, 0xb8, 0xe0, 0xae, 0xea, - 0xfc, 0xd4, 0xcf, 0xa9, 0xaf, 0xce, 0xf9, 0xaa, 0x00, 0xa2, 0x25, 0x73, 0x07, 0xcb, 0x30, 0xe0, - 0x01, 0xe9, 0xce, 0x9c, 0xd5, 0x8c, 0x0d, 0x16, 0x2c, 0x8a, 0x9c, 0x19, 0x8b, 0xec, 0x7f, 0x1b, - 0xd0, 0xbc, 0x10, 0x9a, 0xc9, 0x92, 0xb9, 0xa4, 0x07, 0x2d, 0x61, 0xfb, 0x82, 0x39, 0x97, 0x9e, - 0x3f, 0xb3, 0xb4, 0x9e, 0xd6, 0x6f, 0xd2, 0xac, 0x88, 0xfc, 0x10, 0xaa, 0x1e, 0x67, 0x8b, 0xc8, - 0xaa, 0xf4, 0xf4, 0x7e, 0xeb, 0xf8, 0x7b, 0x83, 0xfc, 0x78, 0x03, 0x1c, 0x6b, 0xcc, 0xd9, 0x82, - 0x4a, 0x3b, 0x72, 0x04, 0x1d, 0x2f, 0x9a, 0x3a, 0x6f, 0xe6, 0x6c, 0x18, 0x7a, 0xef, 0x99, 0x6f, - 0xe9, 0x3d, 0xad, 0xdf, 0xa0, 0x79, 0x21, 0xf9, 0x05, 0xec, 0x2f, 0x43, 0xf6, 0x22, 0x08, 0xde, - 0x9d, 0x39, 0xde, 0x7c, 0x15, 0xb2, 0xc8, 0x32, 0x70, 0x82, 0x5e, 0xe9, 0x04, 0x19, 0x43, 0x5a, - 0x74, 0x24, 0x2f, 0xc1, 0x5c, 0x06, 0x11, 0xcf, 0x0d, 0x56, 0xdd, 0x72, 0xb0, 0x35, 0x4f, 0xf2, - 0x00, 0x1a, 0x6f, 0xbd, 0x39, 0x3b, 0x77, 0x16, 0xcc, 0xaa, 0x61, 0x3c, 0x92, 0x3e, 0x21, 0x60, - 0x70, 0x67, 0x16, 0x59, 0xf5, 0x9e, 0xde, 0x6f, 0x52, 0x6c, 0x93, 0x7e, 0xb2, 0x93, 0x2f, 0xd5, - 0x2c, 0x56, 0x03, 0xd5, 0x45, 0x31, 0x79, 0x92, 0xae, 0x33, 0x31, 0x6d, 0xa2, 0xe9, 0x9a, 0x9c, - 0x3c, 0x81, 0x6e, 0xde, 0xdd, 0x02, 0x61, 0xf9, 0x79, 0xc5, 0xd2, 0x68, 0x41, 0x43, 0x9e, 0xc2, - 0x7e, 0xc1, 0xdf, 0x6a, 0x25, 0xc6, 0x45, 0x15, 0x19, 0x00, 0x51, 0xfe, 0x13, 0x37, 0x64, 0xcc, - 0x8f, 0xae, 0x02, 0x1e, 0x59, 0xed, 0x9e, 0xde, 0x6f, 0xd3, 0x12, 0x0d, 0x79, 0x06, 0x07, 0xf1, - 0x10, 0x59, 0x87, 0x0e, 0x3a, 0x94, 0xa9, 0xec, 0x7f, 0xc6, 0x10, 0x13, 0xb0, 0x20, 0x3f, 0x83, + 0x19, 0x95, 0x4d, 0x84, 0xf6, 0x66, 0xe9, 0xf4, 0xd4, 0x78, 0x7a, 0x63, 0x77, 0x5b, 0xdd, 0xe5, + 0x64, 0x16, 0xee, 0x79, 0x00, 0x6e, 0x78, 0x07, 0x24, 0xae, 0x78, 0x01, 0x24, 0x24, 0x6e, 0x90, + 0xf2, 0x08, 0x88, 0x47, 0x41, 0x75, 0xaa, 0xfa, 0xd7, 0xed, 0x19, 0x1b, 0x71, 0xb1, 0x77, 0x55, + 0xe7, 0xa7, 0x7e, 0x4e, 0x7d, 0x75, 0xce, 0x57, 0x05, 0x10, 0x2d, 0x99, 0x3b, 0x58, 0x86, 0x01, + 0x0f, 0x48, 0x77, 0xe6, 0xac, 0x66, 0x6c, 0xb0, 0x60, 0x51, 0xe4, 0xcc, 0x58, 0x64, 0xff, 0xc7, + 0x80, 0xe6, 0x85, 0xd0, 0x4c, 0x96, 0xcc, 0x25, 0x3d, 0x68, 0x09, 0xdb, 0x17, 0xcc, 0xb9, 0xf4, + 0xfc, 0x99, 0xa5, 0xf5, 0xb4, 0x7e, 0x93, 0x66, 0x45, 0xe4, 0xc7, 0x50, 0xf5, 0x38, 0x5b, 0x44, + 0x56, 0xa5, 0xa7, 0xf7, 0x5b, 0xc7, 0x3f, 0x18, 0xe4, 0xc7, 0x1b, 0xe0, 0x58, 0x63, 0xce, 0x16, + 0x54, 0xda, 0x91, 0x23, 0xe8, 0x78, 0xd1, 0xd4, 0x79, 0x33, 0x67, 0xc3, 0xd0, 0x7b, 0xc7, 0x7c, + 0x4b, 0xef, 0x69, 0xfd, 0x06, 0xcd, 0x0b, 0xc9, 0xaf, 0x60, 0x7f, 0x19, 0xb2, 0x17, 0x41, 0xf0, + 0xf6, 0xcc, 0xf1, 0xe6, 0xab, 0x90, 0x45, 0x96, 0x81, 0x13, 0xf4, 0x4a, 0x27, 0xc8, 0x18, 0xd2, + 0xa2, 0x23, 0x79, 0x09, 0xe6, 0x32, 0x88, 0x78, 0x6e, 0xb0, 0xea, 0x96, 0x83, 0xad, 0x79, 0x92, + 0x07, 0xd0, 0xb8, 0xf2, 0xe6, 0xec, 0xdc, 0x59, 0x30, 0xab, 0x86, 0xf1, 0x48, 0xfa, 0x84, 0x80, + 0xc1, 0x9d, 0x59, 0x64, 0xd5, 0x7b, 0x7a, 0xbf, 0x49, 0xb1, 0x4d, 0xfa, 0xc9, 0x4e, 0xbe, 0x54, + 0xb3, 0x58, 0x0d, 0x54, 0x17, 0xc5, 0xe4, 0x49, 0xba, 0xce, 0xc4, 0xb4, 0x89, 0xa6, 0x6b, 0x72, + 0xf2, 0x04, 0xba, 0x79, 0x77, 0x0b, 0x84, 0xe5, 0xe7, 0x15, 0x4b, 0xa3, 0x05, 0x0d, 0x79, 0x0a, + 0xfb, 0x05, 0x7f, 0xab, 0x95, 0x18, 0x17, 0x55, 0x64, 0x00, 0x44, 0xf9, 0x4f, 0xdc, 0x90, 0x31, + 0x3f, 0xba, 0x0e, 0x78, 0x64, 0xb5, 0x7b, 0x7a, 0xbf, 0x4d, 0x4b, 0x34, 0xe4, 0x19, 0x1c, 0xc4, + 0x43, 0x64, 0x1d, 0x3a, 0xe8, 0x50, 0xa6, 0xb2, 0x3f, 0xc4, 0x10, 0x13, 0xb0, 0x20, 0xbf, 0x80, 0x86, 0x00, 0xc6, 0xf4, 0xdb, 0x25, 0x43, 0x7c, 0x75, 0x8f, 0xed, 0x8d, 0x18, 0x1a, 0x8c, 0x95, 0x25, 0x4d, 0x7c, 0xc8, 0x27, 0x60, 0x44, 0x9c, 0x2d, 0xad, 0x4a, 0x4f, 0xdb, 0x88, 0xbf, 0x09, 0x67, 0x4b, 0x8a, 0x66, 0xe4, 0x39, 0xd4, 0xdd, 0xc0, 0x77, 0xd9, 0x92, 0x23, 0xf0, 0x5a, 0xc7, - 0x0f, 0x4b, 0x3d, 0x4e, 0xa5, 0x0d, 0x8d, 0x8d, 0xc9, 0x4f, 0xa0, 0x11, 0xb9, 0xcc, 0x77, 0x42, - 0x2f, 0xb0, 0x0c, 0x74, 0xfc, 0x7e, 0xf9, 0x54, 0xca, 0x88, 0x26, 0xe6, 0xe4, 0x2b, 0x38, 0xe0, + 0x0f, 0x4b, 0x3d, 0x4e, 0xa5, 0x0d, 0x8d, 0x8d, 0xc9, 0xcf, 0xa0, 0x11, 0xb9, 0xcc, 0x77, 0x42, + 0x2f, 0xb0, 0x0c, 0x74, 0xfc, 0x61, 0xf9, 0x54, 0xca, 0x88, 0x26, 0xe6, 0xe4, 0x2b, 0x38, 0xe0, 0x29, 0xb4, 0x63, 0x03, 0xab, 0x8a, 0xa3, 0xf4, 0x4b, 0x47, 0x99, 0xae, 0xdb, 0xd3, 0xb2, 0x41, 0xe4, 0x76, 0x16, 0x0b, 0xe6, 0x73, 0x04, 0xe3, 0xe6, 0xed, 0xa0, 0x0d, 0x8d, 0x8d, 0xc9, 0x33, 0xa8, 0xe2, 0x70, 0x56, 0x1d, 0xbd, 0x1e, 0x6c, 0x5e, 0x05, 0x95, 0x86, 0x22, 0xce, 0x88, 0xed, 0xc6, 0x2d, 0x71, 0x9e, 0x3a, 0xb3, 0x48, 0xc2, 0xde, 0xfe, 0x06, 0x1a, 0xf1, 0x61, 0x91, 0x06, 0x18, 0xe2, 0x04, 0xcc, 0x3d, 0xd2, 0x82, 0xba, 0x5a, 0x8a, 0xa9, 0xc9, 0x0e, 0x46, 0xd7, 0xac, - 0x90, 0x36, 0x34, 0xe2, 0x4d, 0x99, 0x3a, 0xf9, 0x2e, 0x1c, 0x94, 0x84, 0xc0, 0x34, 0x48, 0x13, - 0xaa, 0xa8, 0x30, 0xab, 0x62, 0x54, 0x31, 0x9f, 0x59, 0xb3, 0xff, 0x52, 0x87, 0x4e, 0x2e, 0xf8, - 0xe2, 0xd2, 0xc5, 0xe1, 0xcf, 0xe7, 0xae, 0xa2, 0x98, 0x3c, 0x80, 0xda, 0x5b, 0xc7, 0x9b, 0xb3, - 0x4b, 0x04, 0x50, 0x03, 0xef, 0x84, 0x92, 0x90, 0x1f, 0x43, 0xc3, 0x0d, 0x7c, 0xce, 0x6e, 0x78, - 0x64, 0xe9, 0x77, 0xa5, 0xb7, 0xc4, 0x94, 0xfc, 0x1c, 0x3a, 0xf1, 0x2c, 0x63, 0x4c, 0x8d, 0xc6, - 0x5d, 0xbe, 0x79, 0x7b, 0xf2, 0x22, 0xb9, 0xdc, 0x2a, 0xeb, 0x28, 0xac, 0xdc, 0x9d, 0xae, 0x0a, - 0x7e, 0x98, 0x46, 0xf3, 0x09, 0x4c, 0xc1, 0x64, 0x9b, 0x34, 0x9a, 0x77, 0x2c, 0x4d, 0x6e, 0x47, - 0xd0, 0x61, 0x37, 0xcc, 0x5d, 0x71, 0x2f, 0xf0, 0xa7, 0xde, 0x82, 0x21, 0x3a, 0x74, 0x9a, 0x17, - 0x92, 0x87, 0x50, 0x8f, 0xde, 0x79, 0xcb, 0x25, 0xbb, 0xb4, 0x9a, 0x49, 0x90, 0x63, 0x11, 0x79, - 0x04, 0x20, 0x9a, 0xa3, 0x30, 0x0c, 0xc2, 0x48, 0xa6, 0x31, 0x9a, 0x91, 0x90, 0x2e, 0x54, 0xc6, - 0x43, 0xab, 0x85, 0xc7, 0x57, 0x19, 0x0f, 0x45, 0x78, 0x39, 0x73, 0xc2, 0x61, 0x70, 0xed, 0x0b, + 0x90, 0x36, 0x34, 0xe2, 0x4d, 0x99, 0x3a, 0xf9, 0x3e, 0x1c, 0x94, 0x84, 0xc0, 0x34, 0x48, 0x13, + 0xaa, 0xa8, 0x30, 0xab, 0x62, 0x54, 0x31, 0x9f, 0x59, 0xb3, 0xff, 0x56, 0x87, 0x4e, 0x2e, 0xf8, + 0xe2, 0xd2, 0xc5, 0xe1, 0xcf, 0xe7, 0xae, 0xa2, 0x98, 0x3c, 0x80, 0xda, 0x95, 0xe3, 0xcd, 0xd9, + 0x25, 0x02, 0xa8, 0x81, 0x77, 0x42, 0x49, 0xc8, 0x4f, 0xa1, 0xe1, 0x06, 0x3e, 0x67, 0x37, 0x3c, + 0xb2, 0xf4, 0xbb, 0xd2, 0x5b, 0x62, 0x4a, 0x7e, 0x09, 0x9d, 0x78, 0x96, 0x31, 0xa6, 0x46, 0xe3, + 0x2e, 0xdf, 0xbc, 0x3d, 0x79, 0x91, 0x5c, 0x6e, 0x95, 0x75, 0x14, 0x56, 0xee, 0x4e, 0x57, 0x05, + 0x3f, 0x4c, 0xa3, 0xf9, 0x04, 0xa6, 0x60, 0xb2, 0x4d, 0x1a, 0xcd, 0x3b, 0x96, 0x26, 0xb7, 0x23, + 0xe8, 0xb0, 0x1b, 0xe6, 0xae, 0xb8, 0x17, 0xf8, 0x53, 0x6f, 0xc1, 0x10, 0x1d, 0x3a, 0xcd, 0x0b, + 0xc9, 0x43, 0xa8, 0x47, 0x6f, 0xbd, 0xe5, 0x92, 0x5d, 0x5a, 0xcd, 0x24, 0xc8, 0xb1, 0x88, 0x3c, + 0x02, 0x10, 0xcd, 0x51, 0x18, 0x06, 0x61, 0x24, 0xd3, 0x18, 0xcd, 0x48, 0x48, 0x17, 0x2a, 0xe3, + 0xa1, 0xd5, 0xc2, 0xe3, 0xab, 0x8c, 0x87, 0x22, 0xbc, 0x9c, 0x39, 0xe1, 0x30, 0x78, 0xef, 0x0b, 0x54, 0xc9, 0xdc, 0x74, 0x7b, 0x78, 0x73, 0xf6, 0xa4, 0x0f, 0x46, 0xb4, 0x74, 0x7c, 0xab, 0x83, 0x91, 0x38, 0x2c, 0xfa, 0x4d, 0x96, 0x8e, 0x4f, 0xd1, 0x82, 0x8c, 0x61, 0x3f, 0xd9, 0xc9, 0x84, 0x3b, 0x7c, 0x15, 0x59, 0x5d, 0x4c, 0x51, 0x8f, 0x8b, 0x4e, 0xa3, 0xbc, 0x19, 0x2d, 0xfa, 0x95, 0x95, 0x81, 0xfd, 0xed, 0xcb, 0x80, 0xb9, 0x75, 0x19, 0xb8, 0xb7, 0x4b, 0x19, 0x20, 0xbb, 0x96, - 0x81, 0x83, 0x5d, 0xcb, 0xc0, 0xe1, 0xe6, 0x32, 0xf0, 0x16, 0x0c, 0x11, 0x6a, 0x72, 0x08, 0xd5, - 0x88, 0x3b, 0x21, 0xc7, 0x1b, 0xaa, 0x53, 0xd9, 0x21, 0x26, 0xe8, 0xcc, 0x97, 0x97, 0x52, 0xa7, - 0xa2, 0x49, 0x1e, 0x42, 0x13, 0x55, 0xa7, 0x57, 0x4e, 0x88, 0xb9, 0x5b, 0xa7, 0xa9, 0x80, 0x58, - 0x50, 0x67, 0xfe, 0x25, 0xea, 0x0c, 0xd4, 0xc5, 0x5d, 0xfb, 0x77, 0x60, 0x6d, 0xca, 0xa9, 0xb9, - 0xac, 0xae, 0xed, 0x96, 0xd5, 0x8f, 0xa0, 0x83, 0x89, 0x91, 0x06, 0xd7, 0x63, 0xff, 0x92, 0xdd, - 0xe0, 0x52, 0xab, 0x34, 0x2f, 0xb4, 0xff, 0xa8, 0xc7, 0x74, 0x4a, 0x14, 0x9f, 0x47, 0x00, 0x8e, + 0x81, 0x83, 0x5d, 0xcb, 0xc0, 0xe1, 0xe6, 0x32, 0x70, 0x05, 0x86, 0x08, 0x35, 0x39, 0x84, 0x6a, + 0xc4, 0x9d, 0x90, 0xe3, 0x0d, 0xd5, 0xa9, 0xec, 0x10, 0x13, 0x74, 0xe6, 0xcb, 0x4b, 0xa9, 0x53, + 0xd1, 0x24, 0x0f, 0xa1, 0x89, 0xaa, 0xd3, 0x6b, 0x27, 0xc4, 0xdc, 0xad, 0xd3, 0x54, 0x40, 0x2c, + 0xa8, 0x33, 0xff, 0x12, 0x75, 0x06, 0xea, 0xe2, 0xae, 0xfd, 0x07, 0xb0, 0x36, 0xe5, 0xd4, 0x5c, + 0x56, 0xd7, 0x76, 0xcb, 0xea, 0x47, 0xd0, 0xc1, 0xc4, 0x48, 0x83, 0xf7, 0x63, 0xff, 0x92, 0xdd, + 0xe0, 0x52, 0xab, 0x34, 0x2f, 0xb4, 0xff, 0xac, 0xc7, 0x74, 0x4a, 0x14, 0x9f, 0x47, 0x00, 0x8e, 0xcb, 0x57, 0xce, 0x7c, 0xca, 0x6e, 0xb8, 0xca, 0x48, 0x19, 0x89, 0xd0, 0x2f, 0x9d, 0x30, 0x62, - 0x97, 0xa8, 0xaf, 0x48, 0x7d, 0x2a, 0x21, 0xcf, 0xa1, 0xf9, 0x36, 0x74, 0x66, 0x22, 0x7f, 0xc6, - 0x19, 0xc9, 0x2a, 0xae, 0xf7, 0x4c, 0x19, 0xd0, 0xd4, 0x54, 0x54, 0x20, 0x51, 0xfc, 0x12, 0x90, - 0x52, 0x16, 0xad, 0xe6, 0x5c, 0xd5, 0xb1, 0xfe, 0xc6, 0x92, 0x59, 0xb0, 0xa7, 0x65, 0x83, 0x94, - 0x01, 0xbb, 0xba, 0x3d, 0xb0, 0x6b, 0x1b, 0x80, 0x5d, 0x0e, 0xbf, 0xfa, 0xae, 0xf0, 0x6b, 0x6c, - 0x86, 0xdf, 0xbf, 0x34, 0x68, 0x67, 0x4b, 0x3d, 0xf9, 0x29, 0xb4, 0x54, 0xb1, 0x17, 0x7b, 0x57, - 0x70, 0xb8, 0x85, 0x4f, 0x64, 0xad, 0x05, 0x0d, 0x8e, 0x30, 0x19, 0xdd, 0x4d, 0x83, 0xd1, 0x8e, - 0xfc, 0x06, 0xee, 0x2b, 0xff, 0xe2, 0xa9, 0xe8, 0x3b, 0x9e, 0xca, 0x86, 0x71, 0xec, 0xc7, 0x0a, - 0x79, 0xa2, 0x48, 0x26, 0xc9, 0x5b, 0x4b, 0x93, 0xb7, 0xfd, 0x0f, 0x0d, 0x1a, 0x31, 0x5a, 0xc8, - 0x18, 0xda, 0x31, 0x5e, 0x32, 0x54, 0xec, 0xa3, 0x4d, 0xe8, 0x4a, 0x1a, 0xc8, 0xc6, 0x72, 0xae, - 0x38, 0x57, 0x8a, 0x5f, 0x6c, 0x93, 0xcf, 0xa0, 0xb9, 0x74, 0x42, 0x67, 0xc1, 0x38, 0x0b, 0xd5, - 0x0e, 0xd7, 0x63, 0x14, 0x1b, 0xd0, 0xd4, 0xd6, 0xfe, 0x18, 0xda, 0xd9, 0xa9, 0xb0, 0xea, 0xb3, - 0x1b, 0x6e, 0xee, 0x91, 0x0e, 0x34, 0x13, 0x0f, 0x53, 0xb3, 0xff, 0x50, 0xc9, 0xf4, 0xc9, 0x97, - 0xd0, 0x49, 0xc6, 0xc8, 0xec, 0xe7, 0xe3, 0x8d, 0x73, 0xa6, 0x2d, 0xdc, 0x51, 0xde, 0x5b, 0xe4, - 0xa8, 0xf7, 0xce, 0x7c, 0xc5, 0xd4, 0x9e, 0x64, 0x47, 0x6c, 0xd4, 0x17, 0xcf, 0x00, 0x5d, 0x6e, - 0x54, 0xb4, 0x53, 0x62, 0x65, 0x6c, 0x49, 0xac, 0xec, 0xaf, 0xa0, 0x93, 0x9b, 0x9b, 0x00, 0xd4, - 0x44, 0xd1, 0xf0, 0x5c, 0x49, 0x98, 0x86, 0xdf, 0xfa, 0xce, 0xc2, 0x73, 0x4d, 0x8d, 0x10, 0xe8, - 0x8a, 0x57, 0x99, 0xe7, 0xcc, 0xbf, 0x9e, 0xf0, 0xd0, 0xf3, 0x67, 0x66, 0x85, 0xdc, 0x83, 0x4e, - 0x2c, 0x93, 0xc4, 0x48, 0x4f, 0x39, 0x92, 0x61, 0xdb, 0x09, 0xc6, 0x25, 0xed, 0x8b, 0x8f, 0x46, - 0x4b, 0x8f, 0xc6, 0xbe, 0x01, 0x48, 0x17, 0x45, 0x3e, 0x83, 0xfa, 0x15, 0x73, 0x2e, 0x59, 0x18, - 0xdd, 0x9a, 0x10, 0xa7, 0x2a, 0xcb, 0xd1, 0xd8, 0x9a, 0xfc, 0x08, 0x8c, 0x30, 0xb8, 0x8e, 0x2f, + 0x97, 0xa8, 0xaf, 0x48, 0x7d, 0x2a, 0x21, 0xcf, 0xa1, 0x79, 0x15, 0x3a, 0x33, 0x91, 0x3f, 0xe3, + 0x8c, 0x64, 0x15, 0xd7, 0x7b, 0xa6, 0x0c, 0x68, 0x6a, 0x2a, 0x2a, 0x90, 0x28, 0x7e, 0x09, 0x48, + 0x29, 0x8b, 0x56, 0x73, 0xae, 0xea, 0x58, 0x7f, 0x63, 0xc9, 0x2c, 0xd8, 0xd3, 0xb2, 0x41, 0xca, + 0x80, 0x5d, 0xdd, 0x1e, 0xd8, 0xb5, 0x0d, 0xc0, 0x2e, 0x87, 0x5f, 0x7d, 0x57, 0xf8, 0x35, 0x36, + 0xc3, 0xef, 0xdf, 0x1a, 0xb4, 0xb3, 0xa5, 0x9e, 0xfc, 0x1c, 0x5a, 0xaa, 0xd8, 0x8b, 0xbd, 0x2b, + 0x38, 0xdc, 0xc2, 0x27, 0xb2, 0xd6, 0x82, 0x06, 0x47, 0x98, 0x8c, 0xee, 0xa6, 0xc1, 0x68, 0x47, + 0x7e, 0x07, 0xf7, 0x95, 0x7f, 0xf1, 0x54, 0xf4, 0x1d, 0x4f, 0x65, 0xc3, 0x38, 0xf6, 0x63, 0x85, + 0x3c, 0x51, 0x24, 0x93, 0xe4, 0xad, 0xa5, 0xc9, 0xdb, 0xfe, 0x97, 0x06, 0x8d, 0x18, 0x2d, 0x64, + 0x0c, 0xed, 0x18, 0x2f, 0x19, 0x2a, 0xf6, 0xd1, 0x26, 0x74, 0x25, 0x0d, 0x64, 0x63, 0x39, 0x57, + 0x9c, 0x2b, 0xc5, 0x2f, 0xb6, 0xc9, 0x67, 0xd0, 0x5c, 0x3a, 0xa1, 0xb3, 0x60, 0x9c, 0x85, 0x6a, + 0x87, 0xeb, 0x31, 0x8a, 0x0d, 0x68, 0x6a, 0x6b, 0x7f, 0x0c, 0xed, 0xec, 0x54, 0x58, 0xf5, 0xd9, + 0x0d, 0x37, 0xf7, 0x48, 0x07, 0x9a, 0x89, 0x87, 0xa9, 0xd9, 0x7f, 0xaa, 0x64, 0xfa, 0xe4, 0x4b, + 0xe8, 0x24, 0x63, 0x64, 0xf6, 0xf3, 0xf1, 0xc6, 0x39, 0xd3, 0x16, 0xee, 0x28, 0xef, 0x2d, 0x72, + 0xd4, 0x3b, 0x67, 0xbe, 0x62, 0x6a, 0x4f, 0xb2, 0x23, 0x36, 0xea, 0x8b, 0x67, 0x80, 0x2e, 0x37, + 0x2a, 0xda, 0x29, 0xb1, 0x32, 0xb6, 0x24, 0x56, 0xf6, 0x57, 0xd0, 0xc9, 0xcd, 0x4d, 0x00, 0x6a, + 0xa2, 0x68, 0x78, 0xae, 0x24, 0x4c, 0xc3, 0x6f, 0x7d, 0x67, 0xe1, 0xb9, 0xa6, 0x46, 0x08, 0x74, + 0xc5, 0xab, 0xcc, 0x73, 0xe6, 0x5f, 0x4f, 0x78, 0xe8, 0xf9, 0x33, 0xb3, 0x42, 0xee, 0x41, 0x27, + 0x96, 0x49, 0x62, 0xa4, 0xa7, 0x1c, 0xc9, 0xb0, 0xed, 0x04, 0xe3, 0x92, 0xf6, 0xc5, 0x47, 0xa3, + 0xa5, 0x47, 0x63, 0xdf, 0x00, 0xa4, 0x8b, 0x22, 0x9f, 0x41, 0xfd, 0x9a, 0x39, 0x97, 0x2c, 0x8c, + 0x6e, 0x4d, 0x88, 0x53, 0x95, 0xe5, 0x68, 0x6c, 0x4d, 0x7e, 0x02, 0x46, 0x18, 0xbc, 0x8f, 0x2f, 0xc0, 0x1d, 0x5e, 0x68, 0x6a, 0x7f, 0xa4, 0x68, 0x5b, 0x2c, 0x16, 0x61, 0x76, 0xd9, 0x7c, 0x1e, - 0xc3, 0x54, 0x76, 0xec, 0xbf, 0x56, 0x54, 0x06, 0x2f, 0x41, 0x3f, 0x39, 0xcf, 0x94, 0x68, 0x75, - 0x81, 0xe4, 0xba, 0x8f, 0x4a, 0x57, 0x50, 0xbc, 0x3c, 0x45, 0xe7, 0x12, 0xee, 0x55, 0xf9, 0xdf, - 0x71, 0x2f, 0xfd, 0xbf, 0xe5, 0x5e, 0x56, 0xca, 0xa0, 0x0c, 0x7c, 0x2e, 0x27, 0xec, 0xe9, 0x08, + 0xc3, 0x54, 0x76, 0xec, 0xbf, 0x57, 0x54, 0x06, 0x2f, 0x41, 0x3f, 0x39, 0xcf, 0x94, 0x68, 0x75, + 0x81, 0xe4, 0xba, 0x8f, 0x4a, 0x57, 0x50, 0xbc, 0x3c, 0x45, 0xe7, 0x12, 0xee, 0x55, 0xf9, 0xff, + 0x71, 0x2f, 0xfd, 0x7f, 0xe5, 0x5e, 0x56, 0xca, 0xa0, 0x0c, 0x7c, 0x2e, 0x27, 0xec, 0xe9, 0x08, 0x3a, 0xaa, 0x49, 0x99, 0x13, 0x05, 0x3e, 0x52, 0xc5, 0x26, 0xcd, 0x0b, 0xed, 0x0f, 0x3a, 0x1c, 0x96, 0xed, 0x9f, 0xdc, 0x4f, 0xe8, 0xaf, 0x86, 0xe3, 0xc6, 0xd4, 0xf7, 0x09, 0x98, 0x21, 0x73, - 0x83, 0xf7, 0x2c, 0x14, 0x67, 0x83, 0x4c, 0x4c, 0x12, 0x64, 0xba, 0x26, 0x27, 0x36, 0xb4, 0x99, - 0x68, 0xc4, 0xac, 0x42, 0x5e, 0x87, 0x9c, 0x0c, 0x49, 0x1e, 0x77, 0xdc, 0x77, 0xd3, 0xd0, 0x71, - 0xe5, 0xdd, 0x10, 0x24, 0x2f, 0x91, 0x10, 0x1b, 0x20, 0xc2, 0xe4, 0x3c, 0xb9, 0x0a, 0x38, 0xee, + 0x83, 0x77, 0x2c, 0x14, 0x67, 0x83, 0x4c, 0x4c, 0x12, 0x64, 0xba, 0x26, 0x27, 0x36, 0xb4, 0x99, + 0x68, 0xc4, 0xac, 0x42, 0x5e, 0x87, 0x9c, 0x0c, 0x49, 0x1e, 0x77, 0xdc, 0xb7, 0xd3, 0xd0, 0x71, + 0xe5, 0xdd, 0x10, 0x24, 0x2f, 0x91, 0x10, 0x1b, 0x20, 0xc2, 0xe4, 0x3c, 0xb9, 0x0e, 0x38, 0xee, 0xa1, 0x8d, 0xbc, 0x24, 0x23, 0x5d, 0x27, 0x9b, 0xb5, 0x32, 0xb2, 0x69, 0x41, 0x5d, 0x05, 0x56, 0x31, 0xd5, 0xb8, 0x4b, 0x5e, 0x42, 0x13, 0xd7, 0x84, 0xf9, 0xa0, 0x81, 0xf9, 0x60, 0xb0, 0x0d, - 0x48, 0x06, 0xa3, 0xd8, 0x8b, 0xa6, 0x03, 0x88, 0x08, 0xc9, 0x58, 0xa5, 0x45, 0x05, 0xd9, 0x6d, - 0x9b, 0xae, 0xc9, 0xf1, 0x1b, 0x25, 0x53, 0x95, 0x00, 0xab, 0x52, 0x56, 0x64, 0x3f, 0x85, 0x66, - 0x32, 0x8b, 0xc8, 0x6c, 0x27, 0x93, 0xc9, 0x88, 0x4e, 0xc7, 0xaf, 0xce, 0xcd, 0x3d, 0x62, 0x42, - 0xfb, 0xf5, 0x88, 0x8e, 0xcf, 0xc6, 0xa7, 0x27, 0x28, 0xd1, 0xec, 0x0f, 0x1a, 0x98, 0x45, 0xd0, - 0x14, 0x42, 0xac, 0x95, 0x84, 0x38, 0x7f, 0x4c, 0x95, 0x92, 0x63, 0xca, 0x1f, 0x83, 0xbe, 0xe9, - 0x18, 0xf2, 0xc4, 0xc7, 0x28, 0x21, 0x3e, 0xa5, 0xe1, 0xa9, 0x96, 0x87, 0xc7, 0xfe, 0x73, 0x4d, - 0x6d, 0x67, 0xb2, 0xf2, 0x38, 0x53, 0xc8, 0x3c, 0x91, 0x5f, 0x4f, 0xb2, 0x27, 0x33, 0x42, 0x6b, - 0x9d, 0x77, 0x27, 0x5f, 0x55, 0xea, 0x3e, 0x67, 0x7d, 0xfe, 0x4f, 0xef, 0x72, 0x7a, 0xe5, 0x8c, - 0xe2, 0x95, 0x13, 0x8b, 0x8f, 0xce, 0xb0, 0x7b, 0x1a, 0xac, 0x7c, 0x19, 0xb1, 0x2a, 0x5d, 0x93, - 0x6f, 0x79, 0x15, 0x04, 0xec, 0x56, 0xae, 0xcb, 0xa2, 0x88, 0x3a, 0x5c, 0x3e, 0xf5, 0x2b, 0x34, - 0x2b, 0x12, 0x16, 0xcc, 0x7f, 0xef, 0x85, 0x81, 0x8f, 0x5f, 0x08, 0x0d, 0xf9, 0xbf, 0x97, 0x11, - 0x25, 0xc4, 0xa1, 0xa9, 0x2a, 0x86, 0x20, 0x13, 0x3d, 0x68, 0x2d, 0xc3, 0xe0, 0x1b, 0xe6, 0x72, - 0xfc, 0x05, 0x03, 0xe9, 0x95, 0x11, 0x09, 0xae, 0xce, 0xbd, 0x05, 0x8b, 0xb8, 0xb3, 0x58, 0xaa, - 0xa7, 0x5b, 0x2a, 0x20, 0x4f, 0xe1, 0x1e, 0xee, 0x68, 0x22, 0x73, 0x94, 0xdc, 0x6a, 0x1b, 0xb7, - 0xba, 0xae, 0x28, 0x23, 0x98, 0x9d, 0xed, 0x09, 0x66, 0x77, 0xeb, 0x97, 0xd3, 0xfe, 0x2e, 0x2f, - 0x27, 0x73, 0xd7, 0x97, 0xd3, 0xbd, 0x5d, 0xa9, 0x2b, 0xd9, 0x4c, 0x5d, 0xff, 0xa6, 0xc3, 0x7e, - 0x01, 0xf8, 0x48, 0xb0, 0x62, 0xd1, 0xed, 0xdc, 0x55, 0xf8, 0xa4, 0xb6, 0x58, 0x40, 0xd4, 0x9b, - 0x46, 0x1e, 0x84, 0x7a, 0xc7, 0xe4, 0x84, 0x62, 0x91, 0xb1, 0x20, 0x8b, 0x4f, 0x1d, 0x6d, 0xcb, - 0x54, 0x1b, 0x61, 0xfe, 0x0c, 0x0e, 0x64, 0x6b, 0xe8, 0x70, 0x27, 0xae, 0xfc, 0xf2, 0xcd, 0x50, - 0xa5, 0x65, 0xaa, 0xed, 0xf3, 0x7e, 0x5c, 0x22, 0xeb, 0xf9, 0x12, 0x79, 0x0c, 0x87, 0xf1, 0x02, - 0x73, 0x88, 0x6b, 0xe0, 0xe2, 0x4b, 0x75, 0xe8, 0x23, 0xfb, 0xf9, 0x65, 0x36, 0x71, 0x99, 0xa5, - 0x3a, 0xf2, 0x09, 0xd4, 0x58, 0xfa, 0x89, 0xd1, 0x3a, 0xfe, 0xce, 0xda, 0x27, 0x81, 0xd0, 0x52, - 0x65, 0x64, 0xff, 0x5d, 0x83, 0xaa, 0x2c, 0xa0, 0x9f, 0x82, 0xc1, 0x53, 0x8e, 0xfa, 0xb8, 0xd4, - 0x2d, 0x53, 0x84, 0xd0, 0x38, 0xfe, 0x87, 0x46, 0x02, 0x5a, 0x49, 0xff, 0xa1, 0x91, 0x84, 0x3e, - 0x02, 0x98, 0x7b, 0x3e, 0x3b, 0x5f, 0x2d, 0xde, 0x28, 0xba, 0x5d, 0xa5, 0x19, 0x49, 0xb6, 0x46, - 0xca, 0x52, 0x1c, 0x77, 0xed, 0xe3, 0x6c, 0x1d, 0xda, 0x87, 0xd6, 0xc5, 0x09, 0x9d, 0x8c, 0xbe, - 0x1e, 0x51, 0xfa, 0x8a, 0x9a, 0x7b, 0xe4, 0x10, 0xcc, 0xd7, 0x27, 0x2f, 0xc7, 0x43, 0xac, 0x43, - 0x4a, 0xaa, 0xd9, 0xbf, 0xd7, 0xa0, 0x9b, 0xf0, 0xb3, 0xd7, 0xc8, 0x8c, 0xf1, 0xad, 0xae, 0x3a, - 0xaa, 0x14, 0xa5, 0x02, 0xf2, 0x1c, 0xee, 0x27, 0xf4, 0xda, 0xfb, 0x2d, 0xbb, 0x4c, 0xfc, 0xd4, - 0x46, 0x36, 0x68, 0xd5, 0xf3, 0x58, 0x6a, 0xe4, 0xfb, 0x57, 0x3e, 0x8f, 0x95, 0xe4, 0xc9, 0x17, - 0xb0, 0x5f, 0xf8, 0x87, 0x11, 0x5b, 0x38, 0x7f, 0x35, 0x1d, 0xfd, 0x7a, 0x74, 0xfa, 0xab, 0xe9, - 0x68, 0x68, 0xee, 0x09, 0x72, 0x7d, 0x21, 0x8a, 0xeb, 0xd0, 0xd4, 0x44, 0xfb, 0xec, 0x64, 0xfc, - 0x72, 0x34, 0x34, 0x2b, 0x82, 0x68, 0x4f, 0x7e, 0x39, 0xbe, 0xb8, 0x18, 0x0d, 0x4d, 0xfd, 0xf3, - 0x1f, 0x88, 0xc7, 0xd9, 0x62, 0xc0, 0xaf, 0x82, 0xd5, 0xec, 0x8a, 0x5f, 0x07, 0xe1, 0xbb, 0x48, - 0x1e, 0xca, 0x9f, 0x2a, 0xdd, 0x2f, 0xf0, 0x70, 0xe2, 0x3c, 0xf2, 0xa6, 0x86, 0x37, 0xe9, 0xd3, - 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x56, 0xbb, 0xed, 0xde, 0x54, 0x19, 0x00, 0x00, + 0x48, 0x06, 0xa3, 0xd8, 0x8b, 0xa6, 0x03, 0x90, 0xa7, 0x70, 0xef, 0x4a, 0x9e, 0x4e, 0x5a, 0x55, + 0x90, 0xde, 0xb6, 0xe9, 0xba, 0x02, 0x3f, 0x52, 0x32, 0x75, 0x09, 0xb0, 0x2e, 0x65, 0x45, 0xf6, + 0x53, 0x68, 0x26, 0xf3, 0x88, 0xdc, 0x76, 0x32, 0x99, 0x8c, 0xe8, 0x74, 0xfc, 0xea, 0xdc, 0xdc, + 0x23, 0x26, 0xb4, 0x5f, 0x8f, 0xe8, 0xf8, 0x6c, 0x7c, 0x7a, 0x82, 0x12, 0xcd, 0xfe, 0xa0, 0x81, + 0x59, 0x84, 0x4d, 0x21, 0xc8, 0x5a, 0x49, 0x90, 0xf3, 0x07, 0x55, 0x29, 0x39, 0xa8, 0xfc, 0x41, + 0xe8, 0x9b, 0x0e, 0x22, 0x4f, 0x7d, 0x8c, 0x12, 0xea, 0x53, 0x1e, 0xa0, 0xea, 0x86, 0x00, 0xd9, + 0x7f, 0xad, 0xa9, 0x0d, 0x4d, 0x56, 0x1e, 0x67, 0x0a, 0x9d, 0x27, 0xf2, 0xfb, 0x49, 0xf6, 0x64, + 0x56, 0x68, 0xad, 0x73, 0xef, 0xe4, 0xbb, 0x4a, 0xdd, 0xe9, 0xac, 0xcf, 0x77, 0xf4, 0x3e, 0xa7, + 0xd7, 0xce, 0x28, 0x5e, 0x3b, 0xb1, 0xf8, 0xe8, 0x0c, 0xbb, 0xa7, 0xc1, 0xca, 0x97, 0x21, 0xab, + 0xd2, 0x35, 0xf9, 0x96, 0xd7, 0x41, 0x00, 0x6f, 0xe5, 0xba, 0x2c, 0x8a, 0xa8, 0xc3, 0xe5, 0x73, + 0xbf, 0x42, 0xb3, 0x22, 0x61, 0xc1, 0xfc, 0x77, 0x5e, 0x18, 0xf8, 0xf8, 0x8d, 0xd0, 0x90, 0x7f, + 0x7c, 0x19, 0x51, 0x42, 0x1e, 0x9a, 0xaa, 0x6a, 0x08, 0x42, 0xd1, 0x83, 0xd6, 0x32, 0x0c, 0xbe, + 0x61, 0x2e, 0xc7, 0x9f, 0x30, 0x90, 0x5e, 0x19, 0x91, 0xe0, 0xeb, 0xdc, 0x5b, 0xb0, 0x88, 0x3b, + 0x8b, 0xa5, 0x7a, 0xbe, 0xa5, 0x02, 0x81, 0x0e, 0xdc, 0xd1, 0x44, 0xe6, 0x29, 0xb9, 0xd5, 0x36, + 0x6e, 0x75, 0x5d, 0x51, 0x46, 0x32, 0x3b, 0xdb, 0x93, 0xcc, 0xee, 0xd6, 0xaf, 0xa7, 0xfd, 0x5d, + 0x5e, 0x4f, 0xe6, 0xae, 0xaf, 0xa7, 0x7b, 0xbb, 0xd2, 0x57, 0xb2, 0x99, 0xbe, 0xfe, 0x43, 0x87, + 0xfd, 0x02, 0xf0, 0x91, 0x64, 0xc5, 0xa2, 0xdb, 0xf9, 0xab, 0xf0, 0x49, 0x6d, 0xb1, 0x88, 0xa8, + 0x77, 0x8d, 0x3c, 0x08, 0xf5, 0x96, 0xc9, 0x09, 0xc5, 0x22, 0x63, 0x41, 0x16, 0x9f, 0x3a, 0xda, + 0x96, 0xa9, 0x36, 0xc2, 0xfc, 0x19, 0x1c, 0xc8, 0xd6, 0xd0, 0xe1, 0x4e, 0x5c, 0xfd, 0xe5, 0xbb, + 0xa1, 0x4a, 0xcb, 0x54, 0xdb, 0xe7, 0xfe, 0xb8, 0x4c, 0xd6, 0xf3, 0x65, 0xf2, 0x18, 0x0e, 0xe3, + 0x05, 0xe6, 0x10, 0xd7, 0xc0, 0xc5, 0x97, 0xea, 0xd0, 0x47, 0xf6, 0xf3, 0xcb, 0x6c, 0xe2, 0x32, + 0x4b, 0x75, 0xe4, 0x13, 0xa8, 0xb1, 0xf4, 0x23, 0xa3, 0x75, 0xfc, 0xbd, 0xb5, 0x8f, 0x02, 0xa1, + 0xa5, 0xca, 0xc8, 0xfe, 0xa7, 0x06, 0x55, 0x59, 0x44, 0x3f, 0x05, 0x83, 0xa7, 0x3c, 0xf5, 0x71, + 0xa9, 0x5b, 0xa6, 0x10, 0xa1, 0x71, 0xfc, 0x17, 0x8d, 0x24, 0xb4, 0x92, 0xfe, 0x45, 0x23, 0x11, + 0x7d, 0x04, 0x30, 0xf7, 0x7c, 0x76, 0xbe, 0x5a, 0xbc, 0x51, 0x94, 0xbb, 0x4a, 0x33, 0x92, 0x6c, + 0x9d, 0x94, 0xe5, 0x38, 0xee, 0xda, 0xc7, 0xd9, 0x4a, 0xb4, 0x0f, 0xad, 0x8b, 0x13, 0x3a, 0x19, + 0x7d, 0x3d, 0xa2, 0xf4, 0x15, 0x35, 0xf7, 0xc8, 0x21, 0x98, 0xaf, 0x4f, 0x5e, 0x8e, 0x87, 0x58, + 0x89, 0x94, 0x54, 0xb3, 0xff, 0xa8, 0x41, 0x37, 0xe1, 0x68, 0xaf, 0x91, 0x1d, 0xe3, 0x7b, 0x5d, + 0x75, 0x54, 0x31, 0x4a, 0x05, 0xe4, 0x39, 0xdc, 0x4f, 0x28, 0xb6, 0xf7, 0x7b, 0x76, 0x99, 0xf8, + 0xa9, 0x8d, 0x6c, 0xd0, 0xaa, 0x27, 0xb2, 0xd4, 0xc8, 0x37, 0xb0, 0x7c, 0x22, 0x2b, 0xc9, 0x93, + 0x2f, 0x60, 0xbf, 0xf0, 0x17, 0x23, 0xb6, 0x70, 0xfe, 0x6a, 0x3a, 0xfa, 0xed, 0xe8, 0xf4, 0x37, + 0xd3, 0xd1, 0xd0, 0xdc, 0x13, 0x04, 0xfb, 0x42, 0x94, 0xd7, 0xa1, 0xa9, 0x89, 0xf6, 0xd9, 0xc9, + 0xf8, 0xe5, 0x68, 0x68, 0x56, 0x04, 0xd9, 0x9e, 0xfc, 0x7a, 0x7c, 0x71, 0x31, 0x1a, 0x9a, 0xfa, + 0xe7, 0x3f, 0x12, 0x0f, 0xb4, 0xc5, 0x80, 0x5f, 0x07, 0xab, 0xd9, 0x35, 0x7f, 0x1f, 0x84, 0x6f, + 0x23, 0x79, 0x28, 0x7f, 0xa9, 0x74, 0xbf, 0xc0, 0xc3, 0x89, 0xf3, 0xc8, 0x9b, 0x1a, 0xde, 0xa4, + 0x4f, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x06, 0x49, 0x75, 0x8d, 0x58, 0x19, 0x00, 0x00, } diff --git a/generator/_testdata/dummyReportTheme/views/partials.tmpl b/generator/_testdata/dummyReportTheme/views/partials.tmpl index 256f608..56299aa 100644 --- a/generator/_testdata/dummyReportTheme/views/partials.tmpl +++ b/generator/_testdata/dummyReportTheme/views/partials.tmpl @@ -162,11 +162,11 @@
{{.StackTrace | escapeHTML | encodeNewLine}}
{{.StackTrace | escapeHTML | encodeNewLine}}- {{ if .FailedScreenshot}} + {{ if .FailureScreenshot}} diff --git a/generator/generate.go b/generator/generate.go index d269c0e..9d9ad28 100644 --- a/generator/generate.go +++ b/generator/generate.go @@ -181,7 +181,7 @@ func (s *step) Kind() tokenKind { type result struct { Status status `json:"Status"` StackTrace string `json:"StackTrace"` - FailedScreenshot string `json:"Screenshot"` + FailureScreenshot string `json:"Screenshot"` ErrorMessage string `json:"ErrorMessage"` ExecutionTime string `json:"ExecutionTime"` SkippedReason string `json:"SkippedReason"` @@ -193,7 +193,7 @@ type result struct { type hookFailure struct { HookName string `json:"HookName"` ErrMsg string `json:"ErrMsg"` - FailedScreenshot string `json:"Screenshot"` + FailureScreenshot string `json:"Screenshot"` StackTrace string `json:"StackTrace"` TableRowIndex int32 `json:"TableRowIndex"` } diff --git a/generator/generate_test.go b/generator/generate_test.go index e86ff51..487ae3b 100644 --- a/generator/generate_test.go +++ b/generator/generate_test.go @@ -542,7 +542,7 @@ func newHookFailure(name, errMsg, screenshot, stacktrace string) *hookFailure { return &hookFailure{ HookName: name, ErrMsg: errMsg, - FailedScreenshot: screenshot, + FailureScreenshot: screenshot, StackTrace: stacktrace, } } diff --git a/generator/integration_test.go b/generator/integration_test.go index ee1db7d..2ee17ba 100644 --- a/generator/integration_test.go +++ b/generator/integration_test.go @@ -145,7 +145,7 @@ var scenarioWithAfterHookFail = &gm.ProtoScenario{ PostHookFailure: &gm.ProtoHookFailure{ ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), }, } @@ -159,7 +159,7 @@ var scenarioWithBeforeHookFail = &gm.ProtoScenario{ PreHookFailure: &gm.ProtoHookFailure{ ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), }, } @@ -173,12 +173,12 @@ var scenarioWithBeforeAndAfterHookFail = &gm.ProtoScenario{ PreHookFailure: &gm.ProtoHookFailure{ ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), }, PostHookFailure: &gm.ProtoHookFailure{ ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), }, } @@ -207,7 +207,7 @@ var stepWithBeforeHookFail = &gm.ProtoItem{ PreHookFailure: &gm.ProtoHookFailure{ ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), }, }, Fragments: []*gm.Fragment{newTextFragment("This is a failing step")}, @@ -225,7 +225,7 @@ var stepWithAfterHookFail = &gm.ProtoItem{ PostHookFailure: &gm.ProtoHookFailure{ ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), }, }, Fragments: []*gm.Fragment{newTextFragment("This is a failing step")}, @@ -243,12 +243,12 @@ var stepWithBeforeAndAfterHookFail = &gm.ProtoItem{ PreHookFailure: &gm.ProtoHookFailure{ ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), }, PostHookFailure: &gm.ProtoHookFailure{ ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), }, }, Fragments: []*gm.Fragment{newTextFragment("This is a failing step")}, @@ -264,7 +264,7 @@ var failedStep = &gm.ProtoItem{ ExecutionTime: 211316, ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), }, }, Fragments: []*gm.Fragment{newTextFragment("This is a failing step")}, @@ -568,7 +568,7 @@ var failSpecResWithAfterSpecFailure = &gm.ProtoSpecResult{ PostHookFailures: []*gm.ProtoHookFailure{{ ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), }}, }, } @@ -602,7 +602,7 @@ var failSpecResWithBeforeSpecFailure = &gm.ProtoSpecResult{ PreHookFailures: []*gm.ProtoHookFailure{{ ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), }}, }, } @@ -648,7 +648,7 @@ var failSpecResWithBeforeSpecFailureWithTableDriven = &gm.ProtoSpecResult{ PreHookFailures: []*gm.ProtoHookFailure{ {ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), TableRowIndex: int32(1)}, }, }, @@ -693,7 +693,7 @@ var failSpecResWithAfterSpecFailureWithTableDriven = &gm.ProtoSpecResult{ }, }, PostHookFailures: []*gm.ProtoHookFailure{ - {ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), FailedScreenshot: []byte(newScreenshot()), TableRowIndex: int32(0)}, + {ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), FailureScreenshot: []byte(newScreenshot()), TableRowIndex: int32(0)}, }, }, } @@ -726,12 +726,12 @@ var failSpecResWithBeforeAfterSpecFailure = &gm.ProtoSpecResult{ PreHookFailures: []*gm.ProtoHookFailure{{ ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), }}, PostHookFailures: []*gm.ProtoHookFailure{{ ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), }}, }, } @@ -786,7 +786,7 @@ func newProtoHookFailure() *gm.ProtoHookFailure { return &gm.ProtoHookFailure{ ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), } } diff --git a/generator/transform.go b/generator/transform.go index 68b1d32..65258f0 100644 --- a/generator/transform.go +++ b/generator/transform.go @@ -172,7 +172,7 @@ func toHookFailure(failure *gm.ProtoHookFailure, hookName string) *hookFailure { HookName: hookName, StackTrace: failure.GetStackTrace(), TableRowIndex: failure.TableRowIndex, - FailedScreenshot: base64.StdEncoding.EncodeToString(failure.GetFailedScreenshot()), + FailureScreenshot: base64.StdEncoding.EncodeToString(failure.GetFailureScreenshot()), } return result } @@ -461,7 +461,7 @@ func toStep(protoStep *gm.ProtoStep) *step { ErrorMessage: res.GetErrorMessage(), ExecutionTime: formatTime(res.GetExecutionTime()), Messages: res.GetMessage(), - FailedScreenshot: base64.StdEncoding.EncodeToString(res.GetFailedScreenshot()), + FailureScreenshot: base64.StdEncoding.EncodeToString(res.GetFailureScreenshot()), } for _, s := range res.GetScreenshots() { result.Screenshots = append(result.Screenshots, base64.StdEncoding.EncodeToString(s)) diff --git a/generator/transform_test.go b/generator/transform_test.go index 2897de9..4162aa1 100644 --- a/generator/transform_test.go +++ b/generator/transform_test.go @@ -286,12 +286,12 @@ var specResWithSpecHookFailure = &gm.ProtoSpecResult{ PreHookFailures: []*gm.ProtoHookFailure{{ ErrorMessage: "err", StackTrace: "Stacktrace", - FailedScreenshot: []byte("Screenshot"), + FailureScreenshot: []byte("Screenshot"), }}, PostHookFailures: []*gm.ProtoHookFailure{{ ErrorMessage: "err", StackTrace: "Stacktrace", - FailedScreenshot: []byte("Screenshot"), + FailureScreenshot: []byte("Screenshot"), }}, }, } @@ -365,12 +365,12 @@ var scnWithHookFailure = &gm.ProtoScenario{ PreHookFailure: &gm.ProtoHookFailure{ ErrorMessage: "err", StackTrace: "Stacktrace", - FailedScreenshot: []byte("Screenshot"), + FailureScreenshot: []byte("Screenshot"), }, PostHookFailure: &gm.ProtoHookFailure{ ErrorMessage: "err", StackTrace: "Stacktrace", - FailedScreenshot: []byte("Screenshot"), + FailureScreenshot: []byte("Screenshot"), }, } @@ -510,7 +510,7 @@ var protoStepWithAfterHookFailure = &gm.ProtoStep{ PostHookFailure: &gm.ProtoHookFailure{ ErrorMessage: "err", StackTrace: "Stacktrace", - FailedScreenshot: []byte("Screenshot"), + FailureScreenshot: []byte("Screenshot"), }, }, } @@ -518,7 +518,7 @@ var protoStepWithAfterHookFailure = &gm.ProtoStep{ var failedHookFailure = &gm.ProtoHookFailure{ ErrorMessage: "java.lang.RuntimeException", StackTrace: newStackTrace(), - FailedScreenshot: []byte(newScreenshot()), + FailureScreenshot: []byte(newScreenshot()), } func TestToOverview(t *testing.T) { @@ -847,14 +847,14 @@ func TestToSpecWithDataTableExecutionStatusFail(t *testing.T) { } func TestToSpecWithBeforeHookFailure(t *testing.T) { - want := []*hookFailure{{ErrMsg: "err", HookName: "Before Spec", FailedScreenshot: "U2NyZWVuc2hvdA==", StackTrace: "Stacktrace"}} + want := []*hookFailure{{ErrMsg: "err", HookName: "Before Spec", FailureScreenshot: "U2NyZWVuc2hvdA==", StackTrace: "Stacktrace"}} got := toSpec(specResWithSpecHookFailure).BeforeSpecHookFailures checkEqual(t, "", want, got) } func TestToSpecWithAfterHookFailure(t *testing.T) { - want := []*hookFailure{{ErrMsg: "err", HookName: "After Spec", FailedScreenshot: "U2NyZWVuc2hvdA==", StackTrace: "Stacktrace", TableRowIndex: 0}} + want := []*hookFailure{{ErrMsg: "err", HookName: "After Spec", FailureScreenshot: "U2NyZWVuc2hvdA==", StackTrace: "Stacktrace", TableRowIndex: 0}} got := toSpec(specResWithSpecHookFailure).AfterSpecHookFailures checkEqual(t, "", want, got) diff --git a/themes/default/assets/css/style.css b/themes/default/assets/css/style.css index 08cb1db..bdf31bd 100644 --- a/themes/default/assets/css/style.css +++ b/themes/default/assets/css/style.css @@ -1084,6 +1084,7 @@ footer p { flex-wrap: wrap; width: 100%; margin-top: 10px; + margin-left: 10px; } .scenario-container .screenshot { diff --git a/themes/default/views/partials.tmpl b/themes/default/views/partials.tmpl index 256f608..56299aa 100644 --- a/themes/default/views/partials.tmpl +++ b/themes/default/views/partials.tmpl @@ -162,11 +162,11 @@
{{.StackTrace | escapeHTML | encodeNewLine}}
{{.StackTrace | escapeHTML | encodeNewLine}}- {{ if .FailedScreenshot}} + {{ if .FailureScreenshot}}