This is an automated email from the ASF dual-hosted git repository. sruehl pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/plc4x-extras.git
The following commit(s) were added to refs/heads/main by this push: new e653cbb chore(build): fix plc4go e653cbb is described below commit e653cbb703616400ddc329cbfab189ef83959bb9 Author: Sebastian Rühl <sru...@apache.org> AuthorDate: Fri Apr 19 14:19:53 2024 +0200 chore(build): fix plc4go --- plc4go/.mockery.asl.header | 18 +++++++ plc4go/.mockery.yaml | 25 +++++++++ plc4go/go.mod | 2 +- plc4go/go.sum | 4 +- .../internal/common/mock_FilteredPackage_test.go | 62 +++++++++++++++++++++- 5 files changed, 107 insertions(+), 4 deletions(-) diff --git a/plc4go/.mockery.asl.header b/plc4go/.mockery.asl.header new file mode 100644 index 0000000..ba830d1 --- /dev/null +++ b/plc4go/.mockery.asl.header @@ -0,0 +1,18 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 + * + * https://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. + */ diff --git a/plc4go/.mockery.yaml b/plc4go/.mockery.yaml new file mode 100644 index 0000000..1c72391 --- /dev/null +++ b/plc4go/.mockery.yaml @@ -0,0 +1,25 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 +# +# https://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. + +all: True +mockname: "{{.Mock}}{{.InterfaceName}}" +inpackage: True +testonly: True +with-expecter: True +boilerplate-file: .mockery.asl.header +exclude: + - protocols \ No newline at end of file diff --git a/plc4go/go.mod b/plc4go/go.mod index 9c229f3..4d786b7 100644 --- a/plc4go/go.mod +++ b/plc4go/go.mod @@ -22,7 +22,7 @@ module github.com/apache/plc4x/plc4go-extras go 1.20 require ( - github.com/apache/plc4x/plc4go v0.0.0-20240405131220-64e372d1a91e + github.com/apache/plc4x/plc4go v0.0.0-20240419121414-a807ae7d1e31 github.com/fatih/color v1.16.0 github.com/gdamore/tcell/v2 v2.7.4 github.com/gopacket/gopacket v1.2.0 diff --git a/plc4go/go.sum b/plc4go/go.sum index d5a0a31..fe3c59f 100644 --- a/plc4go/go.sum +++ b/plc4go/go.sum @@ -2,8 +2,8 @@ github.com/IBM/netaddr v1.5.0 h1:IJlFZe1+nFs09TeMB/HOP4+xBnX2iM/xgiDOgZgTJq0= github.com/IBM/netaddr v1.5.0/go.mod h1:DDBPeYgbFzoXHjSz9Jwk7K8wmWV4+a/Kv0LqRnb8we4= github.com/ajankovic/xdiff v0.0.1 h1:V1cj8t5xwYzm6ZGPqPOlAc9AIajXuTEn41D/1MJBWMM= github.com/antchfx/xpath v0.0.0-20170515025933-1f3266e77307 h1:C735MoY/X+UOx6SECmHk5pVOj51h839Ph13pEoY8UmU= -github.com/apache/plc4x/plc4go v0.0.0-20240405131220-64e372d1a91e h1:48QIavQ8POuYNYAAjSqdXHtPlqDR6w5KIa6pU6UrmeY= -github.com/apache/plc4x/plc4go v0.0.0-20240405131220-64e372d1a91e/go.mod h1:ZEz+cei+s4YWI1y8EWIO6DGw3HpxR7sKTpI9nnouqQo= +github.com/apache/plc4x/plc4go v0.0.0-20240419121414-a807ae7d1e31 h1:mzt8QcOHcPgBfm50mQUa73Aw/2cPgkGkVbifg1fot7U= +github.com/apache/plc4x/plc4go v0.0.0-20240419121414-a807ae7d1e31/go.mod h1:ZEz+cei+s4YWI1y8EWIO6DGw3HpxR7sKTpI9nnouqQo= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/plc4go/tools/plc4xpcapanalyzer/internal/common/mock_FilteredPackage_test.go b/plc4go/tools/plc4xpcapanalyzer/internal/common/mock_FilteredPackage_test.go index e7cb049..9b7c388 100644 --- a/plc4go/tools/plc4xpcapanalyzer/internal/common/mock_FilteredPackage_test.go +++ b/plc4go/tools/plc4xpcapanalyzer/internal/common/mock_FilteredPackage_test.go @@ -17,7 +17,7 @@ * under the License. */ -// Code generated by mockery v2.32.4. DO NOT EDIT. +// Code generated by mockery v2.42.2. DO NOT EDIT. package common @@ -43,6 +43,10 @@ func (_m *MockFilteredPackage) EXPECT() *MockFilteredPackage_Expecter { func (_m *MockFilteredPackage) ApplicationLayer() gopacket.ApplicationLayer { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for ApplicationLayer") + } + var r0 gopacket.ApplicationLayer if rf, ok := ret.Get(0).(func() gopacket.ApplicationLayer); ok { r0 = rf() @@ -86,6 +90,10 @@ func (_c *MockFilteredPackage_ApplicationLayer_Call) RunAndReturn(run func() gop func (_m *MockFilteredPackage) Data() []byte { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Data") + } + var r0 []byte if rf, ok := ret.Get(0).(func() []byte); ok { r0 = rf() @@ -129,6 +137,10 @@ func (_c *MockFilteredPackage_Data_Call) RunAndReturn(run func() []byte) *MockFi func (_m *MockFilteredPackage) Dump() string { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Dump") + } + var r0 string if rf, ok := ret.Get(0).(func() string); ok { r0 = rf() @@ -170,6 +182,10 @@ func (_c *MockFilteredPackage_Dump_Call) RunAndReturn(run func() string) *MockFi func (_m *MockFilteredPackage) ErrorLayer() gopacket.ErrorLayer { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for ErrorLayer") + } + var r0 gopacket.ErrorLayer if rf, ok := ret.Get(0).(func() gopacket.ErrorLayer); ok { r0 = rf() @@ -213,6 +229,10 @@ func (_c *MockFilteredPackage_ErrorLayer_Call) RunAndReturn(run func() gopacket. func (_m *MockFilteredPackage) FilterReason() error { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for FilterReason") + } + var r0 error if rf, ok := ret.Get(0).(func() error); ok { r0 = rf() @@ -254,6 +274,10 @@ func (_c *MockFilteredPackage_FilterReason_Call) RunAndReturn(run func() error) func (_m *MockFilteredPackage) IsFilteredPackage() bool { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for IsFilteredPackage") + } + var r0 bool if rf, ok := ret.Get(0).(func() bool); ok { r0 = rf() @@ -295,6 +319,10 @@ func (_c *MockFilteredPackage_IsFilteredPackage_Call) RunAndReturn(run func() bo func (_m *MockFilteredPackage) Layer(_a0 gopacket.LayerType) gopacket.Layer { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for Layer") + } + var r0 gopacket.Layer if rf, ok := ret.Get(0).(func(gopacket.LayerType) gopacket.Layer); ok { r0 = rf(_a0) @@ -339,6 +367,10 @@ func (_c *MockFilteredPackage_Layer_Call) RunAndReturn(run func(gopacket.LayerTy func (_m *MockFilteredPackage) LayerClass(_a0 gopacket.LayerClass) gopacket.Layer { ret := _m.Called(_a0) + if len(ret) == 0 { + panic("no return value specified for LayerClass") + } + var r0 gopacket.Layer if rf, ok := ret.Get(0).(func(gopacket.LayerClass) gopacket.Layer); ok { r0 = rf(_a0) @@ -383,6 +415,10 @@ func (_c *MockFilteredPackage_LayerClass_Call) RunAndReturn(run func(gopacket.La func (_m *MockFilteredPackage) Layers() []gopacket.Layer { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Layers") + } + var r0 []gopacket.Layer if rf, ok := ret.Get(0).(func() []gopacket.Layer); ok { r0 = rf() @@ -426,6 +462,10 @@ func (_c *MockFilteredPackage_Layers_Call) RunAndReturn(run func() []gopacket.La func (_m *MockFilteredPackage) LinkLayer() gopacket.LinkLayer { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for LinkLayer") + } + var r0 gopacket.LinkLayer if rf, ok := ret.Get(0).(func() gopacket.LinkLayer); ok { r0 = rf() @@ -469,6 +509,10 @@ func (_c *MockFilteredPackage_LinkLayer_Call) RunAndReturn(run func() gopacket.L func (_m *MockFilteredPackage) Metadata() *gopacket.PacketMetadata { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for Metadata") + } + var r0 *gopacket.PacketMetadata if rf, ok := ret.Get(0).(func() *gopacket.PacketMetadata); ok { r0 = rf() @@ -512,6 +556,10 @@ func (_c *MockFilteredPackage_Metadata_Call) RunAndReturn(run func() *gopacket.P func (_m *MockFilteredPackage) NetworkLayer() gopacket.NetworkLayer { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for NetworkLayer") + } + var r0 gopacket.NetworkLayer if rf, ok := ret.Get(0).(func() gopacket.NetworkLayer); ok { r0 = rf() @@ -555,6 +603,10 @@ func (_c *MockFilteredPackage_NetworkLayer_Call) RunAndReturn(run func() gopacke func (_m *MockFilteredPackage) String() string { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for String") + } + var r0 string if rf, ok := ret.Get(0).(func() string); ok { r0 = rf() @@ -596,6 +648,10 @@ func (_c *MockFilteredPackage_String_Call) RunAndReturn(run func() string) *Mock func (_m *MockFilteredPackage) TransportLayer() gopacket.TransportLayer { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for TransportLayer") + } + var r0 gopacket.TransportLayer if rf, ok := ret.Get(0).(func() gopacket.TransportLayer); ok { r0 = rf() @@ -639,6 +695,10 @@ func (_c *MockFilteredPackage_TransportLayer_Call) RunAndReturn(run func() gopac func (_m *MockFilteredPackage) VerifyChecksums() (error, []gopacket.ChecksumMismatch) { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for VerifyChecksums") + } + var r0 error var r1 []gopacket.ChecksumMismatch if rf, ok := ret.Get(0).(func() (error, []gopacket.ChecksumMismatch)); ok {