[422485] Class extends SWTBotEclipseTestCase
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=422485
Signed-off-by: Mickael Istria <mistria@redhat.com>
Change-Id: I75a583933b31b66847431ba4899530f2dfd1fd48
diff --git a/org.eclipse.swtbot.generator.jdt.test/src/org/eclipse/swtbot/generator/jdt/test/RecordComboTest.java b/org.eclipse.swtbot.generator.jdt.test/src/org/eclipse/swtbot/generator/jdt/test/RecordComboTest.java
index 23f9758..0785131 100644
--- a/org.eclipse.swtbot.generator.jdt.test/src/org/eclipse/swtbot/generator/jdt/test/RecordComboTest.java
+++ b/org.eclipse.swtbot.generator.jdt.test/src/org/eclipse/swtbot/generator/jdt/test/RecordComboTest.java
@@ -11,7 +11,8 @@
public class RecordComboTest extends AbstractJDTGeneratorTest {
private String combo = "bot.comboBox().setText(\"kikoo\");";
- private String text = "publicclassFirstClass{publicvoidfirstMethod(){";
+ private String text = "import org.eclipse.swtbot.eclipse.finder.SWTBotEclipseTestCase;" +
+ "public class FirstClass extends SWTBotEclipseTestCase {public void firstMethod() {";
@Override
@@ -24,8 +25,9 @@
bot.waitUntil(shellIsActive("test shell"),2000);
this.bot.comboBox().setText("kikoo");
flushEvents();
+ String expectedText = (text + combo + "}}").replaceAll("\\s", "");
String fixedText = this.bot.shell("SWTBot Test Recorder").bot().styledText().getText().replaceAll("\\s", "");
- Assert.assertEquals(text+combo+"}}", fixedText);
+ Assert.assertEquals(expectedText, fixedText);
}
}
diff --git a/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/document/ClassDocument.java b/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/document/ClassDocument.java
index 5de5415..68adf47 100644
--- a/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/document/ClassDocument.java
+++ b/org.eclipse.swtbot.generator.jdt/src/org/eclipse/swtbot/generator/jdt/editor/document/ClassDocument.java
@@ -37,8 +37,10 @@
public ClassDocument(String className) {
super();
- set("\npublic class " + className + "{\n\n}");
+ set("import org.eclipse.swtbot.eclipse.finder.SWTBotEclipseTestCase;\n\n" +
+ "public class " + className + " extends SWTBotEclipseTestCase {\n\n}");
imports = new HashSet<String>();
+ imports.add("org.eclipse.swtbot.eclipse.finder.SWTBotEclipseTestCase");
methods = new ArrayList<Method>();
classAnnotations = new ArrayList<AnnotationRule>();
}