123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344134513461347134813491350135113521353135413551356135713581359136013611362136313641365136613671368136913701371137213731374137513761377137813791380138113821383138413851386138713881389139013911392139313941395139613971398139914001401140214031404140514061407140814091410141114121413141414151416141714181419142014211422142314241425142614271428142914301431143214331434143514361437143814391440144114421443144414451446144714481449145014511452145314541455145614571458145914601461146214631464146514661467146814691470147114721473147414751476147714781479148014811482148314841485148614871488148914901491149214931494149514961497149814991500150115021503150415051506150715081509151015111512151315141515151615171518151915201521152215231524152515261527152815291530153115321533153415351536153715381539154015411542154315441545154615471548154915501551155215531554155515561557155815591560156115621563156415651566156715681569157015711572157315741575157615771578157915801581158215831584158515861587158815891590159115921593159415951596159715981599160016011602160316041605160616071608160916101611161216131614161516161617161816191620162116221623162416251626162716281629163016311632163316341635163616371638163916401641164216431644164516461647164816491650165116521653165416551656165716581659166016611662166316641665166616671668166916701671167216731674167516761677167816791680168116821683168416851686168716881689169016911692169316941695169616971698169917001701170217031704170517061707170817091710171117121713171417151716171717181719172017211722172317241725172617271728172917301731173217331734173517361737173817391740174117421743174417451746174717481749175017511752175317541755175617571758175917601761176217631764176517661767176817691770177117721773177417751776177717781779178017811782178317841785178617871788178917901791179217931794179517961797179817991800180118021803180418051806180718081809181018111812181318141815181618171818181918201821182218231824182518261827182818291830183118321833183418351836183718381839184018411842184318441845184618471848184918501851185218531854185518561857185818591860186118621863186418651866186718681869187018711872187318741875187618771878187918801881188218831884188518861887188818891890189118921893189418951896189718981899190019011902190319041905190619071908190919101911191219131914191519161917191819191920192119221923192419251926192719281929193019311932193319341935193619371938193919401941194219431944194519461947194819491950195119521953195419551956195719581959196019611962196319641965196619671968196919701971197219731974197519761977197819791980198119821983198419851986198719881989199019911992199319941995199619971998199920002001200220032004200520062007200820092010201120122013201420152016201720182019202020212022202320242025202620272028202920302031203220332034203520362037203820392040204120422043204420452046204720482049205020512052205320542055205620572058205920602061206220632064206520662067206820692070207120722073207420752076207720782079208020812082208320842085208620872088208920902091209220932094209520962097209820992100210121022103210421052106210721082109211021112112211321142115211621172118 |
- /*
- Copyright 2014 The Kubernetes Authors.
- 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 strategicpatch
- import (
- "encoding/json"
- "fmt"
- "reflect"
- "strings"
- "testing"
- "github.com/davecgh/go-spew/spew"
- "github.com/ghodss/yaml"
- )
- type SortMergeListTestCases struct {
- TestCases []SortMergeListTestCase
- }
- type SortMergeListTestCase struct {
- Description string
- Original map[string]interface{}
- Sorted map[string]interface{}
- }
- type StrategicMergePatchTestCases struct {
- TestCases []StrategicMergePatchTestCase
- }
- type StrategicMergePatchTestCase struct {
- Description string
- StrategicMergePatchTestCaseData
- }
- type StrategicMergePatchTestCaseData struct {
- Original map[string]interface{}
- TwoWay map[string]interface{}
- Modified map[string]interface{}
- Current map[string]interface{}
- ThreeWay map[string]interface{}
- Result map[string]interface{}
- }
- type MergeItem struct {
- Name string
- Value string
- Other string
- MergingList []MergeItem `patchStrategy:"merge" patchMergeKey:"name"`
- NonMergingList []MergeItem
- MergingIntList []int `patchStrategy:"merge"`
- NonMergingIntList []int
- MergeItemPtr *MergeItem `patchStrategy:"merge" patchMergeKey:"name"`
- SimpleMap map[string]string
- }
- var mergeItem MergeItem
- // These are test cases for SortMergeList, used to assert that it (recursively)
- // sorts both merging and non merging lists correctly.
- var sortMergeListTestCaseData = []byte(`
- testCases:
- - description: sort one list of maps
- original:
- mergingList:
- - name: 1
- - name: 3
- - name: 2
- sorted:
- mergingList:
- - name: 1
- - name: 2
- - name: 3
- - description: sort lists of maps but not nested lists of maps
- original:
- mergingList:
- - name: 2
- nonMergingList:
- - name: 1
- - name: 3
- - name: 2
- - name: 1
- nonMergingList:
- - name: 2
- - name: 1
- sorted:
- mergingList:
- - name: 1
- nonMergingList:
- - name: 2
- - name: 1
- - name: 2
- nonMergingList:
- - name: 1
- - name: 3
- - name: 2
- - description: sort lists of maps and nested lists of maps
- fieldTypes:
- original:
- mergingList:
- - name: 2
- mergingList:
- - name: 1
- - name: 3
- - name: 2
- - name: 1
- mergingList:
- - name: 2
- - name: 1
- sorted:
- mergingList:
- - name: 1
- mergingList:
- - name: 1
- - name: 2
- - name: 2
- mergingList:
- - name: 1
- - name: 2
- - name: 3
- - description: merging list should NOT sort when nested in non merging list
- original:
- nonMergingList:
- - name: 2
- mergingList:
- - name: 1
- - name: 3
- - name: 2
- - name: 1
- mergingList:
- - name: 2
- - name: 1
- sorted:
- nonMergingList:
- - name: 2
- mergingList:
- - name: 1
- - name: 3
- - name: 2
- - name: 1
- mergingList:
- - name: 2
- - name: 1
- - description: sort very nested list of maps
- fieldTypes:
- original:
- mergingList:
- - mergingList:
- - mergingList:
- - name: 2
- - name: 1
- sorted:
- mergingList:
- - mergingList:
- - mergingList:
- - name: 1
- - name: 2
- - description: sort nested lists of ints
- original:
- mergingList:
- - name: 2
- mergingIntList:
- - 1
- - 3
- - 2
- - name: 1
- mergingIntList:
- - 2
- - 1
- sorted:
- mergingList:
- - name: 1
- mergingIntList:
- - 1
- - 2
- - name: 2
- mergingIntList:
- - 1
- - 2
- - 3
- - description: sort nested pointers of ints
- original:
- mergeItemPtr:
- - name: 2
- mergingIntList:
- - 1
- - 3
- - 2
- - name: 1
- mergingIntList:
- - 2
- - 1
- sorted:
- mergeItemPtr:
- - name: 1
- mergingIntList:
- - 1
- - 2
- - name: 2
- mergingIntList:
- - 1
- - 2
- - 3
- - description: sort merging list by pointer
- original:
- mergeItemPtr:
- - name: 1
- - name: 3
- - name: 2
- sorted:
- mergeItemPtr:
- - name: 1
- - name: 2
- - name: 3
- `)
- func TestSortMergeLists(t *testing.T) {
- tc := SortMergeListTestCases{}
- err := yaml.Unmarshal(sortMergeListTestCaseData, &tc)
- if err != nil {
- t.Errorf("can't unmarshal test cases: %s\n", err)
- return
- }
- for _, c := range tc.TestCases {
- original := testObjectToJSONOrFail(t, c.Original, c.Description)
- sorted := testObjectToJSONOrFail(t, c.Sorted, c.Description)
- if !reflect.DeepEqual(original, sorted) {
- t.Errorf("error in test case: %s\ncannot sort object:\n%s\nexpected:\n%s\ngot:\n%s\n",
- c.Description, toYAMLOrError(c.Original), toYAMLOrError(c.Sorted), jsonToYAMLOrError(original))
- }
- }
- }
- // These are test cases for StrategicMergePatch that cannot be generated using
- // CreateTwoWayMergePatch because it doesn't use the replace directive, generate
- // duplicate integers for a merging list patch, or generate empty merging lists.
- var customStrategicMergePatchTestCaseData = []byte(`
- testCases:
- - description: unique scalars when merging lists
- original:
- mergingIntList:
- - 1
- - 2
- twoWay:
- mergingIntList:
- - 2
- - 3
- modified:
- mergingIntList:
- - 1
- - 2
- - 3
- - description: delete map from nested map
- original:
- simpleMap:
- key1: 1
- key2: 1
- twoWay:
- simpleMap:
- $patch: delete
- modified:
- simpleMap:
- {}
- - description: delete all items from merging list
- original:
- mergingList:
- - name: 1
- - name: 2
- twoWay:
- mergingList:
- - $patch: replace
- modified:
- mergingList: []
- - description: merge empty merging lists
- original:
- mergingList: []
- twoWay:
- mergingList: []
- modified:
- mergingList: []
- - description: delete all keys from map
- original:
- name: 1
- value: 1
- twoWay:
- $patch: replace
- modified: {}
- - description: add key and delete all keys from map
- original:
- name: 1
- value: 1
- twoWay:
- other: a
- $patch: replace
- modified:
- other: a
- `)
- func TestCustomStrategicMergePatch(t *testing.T) {
- tc := StrategicMergePatchTestCases{}
- err := yaml.Unmarshal(customStrategicMergePatchTestCaseData, &tc)
- if err != nil {
- t.Errorf("can't unmarshal test cases: %v\n", err)
- return
- }
- for _, c := range tc.TestCases {
- original, twoWay, modified := twoWayTestCaseToJSONOrFail(t, c)
- testPatchApplication(t, original, twoWay, modified, c.Description)
- }
- }
- // These are test cases for StrategicMergePatch, to assert that applying a patch
- // yields the correct outcome. They are also test cases for CreateTwoWayMergePatch
- // and CreateThreeWayMergePatch, to assert that they both generate the correct patch
- // for the given set of input documents.
- //
- var createStrategicMergePatchTestCaseData = []byte(`
- testCases:
- - description: nil original
- twoWay:
- name: 1
- value: 1
- modified:
- name: 1
- value: 1
- current:
- name: 1
- other: a
- threeWay:
- value: 1
- result:
- name: 1
- value: 1
- other: a
- - description: nil patch
- original:
- name: 1
- twoWay:
- {}
- modified:
- name: 1
- current:
- name: 1
- threeWay:
- {}
- result:
- name: 1
- - description: add field to map
- original:
- name: 1
- twoWay:
- value: 1
- modified:
- name: 1
- value: 1
- current:
- name: 1
- other: a
- threeWay:
- value: 1
- result:
- name: 1
- value: 1
- other: a
- - description: add field to map with conflict
- original:
- name: 1
- twoWay:
- value: 1
- modified:
- name: 1
- value: 1
- current:
- name: a
- other: a
- threeWay:
- name: 1
- value: 1
- result:
- name: 1
- value: 1
- other: a
- - description: add field and delete field from map
- original:
- name: 1
- twoWay:
- name: null
- value: 1
- modified:
- value: 1
- current:
- name: 1
- other: a
- threeWay:
- name: null
- value: 1
- result:
- value: 1
- other: a
- - description: add field and delete field from map with conflict
- original:
- name: 1
- twoWay:
- name: null
- value: 1
- modified:
- value: 1
- current:
- name: a
- other: a
- threeWay:
- name: null
- value: 1
- result:
- value: 1
- other: a
- - description: delete field from nested map
- original:
- simpleMap:
- key1: 1
- key2: 1
- twoWay:
- simpleMap:
- key2: null
- modified:
- simpleMap:
- key1: 1
- current:
- simpleMap:
- key1: 1
- key2: 1
- other: a
- threeWay:
- simpleMap:
- key2: null
- result:
- simpleMap:
- key1: 1
- other: a
- - description: delete field from nested map with conflict
- original:
- simpleMap:
- key1: 1
- key2: 1
- twoWay:
- simpleMap:
- key2: null
- modified:
- simpleMap:
- key1: 1
- current:
- simpleMap:
- key1: a
- key2: 1
- other: a
- threeWay:
- simpleMap:
- key1: 1
- key2: null
- result:
- simpleMap:
- key1: 1
- other: a
- - description: delete all fields from map
- original:
- name: 1
- value: 1
- twoWay:
- name: null
- value: null
- modified: {}
- current:
- name: 1
- value: 1
- other: a
- threeWay:
- name: null
- value: null
- result:
- other: a
- - description: delete all fields from map with conflict
- original:
- name: 1
- value: 1
- twoWay:
- name: null
- value: null
- modified: {}
- current:
- name: 1
- value: a
- other: a
- threeWay:
- name: null
- value: null
- result:
- other: a
- - description: add field and delete all fields from map
- original:
- name: 1
- value: 1
- twoWay:
- name: null
- value: null
- other: a
- modified:
- other: a
- current:
- name: 1
- value: 1
- other: a
- threeWay:
- name: null
- value: null
- result:
- other: a
- - description: add field and delete all fields from map with conflict
- original:
- name: 1
- value: 1
- twoWay:
- name: null
- value: null
- other: a
- modified:
- other: a
- current:
- name: 1
- value: 1
- other: b
- threeWay:
- name: null
- value: null
- other: a
- result:
- other: a
- - description: replace list of scalars
- original:
- nonMergingIntList:
- - 1
- - 2
- twoWay:
- nonMergingIntList:
- - 2
- - 3
- modified:
- nonMergingIntList:
- - 2
- - 3
- current:
- nonMergingIntList:
- - 1
- - 2
- threeWay:
- nonMergingIntList:
- - 2
- - 3
- result:
- nonMergingIntList:
- - 2
- - 3
- - description: replace list of scalars with conflict
- original:
- nonMergingIntList:
- - 1
- - 2
- twoWay:
- nonMergingIntList:
- - 2
- - 3
- modified:
- nonMergingIntList:
- - 2
- - 3
- current:
- nonMergingIntList:
- - 1
- - 4
- threeWay:
- nonMergingIntList:
- - 2
- - 3
- result:
- nonMergingIntList:
- - 2
- - 3
- - description: merge lists of scalars
- original:
- mergingIntList:
- - 1
- - 2
- twoWay:
- mergingIntList:
- - 3
- modified:
- mergingIntList:
- - 1
- - 2
- - 3
- current:
- mergingIntList:
- - 1
- - 2
- - 4
- threeWay:
- mergingIntList:
- - 3
- result:
- mergingIntList:
- - 1
- - 2
- - 3
- - 4
- - description: merge lists of maps
- original:
- mergingList:
- - name: 1
- - name: 2
- value: 2
- twoWay:
- mergingList:
- - name: 3
- value: 3
- - name: 4
- value: 4
- modified:
- mergingList:
- - name: 4
- value: 4
- - name: 1
- - name: 2
- value: 2
- - name: 3
- value: 3
- current:
- mergingList:
- - name: 1
- other: a
- - name: 2
- value: 2
- other: b
- threeWay:
- mergingList:
- - name: 3
- value: 3
- - name: 4
- value: 4
- result:
- mergingList:
- - name: 1
- other: a
- - name: 2
- value: 2
- other: b
- - name: 3
- value: 3
- - name: 4
- value: 4
- - description: merge lists of maps with conflict
- original:
- mergingList:
- - name: 1
- - name: 2
- value: 2
- twoWay:
- mergingList:
- - name: 3
- value: 3
- modified:
- mergingList:
- - name: 1
- - name: 2
- value: 2
- - name: 3
- value: 3
- current:
- mergingList:
- - name: 1
- other: a
- - name: 2
- value: 3
- other: b
- threeWay:
- mergingList:
- - name: 2
- value: 2
- - name: 3
- value: 3
- result:
- mergingList:
- - name: 1
- other: a
- - name: 2
- value: 2
- other: b
- - name: 3
- value: 3
- - description: add field to map in merging list
- original:
- mergingList:
- - name: 1
- - name: 2
- value: 2
- twoWay:
- mergingList:
- - name: 1
- value: 1
- modified:
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- current:
- mergingList:
- - name: 1
- other: a
- - name: 2
- value: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- value: 1
- result:
- mergingList:
- - name: 1
- value: 1
- other: a
- - name: 2
- value: 2
- other: b
- - description: add field to map in merging list with conflict
- original:
- mergingList:
- - name: 1
- - name: 2
- value: 2
- twoWay:
- mergingList:
- - name: 1
- value: 1
- modified:
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- current:
- mergingList:
- - name: 1
- other: a
- - name: 3
- value: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- result:
- mergingList:
- - name: 1
- value: 1
- other: a
- - name: 2
- value: 2
- - name: 3
- value: 2
- other: b
- - description: add duplicate field to map in merging list
- original:
- mergingList:
- - name: 1
- - name: 2
- value: 2
- twoWay:
- mergingList:
- - name: 1
- value: 1
- modified:
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- current:
- mergingList:
- - name: 1
- value: 1
- other: a
- - name: 2
- value: 2
- other: b
- threeWay:
- {}
- result:
- mergingList:
- - name: 1
- value: 1
- other: a
- - name: 2
- value: 2
- other: b
- - description: add duplicate field to map in merging list with conflict
- original:
- mergingList:
- - name: 1
- - name: 2
- value: 2
- twoWay:
- mergingList:
- - name: 1
- value: 1
- modified:
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- current:
- mergingList:
- - name: 1
- value: 1
- other: a
- - name: 2
- value: 3
- other: b
- threeWay:
- mergingList:
- - name: 2
- value: 2
- result:
- mergingList:
- - name: 1
- value: 1
- other: a
- - name: 2
- value: 2
- other: b
- - description: replace map field value in merging list
- original:
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- twoWay:
- mergingList:
- - name: 1
- value: a
- modified:
- mergingList:
- - name: 1
- value: a
- - name: 2
- value: 2
- current:
- mergingList:
- - name: 1
- value: 1
- other: a
- - name: 2
- value: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- value: a
- result:
- mergingList:
- - name: 1
- value: a
- other: a
- - name: 2
- value: 2
- other: b
- - description: replace map field value in merging list with conflict
- original:
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- twoWay:
- mergingList:
- - name: 1
- value: a
- modified:
- mergingList:
- - name: 1
- value: a
- - name: 2
- value: 2
- current:
- mergingList:
- - name: 1
- value: 3
- other: a
- - name: 2
- value: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- value: a
- result:
- mergingList:
- - name: 1
- value: a
- other: a
- - name: 2
- value: 2
- other: b
- - description: delete map from merging list
- original:
- mergingList:
- - name: 1
- - name: 2
- twoWay:
- mergingList:
- - name: 1
- $patch: delete
- modified:
- mergingList:
- - name: 2
- current:
- mergingList:
- - name: 1
- - name: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- $patch: delete
- result:
- mergingList:
- - name: 2
- other: b
- - description: delete map from merging list with conflict
- original:
- mergingList:
- - name: 1
- - name: 2
- twoWay:
- mergingList:
- - name: 1
- $patch: delete
- modified:
- mergingList:
- - name: 2
- current:
- mergingList:
- - name: 1
- other: a
- - name: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- $patch: delete
- result:
- mergingList:
- - name: 2
- other: b
- - description: delete missing map from merging list
- original:
- mergingList:
- - name: 1
- - name: 2
- twoWay:
- mergingList:
- - name: 1
- $patch: delete
- modified:
- mergingList:
- - name: 2
- current:
- mergingList:
- - name: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- $patch: delete
- result:
- mergingList:
- - name: 2
- other: b
- - description: delete missing map from merging list with conflict
- original:
- mergingList:
- - name: 1
- - name: 2
- twoWay:
- mergingList:
- - name: 1
- $patch: delete
- modified:
- mergingList:
- - name: 2
- current:
- mergingList:
- - name: 3
- other: a
- threeWay:
- mergingList:
- - name: 1
- $patch: delete
- - name: 2
- result:
- mergingList:
- - name: 2
- - name: 3
- other: a
- - description: add map and delete map from merging list
- original:
- merginglist:
- - name: 1
- - name: 2
- twoWay:
- merginglist:
- - name: 1
- $patch: delete
- - name: 3
- modified:
- merginglist:
- - name: 2
- - name: 3
- current:
- merginglist:
- - name: 1
- - name: 2
- other: b
- - name: 4
- other: c
- threeWay:
- merginglist:
- - name: 1
- $patch: delete
- - name: 3
- result:
- merginglist:
- - name: 2
- other: b
- - name: 3
- - name: 4
- other: c
- - description: add map and delete map from merging list with conflict
- original:
- merginglist:
- - name: 1
- - name: 2
- twoWay:
- merginglist:
- - name: 1
- $patch: delete
- - name: 3
- modified:
- merginglist:
- - name: 2
- - name: 3
- current:
- merginglist:
- - name: 1
- other: a
- - name: 4
- other: c
- threeWay:
- merginglist:
- - name: 1
- $patch: delete
- - name: 2
- - name: 3
- result:
- merginglist:
- - name: 2
- - name: 3
- - name: 4
- other: c
- - description: delete all maps from merging list
- original:
- mergingList:
- - name: 1
- - name: 2
- twoWay:
- mergingList:
- - name: 1
- $patch: delete
- - name: 2
- $patch: delete
- modified:
- mergingList: []
- current:
- mergingList:
- - name: 1
- - name: 2
- threeWay:
- mergingList:
- - name: 1
- $patch: delete
- - name: 2
- $patch: delete
- result:
- mergingList: []
- - description: delete all maps from merging list with conflict
- original:
- mergingList:
- - name: 1
- - name: 2
- twoWay:
- mergingList:
- - name: 1
- $patch: delete
- - name: 2
- $patch: delete
- modified:
- mergingList: []
- current:
- mergingList:
- - name: 1
- other: a
- - name: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- $patch: delete
- - name: 2
- $patch: delete
- result:
- mergingList: []
- - description: delete all maps from empty merging list
- original:
- mergingList:
- - name: 1
- - name: 2
- twoWay:
- mergingList:
- - name: 1
- $patch: delete
- - name: 2
- $patch: delete
- modified:
- mergingList: []
- current:
- mergingList: []
- threeWay:
- mergingList:
- - name: 1
- $patch: delete
- - name: 2
- $patch: delete
- result:
- mergingList: []
- - description: delete field from map in merging list
- original:
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- twoWay:
- mergingList:
- - name: 1
- value: null
- modified:
- mergingList:
- - name: 1
- - name: 2
- value: 2
- current:
- mergingList:
- - name: 1
- value: 1
- other: a
- - name: 2
- value: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- value: null
- result:
- mergingList:
- - name: 1
- other: a
- - name: 2
- value: 2
- other: b
- - description: delete field from map in merging list with conflict
- original:
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- twoWay:
- mergingList:
- - name: 1
- value: null
- modified:
- mergingList:
- - name: 1
- - name: 2
- value: 2
- current:
- mergingList:
- - name: 1
- value: a
- other: a
- - name: 2
- value: 2
- threeWay:
- mergingList:
- - name: 1
- value: null
- result:
- mergingList:
- - name: 1
- other: a
- - name: 2
- value: 2
- - description: delete missing field from map in merging list
- original:
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- twoWay:
- mergingList:
- - name: 1
- value: null
- modified:
- mergingList:
- - name: 1
- - name: 2
- value: 2
- current:
- mergingList:
- - name: 1
- other: a
- - name: 2
- value: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- value: null
- result:
- mergingList:
- - name: 1
- other: a
- - name: 2
- value: 2
- other: b
- - description: delete missing field from map in merging list with conflict
- original:
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- twoWay:
- mergingList:
- - name: 1
- value: null
- modified:
- mergingList:
- - name: 1
- - name: 2
- value: 2
- current:
- mergingList:
- - name: 1
- other: a
- - name: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- value: null
- - name: 2
- value: 2
- result:
- mergingList:
- - name: 1
- other: a
- - name: 2
- value: 2
- other: b
- - description: replace non merging list nested in merging list
- original:
- mergingList:
- - name: 1
- nonMergingList:
- - name: 1
- - name: 2
- value: 2
- - name: 2
- twoWay:
- mergingList:
- - name: 1
- nonMergingList:
- - name: 1
- value: 1
- modified:
- mergingList:
- - name: 1
- nonMergingList:
- - name: 1
- value: 1
- - name: 2
- current:
- mergingList:
- - name: 1
- other: a
- nonMergingList:
- - name: 1
- - name: 2
- value: 2
- - name: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- nonMergingList:
- - name: 1
- value: 1
- result:
- mergingList:
- - name: 1
- other: a
- nonMergingList:
- - name: 1
- value: 1
- - name: 2
- other: b
- - description: replace non merging list nested in merging list with value conflict
- original:
- mergingList:
- - name: 1
- nonMergingList:
- - name: 1
- - name: 2
- value: 2
- - name: 2
- twoWay:
- mergingList:
- - name: 1
- nonMergingList:
- - name: 1
- value: 1
- modified:
- mergingList:
- - name: 1
- nonMergingList:
- - name: 1
- value: 1
- - name: 2
- current:
- mergingList:
- - name: 1
- other: a
- nonMergingList:
- - name: 1
- value: c
- - name: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- nonMergingList:
- - name: 1
- value: 1
- result:
- mergingList:
- - name: 1
- other: a
- nonMergingList:
- - name: 1
- value: 1
- - name: 2
- other: b
- - description: replace non merging list nested in merging list with deletion conflict
- original:
- mergingList:
- - name: 1
- nonMergingList:
- - name: 1
- - name: 2
- value: 2
- - name: 2
- twoWay:
- mergingList:
- - name: 1
- nonMergingList:
- - name: 1
- value: 1
- modified:
- mergingList:
- - name: 1
- nonMergingList:
- - name: 1
- value: 1
- - name: 2
- current:
- mergingList:
- - name: 1
- other: a
- nonMergingList:
- - name: 2
- value: 2
- - name: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- nonMergingList:
- - name: 1
- value: 1
- result:
- mergingList:
- - name: 1
- other: a
- nonMergingList:
- - name: 1
- value: 1
- - name: 2
- other: b
- - description: add field to map in merging list nested in merging list
- original:
- mergingList:
- - name: 1
- mergingList:
- - name: 1
- - name: 2
- value: 2
- - name: 2
- twoWay:
- mergingList:
- - name: 1
- mergingList:
- - name: 1
- value: 1
- modified:
- mergingList:
- - name: 1
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- - name: 2
- current:
- mergingList:
- - name: 1
- other: a
- mergingList:
- - name: 1
- - name: 2
- value: 2
- - name: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- mergingList:
- - name: 1
- value: 1
- result:
- mergingList:
- - name: 1
- other: a
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- - name: 2
- other: b
- - description: add field to map in merging list nested in merging list with value conflict
- original:
- mergingList:
- - name: 1
- mergingList:
- - name: 1
- - name: 2
- value: 2
- - name: 2
- twoWay:
- mergingList:
- - name: 1
- mergingList:
- - name: 1
- value: 1
- modified:
- mergingList:
- - name: 1
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- - name: 2
- current:
- mergingList:
- - name: 1
- other: a
- mergingList:
- - name: 1
- value: a
- other: c
- - name: 2
- value: b
- other: d
- - name: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- result:
- mergingList:
- - name: 1
- other: a
- mergingList:
- - name: 1
- value: 1
- other: c
- - name: 2
- value: 2
- other: d
- - name: 2
- other: b
- - description: add field to map in merging list nested in merging list with deletion conflict
- original:
- mergingList:
- - name: 1
- mergingList:
- - name: 1
- - name: 2
- value: 2
- - name: 2
- twoWay:
- mergingList:
- - name: 1
- mergingList:
- - name: 1
- value: 1
- modified:
- mergingList:
- - name: 1
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- - name: 2
- current:
- mergingList:
- - name: 1
- other: a
- mergingList:
- - name: 2
- value: 2
- other: d
- - name: 2
- other: b
- threeWay:
- mergingList:
- - name: 1
- mergingList:
- - name: 1
- value: 1
- result:
- mergingList:
- - name: 1
- other: a
- mergingList:
- - name: 1
- value: 1
- - name: 2
- value: 2
- other: d
- - name: 2
- other: b
- - description: merge empty merging lists
- original:
- mergingList: []
- twoWay:
- {}
- modified:
- mergingList: []
- current:
- mergingList: []
- threeWay:
- {}
- result:
- mergingList: []
- - description: add map to merging list by pointer
- original:
- mergeItemPtr:
- - name: 1
- twoWay:
- mergeItemPtr:
- - name: 2
- modified:
- mergeItemPtr:
- - name: 1
- - name: 2
- current:
- mergeItemPtr:
- - name: 1
- other: a
- - name: 3
- threeWay:
- mergeItemPtr:
- - name: 2
- result:
- mergeItemPtr:
- - name: 1
- other: a
- - name: 2
- - name: 3
- - description: add map to merging list by pointer with conflict
- original:
- mergeItemPtr:
- - name: 1
- twoWay:
- mergeItemPtr:
- - name: 2
- modified:
- mergeItemPtr:
- - name: 1
- - name: 2
- current:
- mergeItemPtr:
- - name: 3
- threeWay:
- mergeItemPtr:
- - name: 1
- - name: 2
- result:
- mergeItemPtr:
- - name: 1
- - name: 2
- - name: 3
- - description: add field to map in merging list by pointer
- original:
- mergeItemPtr:
- - name: 1
- mergeItemPtr:
- - name: 1
- - name: 2
- value: 2
- - name: 2
- twoWay:
- mergeItemPtr:
- - name: 1
- mergeItemPtr:
- - name: 1
- value: 1
- modified:
- mergeItemPtr:
- - name: 1
- mergeItemPtr:
- - name: 1
- value: 1
- - name: 2
- value: 2
- - name: 2
- current:
- mergeItemPtr:
- - name: 1
- other: a
- mergeItemPtr:
- - name: 1
- other: a
- - name: 2
- value: 2
- other: b
- - name: 2
- other: b
- threeWay:
- mergeItemPtr:
- - name: 1
- mergeItemPtr:
- - name: 1
- value: 1
- result:
- mergeItemPtr:
- - name: 1
- other: a
- mergeItemPtr:
- - name: 1
- value: 1
- other: a
- - name: 2
- value: 2
- other: b
- - name: 2
- other: b
- - description: add field to map in merging list by pointer with conflict
- original:
- mergeItemPtr:
- - name: 1
- mergeItemPtr:
- - name: 1
- - name: 2
- value: 2
- - name: 2
- twoWay:
- mergeItemPtr:
- - name: 1
- mergeItemPtr:
- - name: 1
- value: 1
- modified:
- mergeItemPtr:
- - name: 1
- mergeItemPtr:
- - name: 1
- value: 1
- - name: 2
- value: 2
- - name: 2
- current:
- mergeItemPtr:
- - name: 1
- other: a
- mergeItemPtr:
- - name: 1
- value: a
- - name: 2
- value: 2
- other: b
- - name: 2
- other: b
- threeWay:
- mergeItemPtr:
- - name: 1
- mergeItemPtr:
- - name: 1
- value: 1
- result:
- mergeItemPtr:
- - name: 1
- other: a
- mergeItemPtr:
- - name: 1
- value: 1
- - name: 2
- value: 2
- other: b
- - name: 2
- other: b
- `)
- func TestStrategicMergePatch(t *testing.T) {
- testStrategicMergePatchWithCustomArguments(t, "bad original",
- "<THIS IS NOT JSON>", "{}", mergeItem, errBadJSONDoc)
- testStrategicMergePatchWithCustomArguments(t, "bad patch",
- "{}", "<THIS IS NOT JSON>", mergeItem, errBadJSONDoc)
- testStrategicMergePatchWithCustomArguments(t, "bad struct",
- "{}", "{}", []byte("<THIS IS NOT A STRUCT>"), fmt.Errorf(errBadArgTypeFmt, "struct", "slice"))
- testStrategicMergePatchWithCustomArguments(t, "nil struct",
- "{}", "{}", nil, fmt.Errorf(errBadArgTypeFmt, "struct", "nil"))
- tc := StrategicMergePatchTestCases{}
- err := yaml.Unmarshal(createStrategicMergePatchTestCaseData, &tc)
- if err != nil {
- t.Errorf("can't unmarshal test cases: %s\n", err)
- return
- }
- for _, c := range tc.TestCases {
- testTwoWayPatch(t, c)
- testThreeWayPatch(t, c)
- }
- }
- func testStrategicMergePatchWithCustomArguments(t *testing.T, description, original, patch string, dataStruct interface{}, err error) {
- _, err2 := StrategicMergePatch([]byte(original), []byte(patch), dataStruct)
- if err2 != err {
- if err2 == nil {
- t.Errorf("expected error: %s\ndid not occur in test case: %s", err, description)
- return
- }
- if err == nil || err2.Error() != err.Error() {
- t.Errorf("unexpected error: %s\noccurred in test case: %s", err2, description)
- return
- }
- }
- }
- func testTwoWayPatch(t *testing.T, c StrategicMergePatchTestCase) {
- original, expected, modified := twoWayTestCaseToJSONOrFail(t, c)
- actual, err := CreateTwoWayMergePatch(original, modified, mergeItem)
- if err != nil {
- t.Errorf("error: %s\nin test case: %s\ncannot create two way patch: %s:\n%s\n",
- err, c.Description, original, toYAMLOrError(c.StrategicMergePatchTestCaseData))
- return
- }
- testPatchCreation(t, expected, actual, c.Description)
- testPatchApplication(t, original, actual, modified, c.Description)
- }
- func twoWayTestCaseToJSONOrFail(t *testing.T, c StrategicMergePatchTestCase) ([]byte, []byte, []byte) {
- return testObjectToJSONOrFail(t, c.Original, c.Description),
- testObjectToJSONOrFail(t, c.TwoWay, c.Description),
- testObjectToJSONOrFail(t, c.Modified, c.Description)
- }
- func testThreeWayPatch(t *testing.T, c StrategicMergePatchTestCase) {
- original, modified, current, expected, result := threeWayTestCaseToJSONOrFail(t, c)
- actual, err := CreateThreeWayMergePatch(original, modified, current, mergeItem, false)
- if err != nil {
- if !IsConflict(err) {
- t.Errorf("error: %s\nin test case: %s\ncannot create three way patch:\n%s\n",
- err, c.Description, toYAMLOrError(c.StrategicMergePatchTestCaseData))
- return
- }
- if !strings.Contains(c.Description, "conflict") {
- t.Errorf("unexpected conflict: %s\nin test case: %s\ncannot create three way patch:\n%s\n",
- err, c.Description, toYAMLOrError(c.StrategicMergePatchTestCaseData))
- return
- }
- if len(c.Result) > 0 {
- actual, err := CreateThreeWayMergePatch(original, modified, current, mergeItem, true)
- if err != nil {
- t.Errorf("error: %s\nin test case: %s\ncannot force three way patch application:\n%s\n",
- err, c.Description, toYAMLOrError(c.StrategicMergePatchTestCaseData))
- return
- }
- testPatchCreation(t, expected, actual, c.Description)
- testPatchApplication(t, current, actual, result, c.Description)
- }
- return
- }
- if strings.Contains(c.Description, "conflict") || len(c.Result) < 1 {
- t.Errorf("error in test case: %s\nexpected conflict did not occur:\n%s\n",
- c.Description, toYAMLOrError(c.StrategicMergePatchTestCaseData))
- return
- }
- testPatchCreation(t, expected, actual, c.Description)
- testPatchApplication(t, current, actual, result, c.Description)
- }
- func threeWayTestCaseToJSONOrFail(t *testing.T, c StrategicMergePatchTestCase) ([]byte, []byte, []byte, []byte, []byte) {
- return testObjectToJSONOrFail(t, c.Original, c.Description),
- testObjectToJSONOrFail(t, c.Modified, c.Description),
- testObjectToJSONOrFail(t, c.Current, c.Description),
- testObjectToJSONOrFail(t, c.ThreeWay, c.Description),
- testObjectToJSONOrFail(t, c.Result, c.Description)
- }
- func testPatchCreation(t *testing.T, expected, actual []byte, description string) {
- sorted, err := sortMergeListsByName(actual, mergeItem)
- if err != nil {
- t.Errorf("error: %s\nin test case: %s\ncannot sort patch:\n%s\n",
- err, description, jsonToYAMLOrError(actual))
- return
- }
- if !reflect.DeepEqual(sorted, expected) {
- t.Errorf("error in test case: %s\nexpected patch:\n%s\ngot:\n%s\n",
- description, jsonToYAMLOrError(expected), jsonToYAMLOrError(sorted))
- return
- }
- }
- func testPatchApplication(t *testing.T, original, patch, expected []byte, description string) {
- result, err := StrategicMergePatch(original, patch, mergeItem)
- if err != nil {
- t.Errorf("error: %s\nin test case: %s\ncannot apply patch:\n%s\nto original:\n%s\n",
- err, description, jsonToYAMLOrError(patch), jsonToYAMLOrError(original))
- return
- }
- sorted, err := sortMergeListsByName(result, mergeItem)
- if err != nil {
- t.Errorf("error: %s\nin test case: %s\ncannot sort result object:\n%s\n",
- err, description, jsonToYAMLOrError(result))
- return
- }
- if !reflect.DeepEqual(sorted, expected) {
- format := "error in test case: %s\npatch application failed:\noriginal:\n%s\npatch:\n%s\nexpected:\n%s\ngot:\n%s\n"
- t.Errorf(format, description,
- jsonToYAMLOrError(original), jsonToYAMLOrError(patch),
- jsonToYAMLOrError(expected), jsonToYAMLOrError(sorted))
- return
- }
- }
- func testObjectToJSONOrFail(t *testing.T, o map[string]interface{}, description string) []byte {
- if o == nil {
- return nil
- }
- j, err := toJSON(o)
- if err != nil {
- t.Error(err)
- }
- r, err := sortMergeListsByName(j, mergeItem)
- if err != nil {
- t.Errorf("error: %s\nin test case: %s\ncannot sort object:\n%s\n", err, description, j)
- return nil
- }
- return r
- }
- func jsonToYAMLOrError(j []byte) string {
- y, err := jsonToYAML(j)
- if err != nil {
- return err.Error()
- }
- return string(y)
- }
- func toJSON(v interface{}) ([]byte, error) {
- j, err := json.Marshal(v)
- if err != nil {
- return nil, fmt.Errorf("json marshal failed: %v\n%v\n", err, spew.Sdump(v))
- }
- return j, nil
- }
- func jsonToYAML(j []byte) ([]byte, error) {
- y, err := yaml.JSONToYAML(j)
- if err != nil {
- return nil, fmt.Errorf("json to yaml failed: %v\n%v\n", err, j)
- }
- return y, nil
- }
- func TestHasConflicts(t *testing.T) {
- testCases := []struct {
- A interface{}
- B interface{}
- Ret bool
- }{
- {A: "hello", B: "hello", Ret: false}, // 0
- {A: "hello", B: "hell", Ret: true},
- {A: "hello", B: nil, Ret: true},
- {A: "hello", B: 1, Ret: true},
- {A: "hello", B: float64(1.0), Ret: true},
- {A: "hello", B: false, Ret: true},
- {A: 1, B: 1, Ret: false},
- {A: false, B: false, Ret: false},
- {A: float64(3), B: float64(3), Ret: false},
- {A: "hello", B: []interface{}{}, Ret: true}, // 6
- {A: []interface{}{1}, B: []interface{}{}, Ret: true},
- {A: []interface{}{}, B: []interface{}{}, Ret: false},
- {A: []interface{}{1}, B: []interface{}{1}, Ret: false},
- {A: map[string]interface{}{}, B: []interface{}{1}, Ret: true},
- {A: map[string]interface{}{}, B: map[string]interface{}{"a": 1}, Ret: false}, // 11
- {A: map[string]interface{}{"a": 1}, B: map[string]interface{}{"a": 1}, Ret: false},
- {A: map[string]interface{}{"a": 1}, B: map[string]interface{}{"a": 2}, Ret: true},
- {A: map[string]interface{}{"a": 1}, B: map[string]interface{}{"b": 2}, Ret: false},
- { // 15
- A: map[string]interface{}{"a": []interface{}{1}},
- B: map[string]interface{}{"a": []interface{}{1}},
- Ret: false,
- },
- {
- A: map[string]interface{}{"a": []interface{}{1}},
- B: map[string]interface{}{"a": []interface{}{}},
- Ret: true,
- },
- {
- A: map[string]interface{}{"a": []interface{}{1}},
- B: map[string]interface{}{"a": 1},
- Ret: true,
- },
- }
- for i, testCase := range testCases {
- out, err := HasConflicts(testCase.A, testCase.B)
- if err != nil {
- t.Errorf("%d: unexpected error: %v", i, err)
- }
- if out != testCase.Ret {
- t.Errorf("%d: expected %t got %t", i, testCase.Ret, out)
- continue
- }
- out, err = HasConflicts(testCase.B, testCase.A)
- if err != nil {
- t.Errorf("%d: unexpected error: %v", i, err)
- }
- if out != testCase.Ret {
- t.Errorf("%d: expected reversed %t got %t", i, testCase.Ret, out)
- }
- }
- }
- type PrecisionItem struct {
- Name string
- Int32 int32
- Int64 int64
- Float32 float32
- Float64 float64
- }
- var precisionItem PrecisionItem
- func TestNumberConversion(t *testing.T) {
- testcases := map[string]struct {
- Old string
- New string
- ExpectedPatch string
- ExpectedResult string
- }{
- "empty": {
- Old: `{}`,
- New: `{}`,
- ExpectedPatch: `{}`,
- ExpectedResult: `{}`,
- },
- "int32 medium": {
- Old: `{"int32":1000000}`,
- New: `{"int32":1000000,"name":"newname"}`,
- ExpectedPatch: `{"name":"newname"}`,
- ExpectedResult: `{"int32":1000000,"name":"newname"}`,
- },
- "int32 max": {
- Old: `{"int32":2147483647}`,
- New: `{"int32":2147483647,"name":"newname"}`,
- ExpectedPatch: `{"name":"newname"}`,
- ExpectedResult: `{"int32":2147483647,"name":"newname"}`,
- },
- "int64 medium": {
- Old: `{"int64":1000000}`,
- New: `{"int64":1000000,"name":"newname"}`,
- ExpectedPatch: `{"name":"newname"}`,
- ExpectedResult: `{"int64":1000000,"name":"newname"}`,
- },
- "int64 max": {
- Old: `{"int64":9223372036854775807}`,
- New: `{"int64":9223372036854775807,"name":"newname"}`,
- ExpectedPatch: `{"name":"newname"}`,
- ExpectedResult: `{"int64":9223372036854775807,"name":"newname"}`,
- },
- "float32 max": {
- Old: `{"float32":3.4028234663852886e+38}`,
- New: `{"float32":3.4028234663852886e+38,"name":"newname"}`,
- ExpectedPatch: `{"name":"newname"}`,
- ExpectedResult: `{"float32":3.4028234663852886e+38,"name":"newname"}`,
- },
- "float64 max": {
- Old: `{"float64":1.7976931348623157e+308}`,
- New: `{"float64":1.7976931348623157e+308,"name":"newname"}`,
- ExpectedPatch: `{"name":"newname"}`,
- ExpectedResult: `{"float64":1.7976931348623157e+308,"name":"newname"}`,
- },
- }
- for k, tc := range testcases {
- patch, err := CreateTwoWayMergePatch([]byte(tc.Old), []byte(tc.New), precisionItem)
- if err != nil {
- t.Errorf("%s: unexpected error %v", k, err)
- continue
- }
- if tc.ExpectedPatch != string(patch) {
- t.Errorf("%s: expected %s, got %s", k, tc.ExpectedPatch, string(patch))
- continue
- }
- result, err := StrategicMergePatch([]byte(tc.Old), patch, precisionItem)
- if err != nil {
- t.Errorf("%s: unexpected error %v", k, err)
- continue
- }
- if tc.ExpectedResult != string(result) {
- t.Errorf("%s: expected %s, got %s", k, tc.ExpectedResult, string(result))
- continue
- }
- }
- }
|