765 @DataProvider(name = "MergeCases", parallel = true) |
765 @DataProvider(name = "MergeCases", parallel = true) |
766 public Iterator<Object[]> mergeCasesProvider() { |
766 public Iterator<Object[]> mergeCasesProvider() { |
767 Collection<Object[]> cases = new ArrayList<>(); |
767 Collection<Object[]> cases = new ArrayList<>(); |
768 |
768 |
769 cases.addAll(makeMergeTestCases()); |
769 cases.addAll(makeMergeTestCases()); |
770 cases.addAll(makeMergeNullValueTestCases()); |
|
771 |
770 |
772 return cases.iterator(); |
771 return cases.iterator(); |
773 } |
772 } |
774 |
773 |
775 static Collection<Object[]> makeMergeTestCases() { |
774 static Collection<Object[]> makeMergeTestCases() { |
783 cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.OLDVALUE, Merging.Value.NEWVALUE, Merging.Merger.NULL, Merging.Value.ABSENT, Merging.Value.NULL }); |
782 cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.OLDVALUE, Merging.Value.NEWVALUE, Merging.Merger.NULL, Merging.Value.ABSENT, Merging.Value.NULL }); |
784 } |
783 } |
785 |
784 |
786 for( Object[] mapParams : makeAllRWMaps() ) { |
785 for( Object[] mapParams : makeAllRWMaps() ) { |
787 cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.OLDVALUE, Merging.Value.NEWVALUE, Merging.Merger.RESULT, Merging.Value.RESULT, Merging.Value.RESULT }); |
786 cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.OLDVALUE, Merging.Value.NEWVALUE, Merging.Merger.RESULT, Merging.Value.RESULT, Merging.Value.RESULT }); |
788 } |
|
789 |
|
790 return cases; |
|
791 } |
|
792 |
|
793 static Collection<Object[]> makeMergeNullValueTestCases() { |
|
794 Collection<Object[]> cases = new ArrayList<>(); |
|
795 |
|
796 for( Object[] mapParams : makeAllRWMapsWithNulls() ) { |
|
797 cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.OLDVALUE, Merging.Value.NULL, Merging.Merger.NULL, Merging.Value.ABSENT, Merging.Value.NULL }); |
|
798 } |
|
799 |
|
800 for( Object[] mapParams : makeAllRWMapsWithNulls() ) { |
|
801 cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.OLDVALUE, Merging.Value.NULL, Merging.Merger.RESULT, Merging.Value.RESULT, Merging.Value.RESULT }); |
|
802 } |
|
803 |
|
804 for( Object[] mapParams : makeAllRWMapsWithNulls() ) { |
|
805 cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.ABSENT, Merging.Value.NULL, Merging.Merger.UNUSED, Merging.Value.ABSENT, Merging.Value.NULL }); |
|
806 } |
|
807 |
|
808 for( Object[] mapParams : makeAllRWMapsWithNulls() ) { |
|
809 cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.NULL, Merging.Value.NULL, Merging.Merger.UNUSED, Merging.Value.ABSENT, Merging.Value.NULL }); |
|
810 } |
|
811 |
|
812 for( Object[] mapParams : makeAllRWMapsWithNulls() ) { |
|
813 cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.NULL, Merging.Value.NEWVALUE, Merging.Merger.UNUSED, Merging.Value.NEWVALUE, Merging.Value.NEWVALUE }); |
|
814 } |
787 } |
815 |
788 |
816 return cases; |
789 return cases; |
817 } |
790 } |
818 |
791 |