Skip to content

Use assertThrows in terminal tests #2415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akurtakov merged 1 commit into from
Jan 9, 2026
+71 −133
Merged

Use assertThrows in terminal tests #2415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 38 additions & 11 deletions ...lipse.terminal.control/src/org/eclipse/terminal/internal/model/TerminalTextDataStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,14 @@ public LineSegment[] getLineSegments(int line, int column, int len) {

@Override
public char getChar(int line, int column) {
if (column >= fWidth) {
if (column < 0 || column >= fWidth) {
throw new IllegalArgumentException(
"Parameter 'column' must be >= 0 and less than 'width' (current value '" + fWidth + "')"); //$NON-NLS-1$ //$NON-NLS-2$
}
if (line < 0 || line >= fHeight) {
throw new IllegalArgumentException(
"Parameter 'line' must be >= 0 and less than 'height' (current value '" + fHeight + "')"); //$NON-NLS-1$ //$NON-NLS-2$
}
if (fChars[line] == null || column >= fChars[line].length) {
return 0;
}
Expand All @@ -162,19 +166,24 @@ public TerminalStyle getStyle(int line, int column) {
return fStyle[line][column];
}

void ensureLineLength(int iLine, int length) {
void ensureLineLength(int line, int length) {
if (line < 0 || line >= fHeight) {
throw new IllegalArgumentException(
"Parameter 'line' must be >= 0 and less than 'height' (current value '" + fHeight + "')"); //$NON-NLS-1$ //$NON-NLS-2$
}
if (length > fWidth) {
throw new RuntimeException();
throw new IllegalArgumentException(
"Parameter 'length'(value='" + length + "') exceeds 'width'(value='" + fWidth + "')"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
if (fChars[iLine] == null) {
fChars[iLine] = new char[length];
} else if (fChars[iLine].length < length) {
fChars[iLine] = (char[]) resizeArray(fChars[iLine], length);
if (fChars[line] == null) {
fChars[line] = new char[length];
} else if (fChars[line].length < length) {
fChars[line] = (char[]) resizeArray(fChars[line], length);
}
if (fStyle[iLine] == null) {
fStyle[iLine] = new TerminalStyle[length];
} else if (fStyle[iLine].length < length) {
fStyle[iLine] = (TerminalStyle[]) resizeArray(fStyle[iLine], length);
if (fStyle[line] == null) {
fStyle[line] = new TerminalStyle[length];
} else if (fStyle[line].length < length) {
fStyle[line] = (TerminalStyle[]) resizeArray(fStyle[line], length);
}
}

Expand All @@ -192,6 +201,10 @@ public void setChars(int line, int column, char[] chars, TerminalStyle style) {

@Override
public void setChars(int line, int column, char[] chars, int start, int len, TerminalStyle style) {
if (column < 0 || column >= fWidth) {
throw new IllegalArgumentException(
"Parameter 'column' must be >= 0 and less than 'width' (current value '" + fWidth + "')"); //$NON-NLS-1$ //$NON-NLS-2$
}
ensureLineLength(line, column + len);
for (int i = 0; i < len; i++) {
fChars[line][column + i] = chars[i + start];
Expand Down Expand Up @@ -287,6 +300,20 @@ public void copy(ITerminalTextData source) {

@Override
public void copyRange(ITerminalTextData source, int sourceStartLine, int destStartLine, int length) {
if (destStartLine < 0 || destStartLine + length > fHeight) {
throw new IllegalArgumentException(
"Value of 'destStartLine'+'length' parameters must be valid line (range [0-" //$NON-NLS-1$
+ fHeight + "). Parameter values: 'destStartLine'=" + destStartLine //$NON-NLS-1$
+ ", 'size'=" //$NON-NLS-1$
+ length);
}
if (sourceStartLine < 0 || sourceStartLine + length > source.getHeight()) {
throw new IllegalArgumentException(
"Value of 'sourceStartLine'+'length' parameters must be valid line (range [0-" //$NON-NLS-1$
+ source.getHeight() + "). Parameter values: 'sourceStartLine'=" + sourceStartLine //$NON-NLS-1$
+ ", 'size'=" //$NON-NLS-1$
+ length);
}
for (int i = 0; i < length; i++) {
copyLine(source, i + sourceStartLine, i + destStartLine);
}
Expand Down
26 changes: 7 additions & 19 deletions ...rc/org/eclipse/terminal/internal/connector/TerminalToRemoteInjectionOutputStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2008, 2018 Wind River Systems, Inc. and others.
* Copyright (c) 2008, 2026 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
Expand All @@ -13,7 +13,7 @@
package org.eclipse.terminal.internal.connector;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assertions.assertThrows;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand Down Expand Up @@ -72,20 +72,12 @@ public void testClose() throws IOException {
s.write('-');
OutputStream os = s.grabOutput();
// make sure the closed output does not inject anything
try {
os1.write('k');
fail("...");
} catch (Exception e) {
}
assertThrows(IOException.class, () -> os1.write('k'));
os.write('X');
s.write('a');
os.write('Y');
// make sure the closed output does not inject anything
try {
os1.write('l');
fail("...");
} catch (Exception e) {
}
assertThrows(IOException.class, () -> os1.write('l'));
s.write('b');
os.close();
assertEquals("begin:xyAB-XYab", new String(bs.toByteArray(), ENCODING));
Expand Down Expand Up @@ -127,14 +119,9 @@ public void testGrabOutput() throws IOException {
s.write("begin:".getBytes(ENCODING));
assertEquals("begin:", new String(bs.toByteArray(), ENCODING));
OutputStream os1 = s.grabOutput();
OutputStream os2;
try {
os2 = s.grabOutput();
fail("should fail until the foirst output is closed");
} catch (IOException e) {
}
assertThrows(IOException.class, () -> s.grabOutput(), "should fail until the first output is closed");
os1.close();
os2 = s.grabOutput();
OutputStream os2 = s.grabOutput();
assertEquals("begin:", new String(bs.toByteArray(), ENCODING));
os2.write("Test".getBytes(ENCODING));
assertEquals("begin:Test", new String(bs.toByteArray(), ENCODING));
Expand All @@ -147,6 +134,7 @@ public void testGrabOutput() throws IOException {
s.write('!');
assertEquals("begin:Test the west!", new String(bs.toByteArray(), ENCODING));
}

}

@Test
Expand Down
129 changes: 26 additions & 103 deletions ....terminal.test/src/org/eclipse/terminal/internal/model/AbstractITerminalTextDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

import org.eclipse.terminal.model.ITerminalTextData;
import org.eclipse.terminal.model.ITerminalTextDataReadOnly;
Expand Down Expand Up @@ -188,12 +188,7 @@ public void testResizeFailure() {
String s = "12345\n" + "abcde\n" + "ABCDE";
fill(term, 0, 0, s);
assertEqualsTerm(s, toMultiLineText(term));
try {
term.setDimensions(-3, 4);
fail();
} catch (RuntimeException e) {
// OK
}
assertThrows(IllegalArgumentException.class, () -> term.setDimensions(-3, 4));
// assertEquals(5, term.getWidth());
// assertEquals(3, term.getHeight());
// assertEquals(s, toSimpleText(term));
Expand Down Expand Up @@ -303,36 +298,12 @@ public void testGetChar() {
assertEquals('C', term.getChar(2, 2));
assertEquals('D', term.getChar(2, 3));
assertEquals('E', term.getChar(2, 4));
try {
term.getChar(0, -1);
fail();
} catch (RuntimeException e) {
}
try {
term.getChar(-1, -1);
fail();
} catch (RuntimeException e) {
}
try {
term.getChar(-1, 0);
fail();
} catch (RuntimeException e) {
}
try {
term.getChar(0, 5);
fail();
} catch (RuntimeException e) {
}
try {
term.getChar(3, 5);
fail();
} catch (RuntimeException e) {
}
try {
term.getChar(3, 0);
fail();
} catch (RuntimeException e) {
}
assertThrows(IllegalArgumentException.class, () -> term.getChar(0, -1));
assertThrows(IllegalArgumentException.class, () -> term.getChar(-1, -1));
assertThrows(IllegalArgumentException.class, () -> term.getChar(-1, 0));
assertThrows(IllegalArgumentException.class, () -> term.getChar(0, 5));
assertThrows(IllegalArgumentException.class, () -> term.getChar(3, 5));
assertThrows(IllegalArgumentException.class, () -> term.getChar(3, 0));
}

@Test
Expand Down Expand Up @@ -398,12 +369,9 @@ public void testSetChars() {

term.setChars(3, 1, new char[] { '1', '2' }, null);
assertEqualsTerm("abc\n" + "bcd\n" + "cde\n" + "d12\n" + "efg\n" + "fgh", toMultiLineText(term));
try {
// check if we cannot exceed the range
term.setChars(4, 1, new char[] { '1', '2', '3', '4', '5' }, null);
fail();
} catch (RuntimeException e) {
}
// check if we cannot exceed the range
assertThrows(IllegalArgumentException.class,
() -> term.setChars(4, 1, new char[] { '1', '2', '3', '4', '5' }, null));

}

Expand Down Expand Up @@ -433,33 +401,12 @@ public void testSetCharsLen() {
assertEqualsTerm("ZYXWVU\n" + "ab4567\n" + "ABCDEF", toMultiLineText(term));

fill(term, s);
try {
term.setChars(1, 0, chars, 7, 10, null);
fail();
} catch (RuntimeException e) {
}
assertThrows(IllegalArgumentException.class, () -> term.setChars(1, 0, chars, 7, 10, null));
fill(term, s);
try {
term.setChars(1, -1, chars, 0, 2, null);
fail();
} catch (RuntimeException e) {
}
try {
term.setChars(-1, 1, chars, 0, 2, null);
fail();
} catch (RuntimeException e) {
}
try {
term.setChars(1, 10, chars, 0, 2, null);
fail();
} catch (RuntimeException e) {
}
try {
term.setChars(10, 1, chars, 0, 2, null);
fail();
} catch (RuntimeException e) {
}
// assertEquals(s, toSimpleText(term));
assertThrows(IllegalArgumentException.class, () -> term.setChars(1, -1, chars, 0, 2, null));
assertThrows(IllegalArgumentException.class, () -> term.setChars(-1, 1, chars, 0, 2, null));
assertThrows(IllegalArgumentException.class, () -> term.setChars(1, 10, chars, 0, 2, null));
assertThrows(IllegalArgumentException.class, () -> term.setChars(10, 1, chars, 0, 2, null));
}

@Test
Expand Down Expand Up @@ -527,30 +474,14 @@ public void testSetCopyLines() {
assertEqualsSimple(s, toSimple(term));
assertEqualsSimple("a2345", toSimple(termCopy));

try {
fillSimple(termCopy, sCopy);
termCopy.copyRange(term, 1, 1, 5);
fail();
} catch (RuntimeException e) {
}
try {
fillSimple(termCopy, sCopy);
termCopy.copyRange(term, 0, 0, 6);
fail();
} catch (RuntimeException e) {
}
try {
fillSimple(termCopy, sCopy);
termCopy.copyRange(term, 7, 0, 1);
fail();
} catch (RuntimeException e) {
}
try {
fillSimple(termCopy, sCopy);
termCopy.copyRange(term, 0, 7, 1);
fail();
} catch (RuntimeException e) {
}
fillSimple(termCopy, sCopy);
assertThrows(IllegalArgumentException.class, () -> termCopy.copyRange(term, 1, 1, 5));
fillSimple(termCopy, sCopy);
assertThrows(IllegalArgumentException.class, () -> termCopy.copyRange(term, 0, 0, 6));
fillSimple(termCopy, sCopy);
assertThrows(IllegalArgumentException.class, () -> termCopy.copyRange(term, 7, 0, 1));
fillSimple(termCopy, sCopy);
assertThrows(IllegalArgumentException.class, () -> termCopy.copyRange(term, 0, 7, 1));
}

@Test
Expand Down Expand Up @@ -690,16 +621,8 @@ public void testScrollPositive() {

@Test
public void testScrollFail() {
try {
scrollTest(5, 2, -1, "012345", "012345");
fail();
} catch (RuntimeException e) {
}
try {
scrollTest(0, 7, 1, "012345", " ");
fail();
} catch (RuntimeException e) {
}
assertThrows(IllegalArgumentException.class, () -> scrollTest(5, 2, -1, "012345", "012345"));
assertThrows(IllegalArgumentException.class, () -> scrollTest(0, 7, 1, "012345", " "));
}

/**
Expand Down
Loading