Better unit tests for eula.go which also validates the condition for window size check

Author: bgn42

cmd/ui/eula.go

@@ -106,18 +106,12 @@ func NewLicenseWindow(licenseTitle, licenseContents, promptText string) *License
 	licenseWindow.LayoutManager = func(g *gocui.Gui) error {
 		terminalWidth, terminalHeight := g.Size()
 
-		marginSize := 1
-		promptWindowHeight := 3
-
-		// License window dimensions
-		licenseWindowBeginX := marginSize
-		licenseWindowBeginY := marginSize
-		licenseWindowEndX := terminalWidth - marginSize
-		licenseWindowEndY := terminalHeight - marginSize - promptWindowHeight
-		if licenseWindowBeginX >= licenseWindowEndX || licenseWindowBeginY >= licenseWindowEndY {
-			return fmt.Errorf("increase size of license window, currently (%d, %d, %d, %d), cannot obtain user response", licenseWindowBeginX, licenseWindowBeginY, licenseWindowEndX, licenseWindowEndY)
+		// Compute rectangles and validate them
+		lbx, lby, lex, ley, pbx, pby, pex, pey := computeLicenseAndPromptRects(terminalWidth, terminalHeight)
+		if err := validateLicenseRect(lbx, lby, lex, ley); err != nil {
+			return err
 		}
-		if v, err := g.SetView("license", licenseWindowBeginX, licenseWindowBeginY, licenseWindowEndX, licenseWindowEndY); err != nil {
+		if v, err := g.SetView("license", lbx, lby, lex, ley); err != nil {
 			if err != gocui.ErrUnknownView {
 				log.Error("Cannot modify license window: ", err)
 				return err
@@ -128,14 +122,10 @@ func NewLicenseWindow(licenseTitle, licenseContents, promptText string) *License
 		}
 
 		// Prompt window dimensions
-		promptWindowBeginX := licenseWindowBeginX
-		promptWindowBeginY := licenseWindowEndY + marginSize
-		promptWindowEndX := licenseWindowEndX
-		promptWindowEndY := terminalHeight - marginSize
-		if promptWindowBeginX >= promptWindowEndX || promptWindowBeginY >= promptWindowEndY {
-			return fmt.Errorf("increase size of prompt window, currently (%d, %d, %d, %d)", promptWindowBeginX, promptWindowBeginY, promptWindowEndX, promptWindowEndY)
+		if err := validatePromptRect(pbx, pby, pex, pey); err != nil {
+			return err
 		}
-		if v, err := g.SetView("prompt", promptWindowBeginX, promptWindowBeginY, promptWindowEndX, promptWindowEndY); err != nil {
+		if v, err := g.SetView("prompt", pbx, pby, pex, pey); err != nil {
 			if err != gocui.ErrUnknownView {
 				log.Error("Cannot modify prompt window: ", err)
 				return err
@@ -201,6 +191,42 @@ func NewLicenseWindow(licenseTitle, licenseContents, promptText string) *License
 	return licenseWindow
 }
 
+// Helper to compute rectangles for license and prompt windows based on terminal size.
+// Uses the same constants as LayoutManager (marginSize=1, promptWindowHeight=3).
+func computeLicenseAndPromptRects(terminalWidth, terminalHeight int) (lbx, lby, lex, ley, pbx, pby, pex, pey int) {
+	marginSize := 1
+	promptWindowHeight := 3
+
+	// License window dimensions
+	lbx = marginSize
+	lby = marginSize
+	lex = terminalWidth - marginSize
+	ley = terminalHeight - marginSize - promptWindowHeight
+
+	// Prompt window dimensions
+	pbx = lbx
+	pby = ley + marginSize
+	pex = lex
+	pey = terminalHeight - marginSize
+	return
+}
+
+// validateLicenseRect mirrors the guard used before creating the license view.
+func validateLicenseRect(bx, by, ex, ey int) error {
+	if bx >= ex || by >= ey {
+		return fmt.Errorf("increase size of license window, currently (%d, %d, %d, %d), cannot obtain user response", bx, by, ex, ey)
+	}
+	return nil
+}
+
+// validatePromptRect mirrors the guard used before creating the prompt view.
+func validatePromptRect(bx, by, ex, ey int) error {
+	if bx >= ex || by >= ey {
+		return fmt.Errorf("increase size of prompt window, currently (%d, %d, %d, %d)", bx, by, ex, ey)
+	}
+	return nil
+}
+
 func (l *LicenseWindowType) Setup() error {
 	log.Debug("Setting up UI to display license")
 	g, err := gocui.NewGui(gocui.OutputNormal)

cmd/ui/eula_export.go

@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+/* Copyright Contributors to the cpackget project. */
+
+package ui
+
+// NOTE: These are small exported wrappers intended for tests.
+// They expose internal layout computations without changing runtime behavior.
+
+// ComputeLicenseAndPromptRectsForTest exposes computeLicenseAndPromptRects for tests.
+func ComputeLicenseAndPromptRectsForTest(terminalWidth, terminalHeight int) (int, int, int, int, int, int, int, int) {
+	return computeLicenseAndPromptRects(terminalWidth, terminalHeight)
+}
+
+// ValidateLicenseRectForTest exposes validateLicenseRect for tests.
+func ValidateLicenseRectForTest(bx, by, ex, ey int) error { return validateLicenseRect(bx, by, ex, ey) }
+
+// ValidatePromptRectForTest exposes validatePromptRect for tests.
+func ValidatePromptRectForTest(bx, by, ex, ey int) error { return validatePromptRect(bx, by, ex, ey) }

cmd/ui/eula_test.go

@@ -148,3 +148,29 @@ func TestNewLicenseWindow_AgreeDisagreeExtractHandlers(t *testing.T) {
 	assert.Equal(gocui.ErrQuit, err)
 	assert.True(ui.Extract, "Extract handler should set Extract to true")
 }
+
+func TestLayoutRectValidation(t *testing.T) {
+	assert := assert.New(t)
+
+	t.Run("license rect invalid when terminal too small", func(t *testing.T) {
+		lbx, lby, lex, ley, _, _, _, _ := ui.ComputeLicenseAndPromptRectsForTest(1, 1)
+		err := ui.ValidateLicenseRectForTest(lbx, lby, lex, ley)
+		assert.Error(err)
+		assert.Contains(err.Error(), "increase size of license window")
+	})
+
+	t.Run("prompt rect invalid when terminal too small", func(t *testing.T) {
+		// Choose width=2 so pbx==pex and triggers invalid prompt rect
+		_, _, _, _, pbx, pby, pex, pey := ui.ComputeLicenseAndPromptRectsForTest(2, 6)
+		err := ui.ValidatePromptRectForTest(pbx, pby, pex, pey)
+		if assert.Error(err) {
+			assert.Contains(err.Error(), "increase size of prompt window")
+		}
+	})
+
+	t.Run("rects valid on reasonable terminal size", func(t *testing.T) {
+		lbx, lby, lex, ley, pbx, pby, pex, pey := ui.ComputeLicenseAndPromptRectsForTest(80, 24)
+		assert.NoError(ui.ValidateLicenseRectForTest(lbx, lby, lex, ley))
+		assert.NoError(ui.ValidatePromptRectForTest(pbx, pby, pex, pey))
+	})
+}