migrate patch building tests

pkg/integration/components/views.go

@@ -40,34 +40,97 @@ func (self *Views) Secondary() *ViewDriver {
 }
 
 func (self *Views) regularView(viewName string) *ViewDriver {
-	return self.newStaticViewDriver(viewName, nil)
+	return self.newStaticViewDriver(viewName, nil, nil, nil)
 }
 
 func (self *Views) patchExplorerViewByName(viewName string) *ViewDriver {
-	return self.newStaticViewDriver(viewName, func() ([]string, error) {
-		ctx := self.t.gui.ContextForView(viewName).(*context.PatchExplorerContext)
-		state := ctx.GetState()
-		if state == nil {
-			return nil, errors.New("Expected patch explorer to be activated")
-		}
-		selectedContent := state.PlainRenderSelected()
-		// the above method returns a string with a trailing newline so we need to remove that before splitting
-		selectedLines := strings.Split(strings.TrimSuffix(selectedContent, "\n"), "\n")
-		return selectedLines, nil
-	})
+	return self.newStaticViewDriver(
+		viewName,
+		func() ([]string, error) {
+			ctx := self.t.gui.ContextForView(viewName).(*context.PatchExplorerContext)
+			state := ctx.GetState()
+			if state == nil {
+				return nil, errors.New("Expected patch explorer to be activated")
+			}
+			selectedContent := state.PlainRenderSelected()
+			// the above method returns a string with a trailing newline so we need to remove that before splitting
+			selectedLines := strings.Split(strings.TrimSuffix(selectedContent, "\n"), "\n")
+			return selectedLines, nil
+		},
+		func() (int, int, error) {
+			ctx := self.t.gui.ContextForView(viewName).(*context.PatchExplorerContext)
+			state := ctx.GetState()
+			if state == nil {
+				return 0, 0, errors.New("Expected patch explorer to be activated")
+			}
+			startIdx, endIdx := state.SelectedRange()
+			return startIdx, endIdx, nil
+		},
+		func() (int, error) {
+			ctx := self.t.gui.ContextForView(viewName).(*context.PatchExplorerContext)
+			state := ctx.GetState()
+			if state == nil {
+				return 0, errors.New("Expected patch explorer to be activated")
+			}
+			return state.GetSelectedLineIdx(), nil
+		},
+	)
 }
 
 // 'static' because it'll always refer to the same view, as opposed to the 'main' view which could actually be
 // one of several views, or the 'current' view which depends on focus.
-func (self *Views) newStaticViewDriver(viewName string, getSelectedLinesFn func() ([]string, error)) *ViewDriver {
+func (self *Views) newStaticViewDriver(
+	viewName string,
+	getSelectedLinesFn func() ([]string, error),
+	getSelectedLineRangeFn func() (int, int, error),
+	getSelectedLineIdxFn func() (int, error),
+) *ViewDriver {
 	return &ViewDriver{
-		context:            fmt.Sprintf("%s view", viewName),
-		getView:            func() *gocui.View { return self.t.gui.View(viewName) },
-		getSelectedLinesFn: getSelectedLinesFn,
-		t:                  self.t,
+		context:              fmt.Sprintf("%s view", viewName),
+		getView:              func() *gocui.View { return self.t.gui.View(viewName) },
+		getSelectedLinesFn:   getSelectedLinesFn,
+		getSelectedRangeFn:   getSelectedLineRangeFn,
+		getSelectedLineIdxFn: getSelectedLineIdxFn,
+		t:                    self.t,
 	}
 }
 
+func (self *Views) MergeConflicts() *ViewDriver {
+	viewName := "mergeConflicts"
+	return self.newStaticViewDriver(
+		viewName,
+		func() ([]string, error) {
+			ctx := self.t.gui.ContextForView(viewName).(*context.MergeConflictsContext)
+			state := ctx.GetState()
+			if state == nil {
+				return nil, errors.New("Expected patch explorer to be activated")
+			}
+			selectedContent := strings.Split(state.PlainRenderSelected(), "\n")
+
+			return selectedContent, nil
+		},
+		func() (int, int, error) {
+			ctx := self.t.gui.ContextForView(viewName).(*context.MergeConflictsContext)
+			state := ctx.GetState()
+			if state == nil {
+				return 0, 0, errors.New("Expected patch explorer to be activated")
+			}
+			startIdx, endIdx := state.GetSelectedRange()
+			return startIdx, endIdx, nil
+		},
+		// there is no concept of a cursor in the merge conflicts panel so we just return the start of the selection
+		func() (int, error) {
+			ctx := self.t.gui.ContextForView(viewName).(*context.MergeConflictsContext)
+			state := ctx.GetState()
+			if state == nil {
+				return 0, errors.New("Expected patch explorer to be activated")
+			}
+			startIdx, _ := state.GetSelectedRange()
+			return startIdx, nil
+		},
+	)
+}
+
 func (self *Views) Commits() *ViewDriver {
 	return self.regularView("commits")
 }
@@ -158,10 +221,6 @@ func (self *Views) Suggestions() *ViewDriver {
 	return self.regularView("suggestions")
 }
 
-func (self *Views) MergeConflicts() *ViewDriver {
-	return self.regularView("mergeConflicts")
-}
-
 func (self *Views) Search() *ViewDriver {
 	return self.regularView("search")
 }