def edit_line(): staticdiffmodel = _make_static_diffmodel() old_static_lines = list( ln.clone() for ln in staticdiffmodel.get_lines() ) editable = EditableDiffModel( staticdiffmodel ) # Change one line editable.edit_lines( 3, 3, directions.RIGHT, ( "edited", ) ) # The line before is unchanged ln = editable.get_line( 2 ) assert_strings_equal( ln.left, "line 3 here" ) assert_strings_equal( ln.right, "line 3 here" ) assert( ln.status == difflinetypes.IDENTICAL ) assert( ln.left_edited == False ) assert( ln.right_edited == False ) # The line itself is changed, and marked as EDITED ln = editable.get_line( 3 ) assert_strings_equal( ln.left, "line 4 here" ) assert_strings_equal( ln.right, "edited" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True ) # The line after is unchanged ln = editable.get_line( 4 ) assert_strings_equal( ln.left, "line 5 here" ) assert_strings_equal( ln.right, "line 5 here different" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == False ) # The underlying diffmodel has not been altered assert_lines_lists_equal( old_static_lines, staticdiffmodel.get_lines() )
def add_then_edit(): """If we add a line and then edit it later we get the right result.""" staticdiffmodel = _make_static_diffmodel() editable = EditableDiffModel( staticdiffmodel ) editable.add_lines( 1, directions.RIGHT, [ "Added line 1a", ] ) editable.edit_lines( 1, 1, directions.LEFT, [ "Edited line 1b" ] ) # Get some lines containing the add lines = editable.get_lines( 0, 3 ) assert( len( lines ) == 3 ) ln = lines[0] assert_strings_equal( ln.left, "line 1 here" ) assert_strings_equal( ln.right, "line 1 here" ) ln = lines[1] assert_strings_equal( ln.left, "Edited line 1b" ) assert_strings_equal( ln.right, "Added line 1a" ) ln = lines[2] assert_strings_equal( ln.left, "line 2 here" ) assert_strings_equal( ln.right, "line 2 here" )
def edit_doesnt_touch(): staticdiffmodel = _make_static_diffmodel() editable = EditableDiffModel( staticdiffmodel ) # Change 3 lines editable.edit_lines( 1, 3, directions.RIGHT, ( "edited 2", "edited 3", "edited 4" ) ) # Just ask for line 9 lines = editable.get_lines( 9, 10 ) assert( len( lines ) == 1 ) assert_strings_equal( lines[0].left, "previous 10" ) assert_strings_equal( lines[0].right, "line 10 here" ) assert( lines[0].status == difflinetypes.DIFFERENT ) assert( lines[0].left_edited == False ) assert( lines[0].right_edited == False ) ln = editable.get_line( 8 ) assert_strings_equal( ln.left, "line 9 here" ) assert_strings_equal( ln.right, "line 9 here" ) assert( ln.status == difflinetypes.IDENTICAL ) assert( ln.left_edited == False ) assert( ln.right_edited == False )
def edit_doesnt_change_anything(): staticdiffmodel = _make_static_diffmodel() old_static_lines = list( ln.clone() for ln in staticdiffmodel.get_lines() ) editable = EditableDiffModel( staticdiffmodel ) # Make a change that actually doesn't change any lines editable.edit_lines( 0, 2, directions.LEFT, [ "line 1 here", "line 2 here", "line 3 here" ] ) # Ask for lines 1 to 3 lines = editable.get_lines( 0, 3 ) assert( len( lines ) == 3 ) assert_strings_equal( lines[0].left, "line 1 here" ) assert_strings_equal( lines[0].right, "line 1 here" ) assert( lines[0].status == difflinetypes.IDENTICAL ) assert( lines[0].left_edited == False ) assert( lines[0].right_edited == False ) assert_strings_equal( lines[1].left, "line 2 here" ) assert_strings_equal( lines[1].right, "line 2 here" ) assert( lines[1].status == difflinetypes.IDENTICAL ) assert( lines[1].left_edited == False ) assert( lines[1].right_edited == False ) assert_strings_equal( lines[2].left, "line 3 here" ) assert_strings_equal( lines[2].right, "line 3 here" ) assert( lines[2].status == difflinetypes.IDENTICAL ) assert( lines[2].left_edited == False ) assert( lines[2].right_edited == False ) assert_lines_lists_equal( old_static_lines, staticdiffmodel.get_lines() )
def get_lines_beyond_end(): staticdiffmodel = _make_static_diffmodel() editable = EditableDiffModel( staticdiffmodel ) editable.edit_lines( 0, 2, directions.RIGHT, ( "edited 1b", "edited 2b", "edited 3b" ) ) # We ask for many lines, but get only those that exist lines = editable.get_lines( 0, 100 ) assert( len( lines ) == 10 )
def get_line_before_start(): staticdiffmodel = _make_static_diffmodel() editable = EditableDiffModel( staticdiffmodel ) editable.edit_lines( 2, 4, directions.RIGHT, ( "edited 3b", "edited 3b", "edited 3c" ) ) line = editable.get_line( 1 ) assert( line is not None ) # We ask for a line out of range and get None line = editable.get_line( -1 ) assert( line is None )
def get_line_beyond_end(): staticdiffmodel = _make_static_diffmodel() editable = EditableDiffModel( staticdiffmodel ) editable.edit_lines( 0, 2, directions.RIGHT, ( "edited 1b", "edited 2b", "edited 3b" ) ) line = editable.get_line( 9 ) assert( line is not None ) # We ask for a line out of range and get None line = editable.get_line( 10 ) assert( line is None )
def has_edit_affecting_side_nullchange(): staticdiffmodel = _make_static_diffmodel() editable = EditableDiffModel( staticdiffmodel ) assert( not editable.has_edit_affecting_side( directions.RIGHT ) ) assert( not editable.has_edit_affecting_side( directions.LEFT ) ) editable.edit_lines( 0, 2, directions.RIGHT, [ "line 1 here", "line 2 here", "line 3 here" ] ) editable.edit_lines( 1, 3, directions.RIGHT, [ "line 2 here", "line 3 here", "line 4 here" ] ) assert( not editable.has_edit_affecting_side( directions.LEFT ) ) assert( not editable.has_edit_affecting_side( directions.RIGHT ) )
def edit_both_sides(): staticdiffmodel = _make_static_diffmodel() old_static_lines = list( ln.clone() for ln in staticdiffmodel.get_lines() ) editable = EditableDiffModel( staticdiffmodel ) # Change 3 lines on left sides editable.edit_lines( 7, 9, directions.LEFT, ( "edited 8", "edited 9", "edited 10" ) ) # and 4 lines (overlapping) on right editable.edit_lines( 6, 9, directions.RIGHT, ( "edited 7", "edited 8 r", "edited 9", "edited 10 r" ) ) lines = editable.get_lines() # The line before is unchanged assert_strings_equal( lines[6].left, "line 7 here" ) assert_strings_equal( lines[6].right, "edited 7" ) assert( lines[6].status == difflinetypes.DIFFERENT ) assert( lines[6].left_edited == False ) assert( lines[6].right_edited == True ) # The relevant lines have been changed assert_strings_equal( lines[7].left, "edited 8" ) assert_strings_equal( lines[7].right, "edited 8 r" ) assert( lines[7].status == difflinetypes.DIFFERENT ) assert( lines[7].left_edited == True ) assert( lines[7].right_edited == True ) assert_strings_equal( lines[8].left, "edited 9" ) assert_strings_equal( lines[8].right, "edited 9" ) assert( lines[8].status == difflinetypes.IDENTICAL ) assert( lines[8].left_edited == True ) assert( lines[8].right_edited == True ) assert_strings_equal( lines[9].left, "edited 10" ) assert_strings_equal( lines[9].right, "edited 10 r" ) assert( lines[9].status == difflinetypes.DIFFERENT ) assert( lines[9].left_edited == True ) assert( lines[9].right_edited == True ) # The underlying diffmodel has not been altered assert_lines_lists_equal( old_static_lines, staticdiffmodel.get_lines() )
def has_edit_affecting_side(): staticdiffmodel = _make_static_diffmodel() editable = EditableDiffModel( staticdiffmodel ) assert( not editable.has_edit_affecting_side( directions.RIGHT ) ) assert( not editable.has_edit_affecting_side( directions.LEFT ) ) editable.edit_lines( 0, 2, directions.RIGHT, ( "edited 1a", "edited 2a", "edited 3a" ) ) editable.edit_lines( 1, 3, directions.RIGHT, ( "edited 2b", "edited 3b", "edited 4b" ) ) assert( editable.has_edit_affecting_side( directions.RIGHT ) ) assert( not editable.has_edit_affecting_side( directions.LEFT ) ) editable.delete_lines( 1, 1, directions.LEFT ) assert( editable.has_edit_affecting_side( directions.RIGHT ) ) assert( editable.has_edit_affecting_side( directions.LEFT ) )
def write_to_file(): fakefile = FakeFile() staticdiffmodel = _make_static_diffmodel() old_static_lines = list( ln.clone() for ln in staticdiffmodel.get_lines() ) editable = EditableDiffModel( staticdiffmodel ) # Make several overlapping changes, including a deletion editable.edit_lines( 0, 2, directions.RIGHT, ( "edited 1a", "edited 2a", "edited 3a" ) ) editable.edit_lines( 1, 3, directions.RIGHT, ( "edited 2b", "edited 3b", "edited 4b" ) ) editable.delete_lines( 1, 1, directions.RIGHT ) editable.edit_lines( 2, 4, directions.RIGHT, ( "edited 3c", "edited 4c", "edited 5c" ) ) editable.write_to_file( fakefile, directions.RIGHT ) assert_strings_equal( fakefile.txt, "edited 1a\n" + "edited 3c\n" + "edited 4c\n" + "edited 5c\n" + "line 6 here\n" + "line 7 here\n" + "line 8 here\n" + "line 9 here\n" + "line 10 here\n" ) assert_lines_lists_equal( old_static_lines, staticdiffmodel.get_lines() )
def edit_after_delete(): staticdiffmodel = _make_static_diffmodel() old_static_lines = list( ln.clone() for ln in staticdiffmodel.get_lines() ) editable = EditableDiffModel( staticdiffmodel ) # Delete then edit editable.delete_lines( 1, 1, directions.RIGHT ) editable.edit_lines( 2, 4, directions.RIGHT, ( "edited 3c", "edited 4c", "edited 5c" ) ) # Ask for lines 1 to 3 lines = editable.get_lines( 0, 3 ) assert( len( lines ) == 3 ) ln = lines[0] assert_strings_equal( ln.left, "line 1 here" ) assert_strings_equal( ln.right, "line 1 here" ) assert( ln.status == difflinetypes.IDENTICAL ) assert( ln.left_edited == False ) assert( ln.right_edited == False ) ln = lines[1] assert_strings_equal( ln.left, "line 2 here" ) assert_strings_equal( ln.right, None ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True ) ln = lines[2] assert_strings_equal( ln.left, "line 3 here" ) assert_strings_equal( ln.right, "edited 3c" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True ) assert_lines_lists_equal( old_static_lines, staticdiffmodel.get_lines() )
def edit_spans_before_and_after(): staticdiffmodel = _make_static_diffmodel() editable = EditableDiffModel( staticdiffmodel ) # Change all 10 lines editable.edit_lines( 0, 9, directions.RIGHT, ( "edited 1", "edited 2", "edited 3", "edited 4", "edited 5", "edited 6", "edited 7", "edited 8", "edited 9", "edited 10" ) ) # Just ask for lines 7, 8 and 9 lines = editable.get_lines( 6, 10 ) assert( len( lines ) == 4 ) assert_strings_equal( lines[0].left, "line 7 here" ) assert_strings_equal( lines[0].right, "edited 7" ) assert( lines[0].status == difflinetypes.DIFFERENT ) assert( lines[0].left_edited == False ) assert( lines[0].right_edited == True ) assert_strings_equal( lines[1].left, "line 8 here" ) assert_strings_equal( lines[1].right, "edited 8" ) assert( lines[1].status == difflinetypes.DIFFERENT ) assert( lines[1].left_edited == False ) assert( lines[1].right_edited == True ) assert_strings_equal( lines[2].left, "line 9 here" ) assert_strings_equal( lines[2].right, "edited 9" ) assert( lines[2].status == difflinetypes.DIFFERENT ) assert( lines[2].left_edited == False ) assert( lines[2].right_edited == True ) ln = editable.get_line( 0 ) assert_strings_equal( ln.left, "line 1 here" ) assert_strings_equal( ln.right, "edited 1" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True )
def edit_doesnt_change_line(): staticdiffmodel = _make_static_diffmodel() old_static_lines = list( ln.clone() for ln in staticdiffmodel.get_lines() ) editable = EditableDiffModel( staticdiffmodel ) # Make a change that actually doesn't change some lines editable.edit_lines( 0, 2, directions.LEFT, ( "line 1 here", "edited 2", "line 3 here" ) ) # Ask for lines 1 to 3 lines = editable.get_lines( 0, 3 ) assert( len( lines ) == 3 ) assert_strings_equal( lines[0].left, "line 1 here" ) assert_strings_equal( lines[0].right, "line 1 here" ) assert( lines[0].status == difflinetypes.IDENTICAL ) assert( lines[0].left_edited == True ) # Because this is part of a real # change, we do mark it as changed. # This may be fixed in future assert( lines[0].right_edited == False ) assert_strings_equal( lines[1].left, "edited 2" ) assert_strings_equal( lines[1].right, "line 2 here" ) assert( lines[1].status == difflinetypes.DIFFERENT ) assert( lines[1].left_edited == True ) assert( lines[1].right_edited == False ) assert_strings_equal( lines[2].left, "line 3 here" ) assert_strings_equal( lines[2].right, "line 3 here" ) assert( lines[2].status == difflinetypes.IDENTICAL ) assert( lines[2].left_edited == True ) # Because this is part of a real # change, we do mark it as changed. # This may be fixed in future assert( lines[2].right_edited == False ) assert_lines_lists_equal( old_static_lines, staticdiffmodel.get_lines() )
def edit_ends_after(): staticdiffmodel = _make_static_diffmodel() editable = EditableDiffModel( staticdiffmodel ) # Change 3 lines editable.edit_lines( 6, 9, directions.RIGHT, ( "edited 7", "edited 8", "edited 9", "edited 10" ) ) # Just ask for lines 6 and 7 lines = editable.get_lines( 5, 7 ) assert( len( lines ) == 2 ) assert_strings_equal( lines[0].left, "line 6 here" ) assert_strings_equal( lines[0].right, "line 6 here" ) assert( lines[0].status == difflinetypes.IDENTICAL ) assert( lines[0].left_edited == False ) assert( lines[0].right_edited == False ) assert_strings_equal( lines[1].left, "line 7 here" ) assert_strings_equal( lines[1].right, "edited 7" ) assert( lines[1].status == difflinetypes.DIFFERENT ) assert( lines[1].left_edited == False ) assert( lines[1].right_edited == True )
def edit_starts_before(): staticdiffmodel = _make_static_diffmodel() editable = EditableDiffModel( staticdiffmodel ) # Change 3 lines editable.edit_lines( 6, 9, directions.RIGHT, ( "edited 7", "edited 8", "edited 9", "edited 10" ) ) # Just ask for lines 8 and 9 lines = editable.get_lines( 8 ) assert( len( lines ) == 2 ) assert_strings_equal( lines[0].left, "line 9 here" ) assert_strings_equal( lines[0].right, "edited 9" ) assert( lines[0].status == difflinetypes.DIFFERENT ) assert( lines[0].left_edited == False ) assert( lines[0].right_edited == True ) assert_strings_equal( lines[1].left, "previous 10" ) assert_strings_equal( lines[1].right, "edited 10" ) assert( lines[1].status == difflinetypes.DIFFERENT ) assert( lines[1].left_edited == False ) assert( lines[1].right_edited == True )
def delete_line_plus_edits(): staticdiffmodel = _make_static_diffmodel() old_static_lines = list( ln.clone() for ln in staticdiffmodel.get_lines() ) editable = EditableDiffModel( staticdiffmodel ) # Make several overlapping changes, including a deletion editable.edit_lines( 0, 2, directions.RIGHT, ( "edited 1a", "edited 2a", "edited 3a" ) ) editable.edit_lines( 1, 3, directions.RIGHT, ( "edited 2b", "edited 3b", "edited 4b" ) ) editable.delete_lines( 1, 1, directions.RIGHT ) editable.edit_lines( 2, 4, directions.RIGHT, ( "edited 3c", "edited 4c", "edited 5c" ) ) # Ask for lines 1 to 3 lines = editable.get_lines( 0, 3 ) assert( len( lines ) == 3 ) ln = lines[0] assert_strings_equal( ln.left, "line 1 here" ) assert_strings_equal( ln.right, "edited 1a" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True ) ln = lines[1] assert_strings_equal( ln.left, "line 2 here" ) assert_strings_equal( ln.right, None ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True ) ln = lines[2] assert_strings_equal( ln.left, "line 3 here" ) assert_strings_equal( ln.right, "edited 3c" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True ) assert_lines_lists_equal( old_static_lines, staticdiffmodel.get_lines() )
def several_edits(): staticdiffmodel = _make_static_diffmodel() old_static_lines = list( ln.clone() for ln in staticdiffmodel.get_lines() ) editable = EditableDiffModel( staticdiffmodel ) # Make several overlapping changes editable.edit_lines( 0, 2, directions.RIGHT, ( "edited 1a", "edited 2a", "edited 3a" ) ) editable.edit_lines( 1, 3, directions.RIGHT, ( "edited 2b", "edited 3b", "edited 4b" ) ) editable.edit_lines( 2, 4, directions.RIGHT, ( "edited 3c", "edited 4c", "edited 5c" ) ) # Ask for lines 1 to 4 lines = editable.get_lines( 0, 4 ) assert( len( lines ) == 4 ) assert_strings_equal( lines[0].left, "line 1 here" ) assert_strings_equal( lines[0].right, "edited 1a" ) assert( lines[0].status == difflinetypes.DIFFERENT ) assert( lines[0].left_edited == False ) assert( lines[0].right_edited == True ) assert_strings_equal( lines[1].left, "line 2 here" ) assert_strings_equal( lines[1].right, "edited 2b" ) assert( lines[1].status == difflinetypes.DIFFERENT ) assert( lines[1].left_edited == False ) assert( lines[1].right_edited == True ) assert_strings_equal( lines[2].left, "line 3 here" ) assert_strings_equal( lines[2].right, "edited 3c" ) assert( lines[2].status == difflinetypes.DIFFERENT ) assert( lines[2].left_edited == False ) assert( lines[2].right_edited == True ) assert_strings_equal( lines[3].left, "line 4 here" ) assert_strings_equal( lines[3].right, "edited 4c" ) assert( lines[3].status == difflinetypes.DIFFERENT ) assert( lines[3].left_edited == False ) assert( lines[3].right_edited == True ) assert_lines_lists_equal( old_static_lines, staticdiffmodel.get_lines() )
def has_edit_affecting_side_after_save(): staticdiffmodel = _make_static_diffmodel() editable = EditableDiffModel( staticdiffmodel ) editable.edit_lines( 0, 2, directions.RIGHT, ( "edited 1a", "edited 2a", "edited 3a" ) ) editable.edit_lines( 0, 2, directions.LEFT, ( "edited left 1a", "edited left 2a", "edited left 3a" ) ) assert( editable.has_edit_affecting_side( directions.RIGHT ) ) assert( editable.has_edit_affecting_side( directions.LEFT ) ) lines = editable.get_lines( 0, 3 ) assert( len( lines ) == 3 ) ln = lines[0] assert_strings_equal( ln.left, "edited left 1a" ) assert_strings_equal( ln.right, "edited 1a" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == True ) assert( ln.right_edited == True ) editable.set_save_point( directions.LEFT ) lines = editable.get_lines( 0, 3 ) assert( len( lines ) == 3 ) ln = lines[0] assert_strings_equal( ln.left, "edited left 1a" ) assert_strings_equal( ln.right, "edited 1a" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True ) assert( editable.has_edit_affecting_side( directions.RIGHT ) ) assert( not editable.has_edit_affecting_side( directions.LEFT ) ) editable.edit_lines( 0, 2, directions.RIGHT, ( "edited 1b", "edited 2b", "edited 3b" ) ) editable.set_save_point( directions.RIGHT ) assert( not editable.has_edit_affecting_side( directions.RIGHT ) ) assert( not editable.has_edit_affecting_side( directions.LEFT ) ) lines = editable.get_lines( 0, 3 ) assert( len( lines ) == 3 ) ln = lines[0] assert_strings_equal( ln.left, "edited left 1a" ) assert_strings_equal( ln.right, "edited 1b" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == False ) editable.add_lines( 3, directions.LEFT, [ "Added line 1", "Added line 1", "Added line 1" ] ) assert( not editable.has_edit_affecting_side( directions.RIGHT ) ) assert( editable.has_edit_affecting_side( directions.LEFT ) ) editable.add_lines( 3, directions.RIGHT, [ "Added line 1", "Added line 1", "Added line 1" ] ) assert( editable.has_edit_affecting_side( directions.RIGHT ) ) assert( editable.has_edit_affecting_side( directions.LEFT ) ) editable.set_save_point( directions.LEFT ) assert( editable.has_edit_affecting_side( directions.RIGHT ) ) assert( not editable.has_edit_affecting_side( directions.LEFT ) ) editable.set_save_point( directions.RIGHT ) assert( not editable.has_edit_affecting_side( directions.RIGHT ) ) assert( not editable.has_edit_affecting_side( directions.LEFT ) )
def several_edits_and_adds(): staticdiffmodel = _make_static_diffmodel() old_static_lines = list( ln.clone() for ln in staticdiffmodel.get_lines() ) editable = EditableDiffModel( staticdiffmodel ) # Make several overlapping changes editable.edit_lines( 0, 2, directions.RIGHT, ( "edited 1a", "edited 2a", "edited 3a" ) ) editable.add_lines( 1, directions.RIGHT, ( [ "Added 1a+1", "Added 1a+4"] ) ) editable.add_lines( 2, directions.LEFT, ( [ "Added 1a+2", "Added 1a+3"] ) ) editable.edit_lines( 3, 5, directions.RIGHT, ( "edited 1a+3e", "edited 1a+4e", "edited 2b" ) ) editable.add_lines( 3, directions.RIGHT, ( [ "Added 2a+2a" ] ) ) editable.edit_lines( 7, 9, directions.RIGHT, ( "edited 3c", "edited 4c", "edited 5c" ) ) lines = editable.get_lines( 0, 11 ) assert( len( lines ) == 11 ) ln = lines[0] assert_strings_equal( ln.left, "line 1 here" ) assert_strings_equal( ln.right, "edited 1a" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True ) ln = lines[1] assert_strings_equal( ln.left, None ) assert_strings_equal( ln.right, "Added 1a+1" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True ) ln = lines[2] assert_strings_equal( ln.left, "Added 1a+2" ) assert_strings_equal( ln.right, None ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == True ) assert( ln.right_edited == False ) ln = lines[3] assert_strings_equal( ln.left, None ) assert_strings_equal( ln.right, "Added 2a+2a" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True ) ln = lines[4] assert_strings_equal( ln.left, "Added 1a+3" ) assert_strings_equal( ln.right, "edited 1a+3e" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == True ) assert( ln.right_edited == True ) ln = lines[5] assert_strings_equal( ln.left, None ) assert_strings_equal( ln.right, "edited 1a+4e" ) # Was "Added 1a+4" assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True ) ln = lines[6] assert_strings_equal( ln.left, "line 2 here" ) assert_strings_equal( ln.right, "edited 2b" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True ) ln = lines[7] assert_strings_equal( ln.left, "line 3 here" ) assert_strings_equal( ln.right, "edited 3c" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True ) ln = lines[8] assert_strings_equal( ln.left, "line 4 here" ) assert_strings_equal( ln.right, "edited 4c" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True ) ln = lines[9] assert_strings_equal( ln.left, "line 5 here" ) assert_strings_equal( ln.right, "edited 5c" ) assert( ln.status == difflinetypes.DIFFERENT ) assert( ln.left_edited == False ) assert( ln.right_edited == True ) ln = lines[10] assert_strings_equal( ln.left, "line 6 here" ) assert_strings_equal( ln.right, "line 6 here" ) assert( ln.status == difflinetypes.IDENTICAL ) assert( ln.left_edited == False ) assert( ln.right_edited == False ) assert_lines_lists_equal( old_static_lines, staticdiffmodel.get_lines() )
