mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2010-05-02 22:06:49 +00:00
parent 31a23d3fc0
commit 88b632405d
2 changed files with 57 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/AddBlockCommentTest.java
View file

@ -105,7 +105,7 @@ public class AddBlockCommentTest extends BaseUITestCase {
fDocument.set(before);
SourceRange range = new SourceRange( startLinePosition.getOffset(),
SourceRange range = new SourceRange(startLinePosition.getOffset(),
endLinePosition.getOffset() - startLinePosition.getOffset());
fEditor.setSelection(range, true);
@ -133,7 +133,7 @@ public class AddBlockCommentTest extends BaseUITestCase {
String before, String after) throws Exception {
fDocument.set(before);
SourceRange range = new SourceRange( startLinePosition.getOffset(),
SourceRange range = new SourceRange(startLinePosition.getOffset(),
endLinePosition.getOffset() - startLinePosition.getOffset());
fEditor.setSelection(range, true);

114
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/RemoveBlockCommentTest.java
View file

@ -81,15 +81,14 @@ public class RemoveBlockCommentTest extends BaseUITestCase {
protected void assertFormatterResult(
LinePosition startLinePosition,
LinePosition endLinePosition) throws Exception {
StringBuffer[] contents= getContentsForTest(2);
String before = contents[0].toString();
String after = contents[1].toString();
fDocument.set(before);
SourceRange range = new SourceRange( startLinePosition.getOffset(),
endLinePosition.getOffset()-startLinePosition.getOffset() );
SourceRange range = new SourceRange(startLinePosition.getOffset(),
endLinePosition.getOffset() - startLinePosition.getOffset());
fEditor.setSelection(range, true);
IAction commentAction= fEditor.getAction("RemoveBlockComment");
@ -117,11 +116,10 @@ public class RemoveBlockCommentTest extends BaseUITestCase {
LinePosition endLinePosition,
String before,
String after) throws Exception {
fDocument.set(before);
SourceRange range = new SourceRange( startLinePosition.getOffset(),
endLinePosition.getOffset()-startLinePosition.getOffset() );
SourceRange range = new SourceRange(startLinePosition.getOffset(),
endLinePosition.getOffset() - startLinePosition.getOffset());
fEditor.setSelection(range, true);
IAction commentAction= fEditor.getAction("RemoveBlockComment");
@ -132,33 +130,32 @@ public class RemoveBlockCommentTest extends BaseUITestCase {
String expected= after;
assertEquals(expected, fDocument.get());
}
//int i, /*j,*/ k;
//int i, j, k;
public void testUncommentPlain() throws Exception {
LinePosition startSelection = new LinePosition(1,10,fDocument);
LinePosition endSelection = new LinePosition(1,11,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(1, 10, fDocument);
LinePosition endSelection = new LinePosition(1, 11, fDocument);
assertFormatterResult(startSelection, endSelection);
}
//int /*j,*/ k;
//int j, k;
public void testRightBorderIn() throws Exception {
LinePosition startSelection = new LinePosition(1,10,fDocument);
LinePosition endSelection = new LinePosition(1,11,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(1, 10, fDocument);
LinePosition endSelection = new LinePosition(1, 11, fDocument);
assertFormatterResult(startSelection, endSelection);
}
//int /*j,*/ k;
//int /*j,*/ k;
public void testRightBorderOut() throws Exception {
LinePosition startSelection = new LinePosition(1,11,fDocument);
LinePosition endSelection = new LinePosition(1,12,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(1, 11, fDocument);
LinePosition endSelection = new LinePosition(1, 12, fDocument);
assertFormatterResult(startSelection, endSelection);
}
//123456789-123
@ -166,18 +163,18 @@ public class RemoveBlockCommentTest extends BaseUITestCase {
//int j, k;
public void testLeftBorderIn() throws Exception {
LinePosition startSelection = new LinePosition(1,5,fDocument);
LinePosition endSelection = new LinePosition(1,6,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(1, 5, fDocument);
LinePosition endSelection = new LinePosition(1, 6, fDocument);
assertFormatterResult(startSelection, endSelection);
}
//int /*j,*/ k;
//int /*j,*/ k;
public void testLeftBorderOut() throws Exception {
LinePosition startSelection = new LinePosition(1,4,fDocument);
LinePosition endSelection = new LinePosition(1,5,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(1, 4, fDocument);
LinePosition endSelection = new LinePosition(1, 5, fDocument);
assertFormatterResult(startSelection, endSelection);
}
//int /*i,
@ -188,9 +185,9 @@ public class RemoveBlockCommentTest extends BaseUITestCase {
// j,
// k;
public void testUncommentPartialLines1() throws Exception {
LinePosition startSelection = new LinePosition(1,7,fDocument);
LinePosition endSelection = new LinePosition(2,2,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(1, 7, fDocument);
LinePosition endSelection = new LinePosition(2, 2, fDocument);
assertFormatterResult(startSelection, endSelection);
}
//int i,
@ -201,9 +198,9 @@ public class RemoveBlockCommentTest extends BaseUITestCase {
// j,
// k;
public void testUncommentPartialLines2() throws Exception {
LinePosition startSelection = new LinePosition(2,1,fDocument);
LinePosition endSelection = new LinePosition(3,8,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(2, 1, fDocument);
LinePosition endSelection = new LinePosition(3, 8, fDocument);
assertFormatterResult(startSelection, endSelection);
}
//int i;
@ -214,9 +211,9 @@ public class RemoveBlockCommentTest extends BaseUITestCase {
//int j;
//int k;
public void testUncommentExactlyOneLineNoLoopingPlease() throws Exception {
LinePosition startSelection = new LinePosition(2,1,fDocument);
LinePosition endSelection = new LinePosition(3,1,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(2, 1, fDocument);
LinePosition endSelection = new LinePosition(3, 1, fDocument);
assertFormatterResult(startSelection, endSelection);
}
//int i;
@ -231,18 +228,18 @@ public class RemoveBlockCommentTest extends BaseUITestCase {
//int k;
//int l;
public void testUncommentTwoOrMoreLines() throws Exception {
LinePosition startSelection = new LinePosition(2,1,fDocument);
LinePosition endSelection = new LinePosition(4,1,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(2, 1, fDocument);
LinePosition endSelection = new LinePosition(4, 1, fDocument);
assertFormatterResult(startSelection, endSelection);
}
///*const*/ int i;
//const int i;
public void testUncommentFirstCharacterInFile() throws Exception {
LinePosition startSelection = new LinePosition(1,1,fDocument);
LinePosition endSelection = new LinePosition(1,6,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(1, 1, fDocument);
LinePosition endSelection = new LinePosition(1, 6, fDocument);
assertFormatterResult(startSelection, endSelection);
}
///*#include <x>*/
@ -251,9 +248,9 @@ public class RemoveBlockCommentTest extends BaseUITestCase {
//#include <x>
//#include <y>
public void testUncommentPreprocessorFirstLine() throws Exception {
LinePosition startSelection = new LinePosition(1,1,fDocument);
LinePosition endSelection = new LinePosition(1,6,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(1, 1, fDocument);
LinePosition endSelection = new LinePosition(1, 6, fDocument);
assertFormatterResult(startSelection, endSelection);
}
//int i; /*// comment*/
@ -262,9 +259,9 @@ public class RemoveBlockCommentTest extends BaseUITestCase {
//int i; // comment
//int j;
public void testUncommentCppComment() throws Exception {
LinePosition startSelection = new LinePosition(1,10,fDocument);
LinePosition endSelection = new LinePosition(1,12,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(1, 10, fDocument);
LinePosition endSelection = new LinePosition(1, 12, fDocument);
assertFormatterResult(startSelection, endSelection);
}
//#include <x>
@ -275,9 +272,9 @@ public class RemoveBlockCommentTest extends BaseUITestCase {
//#include <y>
//#include <z>
public void testUncommentSpecialPartition() throws Exception {
LinePosition startSelection = new LinePosition(2,1,fDocument);
LinePosition endSelection = new LinePosition(3,1,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(2, 1, fDocument);
LinePosition endSelection = new LinePosition(3, 1, fDocument);
assertFormatterResult(startSelection, endSelection);
}
//#include <x>
@ -292,9 +289,9 @@ public class RemoveBlockCommentTest extends BaseUITestCase {
// <y>
//#include <z>
public void testUncommentSpecialPartitionExtra() throws Exception {
LinePosition startSelection = new LinePosition(3,8,fDocument);
LinePosition endSelection = new LinePosition(3,10,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(3, 8, fDocument);
LinePosition endSelection = new LinePosition(3, 10, fDocument);
assertFormatterResult(startSelection, endSelection);
}
///*int i;*/
@ -305,9 +302,9 @@ public class RemoveBlockCommentTest extends BaseUITestCase {
//int j;
//int k;
public void testUncommentConnectedComments() throws Exception {
LinePosition startSelection = new LinePosition(1,5,fDocument);
LinePosition endSelection = new LinePosition(2,5,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(1, 5, fDocument);
LinePosition endSelection = new LinePosition(2, 5, fDocument);
assertFormatterResult(startSelection, endSelection);
}
//
@ -318,9 +315,9 @@ public class RemoveBlockCommentTest extends BaseUITestCase {
//
//
public void testUncommentEndOfFile() throws Exception {
LinePosition startSelection = new LinePosition(3,1,fDocument);
LinePosition endSelection = new LinePosition(5,2,fDocument);
assertFormatterResult(startSelection,endSelection);
LinePosition startSelection = new LinePosition(3, 1, fDocument);
LinePosition endSelection = new LinePosition(5, 2, fDocument);
assertFormatterResult(startSelection, endSelection);
}
public void testMixedEOLs() throws Exception {
@ -334,9 +331,8 @@ public class RemoveBlockCommentTest extends BaseUITestCase {
"int i;\r\n"
+ "int j;\n"
+ "int k;";
LinePosition startSelection = new LinePosition(2,1,fDocument);
LinePosition endSelection = new LinePosition(3,1,fDocument);
assertFormatterResult(startSelection,endSelection,before,after);
LinePosition startSelection = new LinePosition(2, 1, fDocument);
LinePosition endSelection = new LinePosition(3, 1, fDocument);
assertFormatterResult(startSelection, endSelection, before, after);
}
}