From bed8c7f00dac9820f0a9240bc5a92ad02a6132a5 Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <e.stratonikov@yadro.com>
Date: Tue, 27 Aug 2024 15:02:16 +0300
Subject: [PATCH] proto/test: Add repeated message test

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
---
 util/proto/marshal_test.go                |  15 +++++++++++++++
 util/proto/test/custom/test_frostfs.pb.go | Bin 25899 -> 30182 bytes
 util/proto/test/test.pb.go                | Bin 18340 -> 20911 bytes
 util/proto/test/test.proto                |   3 +++
 4 files changed, 18 insertions(+)

diff --git a/util/proto/marshal_test.go b/util/proto/marshal_test.go
index 5d887ce..a848bb5 100644
--- a/util/proto/marshal_test.go
+++ b/util/proto/marshal_test.go
@@ -113,6 +113,10 @@ func repPrimitivesEqual(t *testing.T, a *generated.RepPrimitives, b *test.RepPri
 	require.Equal(t, a.FieldE, b.FieldE)
 	require.Equal(t, a.FieldF, b.FieldF)
 	require.Equal(t, a.FieldFu, b.FieldFu)
+	require.Equal(t, len(a.GetFieldAux()), len(b.GetFieldAux()))
+	for i := range a.FieldAux {
+		require.Equal(t, a.GetFieldAux()[i].GetInnerField(), b.GetFieldAux()[i].GetInnerField())
+	}
 }
 
 func randIntSlice[T protoInt](n int, includeZero bool) []T {
@@ -129,6 +133,14 @@ func randIntSlice[T protoInt](n int, includeZero bool) []T {
 	return r
 }
 
+func uint32SliceToAux(s []uint32) []*generated.RepPrimitives_Aux {
+	r := make([]*generated.RepPrimitives_Aux, len(s))
+	for i := range s {
+		r[i] = &generated.RepPrimitives_Aux{s[i]}
+	}
+	return r
+}
+
 func TestStableMarshalRep(t *testing.T) {
 	t.Run("empty", func(t *testing.T) {
 		marshalCases := []struct {
@@ -176,6 +188,9 @@ func TestStableMarshalRep(t *testing.T) {
 		{name: "uint64", input: &generated.RepPrimitives{FieldFu: randIntSlice[uint64](1, true)}},
 		{name: "uint64", input: &generated.RepPrimitives{FieldFu: randIntSlice[uint64](2, true)}},
 		{name: "uint64", input: &generated.RepPrimitives{FieldFu: randIntSlice[uint64](2, false)}},
+		{name: "message", input: &generated.RepPrimitives{FieldAux: uint32SliceToAux(randIntSlice[uint32](1, true))}},
+		{name: "message", input: &generated.RepPrimitives{FieldAux: uint32SliceToAux(randIntSlice[uint32](2, true))}},
+		{name: "message", input: &generated.RepPrimitives{FieldAux: uint32SliceToAux(randIntSlice[uint32](2, false))}},
 	}
 	for _, tc := range marshalCases {
 		t.Run(tc.name, func(t *testing.T) {
diff --git a/util/proto/test/custom/test_frostfs.pb.go b/util/proto/test/custom/test_frostfs.pb.go
index a39bba7b55f648d89d34338879c7e4639ef6d480..f3b958fd5a784a55017c89cdd83c9c8fc5be3b93 100644
GIT binary patch
delta 896
zcmZuvOK%cU7!9R71{j2r&=zfb!Jt5q+FDaWf|itrNL#BFYXS&Un9(sX;LLz+Ol#b@
z)6JK<Gj5CvO^jw-xiM~BG{$FQTxin7#Eps3U!eC+lR{Hgch33F_d4G^+0^{}rFphB
z16o~CdyZ|uJKX@d5~J`{=YU6jgHTJ*_&cb+R{cHL%+T;u{|0{NX;?SBf?Aq}l<|j(
zC#kpaV3r1x=^Ny;H2g8;)%SwArN+OQZxgI=mPw6DJfzoEB53`qfzLCDLb*b&u)Hd>
zFm3ai5QdU0^1@{d2O$urjhNvD`Pc-Uw7Fn5PLqu0HbW#roYrCn1p5e3c1tg*05Q7*
z=4=*Q(o-@~NuI4%lFiP*@nmx+5^JvDlmK>OLF8+^%(qynNXXJvsV+o397)I6Q-Y&?
zqlz|>(88ybQ;R9sa2~dWgJ>nB_P|VzFTi_e8Lzred2#A>4}47ZPmp3aOccd)yOqct
zMFL+{W7O^%-UB0su-}i9)|6|R$2xtPkysRllK0llwh~1V(`c|l#n<M7NMNt~_H3ip
zqBsskqMbujS)n7>e`LIXTarOpQ6y513uT2GBT848>VjC8>&s0ze<-b4gIG2IcgBp$
z{Ml45EM^A?aN$jT{;qDqbDsz5<HPv){eB{Ab(Q&v8SQ11yIF$)UM?L}-PX|i!8&Dx
z4;Q^EW^!Zhwia6-n%kZ<!APs87thT5>P;E$FAXUh`HT^U%jPuh?1_*S$vr5l#fXSQ
sdvCuJtn!lFbx`<sX=<pu(`qusL9F0_?=d4JiYI#TzcS6ZVXKn)4|{$r#{d8T

delta 209
zcmaF%nsN0h#tjdgC#wqxaVkW|M#m;qmZVOO@t5L=jx8=J%FIij-0d&L9vz#RS7K~5
zd8fZLP@)vVxga3P0n`KJn3+ueEg)qB<bb5iOcWBbiu3cVl+rR&b5h)t61X_sz^qan
zDoT|SCL0K8PqugA-TWcIf_d^)vDnEIQp6@#x$WP)A@n!n<f|N^Kmq>Ar!6@*cSl&V
dZWfNOVwv3G<-d7u%0{-$Iyv4PlV_KD0{{V5O*H@j

diff --git a/util/proto/test/test.pb.go b/util/proto/test/test.pb.go
index de8ec65116b90776067757e70b2943386c7a84dc..e7d5699b73a81daaef96ecfadb426b4b0e543d4f 100644
GIT binary patch
delta 725
zcmZvZU2D@|9K}gn)+R0;ovzxKv{~2Hc4oFs(ic0LPG`jpFE)jNlx}S`lYr|=n~u&a
z@lpg|&Xu6x8;aiO%$+yxN(6;{0Abr#Q1Ev6Bm<$&o51;<^FL4Eyt+@le@T6~?W6fh
zwNh<t=qg@2c|7r5G)YHqYt0*kgs|_MvlD_PdK}mM3#QxEnz|(70u#ozf5CD$nGlv3
zC#C{_6It0xyg5XU2G3*v$UyRJw@1n*E~~BiwzjJ2+Pd0VHes#RUenha-IYSb{IQOZ
z7usqI{u5Drb-C^JZqJwt`Uf6Gct4596aQ_&mM4Nc-hiP+zByd_MoZ<%OGG&-&=D55
z#=Ld{@L;S?N!Vhq<8zorEjo+G919~Fu~NIys!gimVUPni^aVpCaw;}yMH;b&BQ5YL
zY=#5IUhI?GRTqiur9|UJ=B)$I(&b?yb9ob{^8!N?FOR)5$JvI7BrBcHVN@LV5S_7f
zHe-6Z6w2aN*8w6&t!x56#7XRkj6)<%@Jd(Q2esszN}Fg~7{NVBL9*b%rNX>viz`-{
zOl;#_;i=6jCz$nmn+Fx*(Jab%UYx?N;>FKm5Q9nv(@KD+<A*0n#GBg9guo}0ybO<W
z42#Nln=FtUAATzw*SFzmG73XWR=Oe;B-BbAW=ky7hZ6nLi=7fPV$QVOtgov7+?y^(
gW~!CE#_+Vqfx(#xB1g|H8h2+-+9=uhSpG%*0l+QZQ2+n{

delta 309
zcmZ3#m~lxz<Aw%Frs&wojN%fLmrHtaM8_7F6lLb6PgdX%nJgvc!5$r(nO9<LG&zt<
zWOA2OAW%UmMBpK(@MLD`K!^e}6R?6BX_x|_07$`Cbb&k>m&w(dlAE1mzp!pzp?ra5
zbFyw4A4jr@j)Fmjf#K$h)+<>iZ*dA_<Ki@^FiM*|*HmV+x^pKJqw(a8u2GZi+{Gp<
zxv5NccQc$^>1Hx{otxBTM)%`fMmh@m`U=rTRzQb($WFHM;6)YEMCFQ2KJURLT2fh%
n8lRV#o65zBq8}tH%Lp<_Y%{Z`Aj@VwzdlAr<IQ{hKQRIT$E{&7

diff --git a/util/proto/test/test.proto b/util/proto/test/test.proto
index f33be49..58cee2f 100644
--- a/util/proto/test/test.proto
+++ b/util/proto/test/test.proto
@@ -40,4 +40,7 @@ message RepPrimitives {
   repeated int64 field_e = 5;
   repeated uint64 field_f = 6;
   repeated uint64 field_fu = 7 [ packed = false ];
+
+  message Aux { uint32 inner_field = 1; }
+  repeated Aux field_aux = 8;
 }