From aa4ca9ca48d364de27227de9fd7a6f43d0be97c1 Mon Sep 17 00:00:00 2001
From: Arthur VUAGNIAUX <arthur.vuagniaux@telecom-paristech.fr>
Date: Mon, 19 Nov 2018 14:52:05 +0100
Subject: [PATCH] Issue #71: Refactoring
---
.../test/UIBotTests.launch | 4 +--
...BasicTextTest.java => HelpFrameTests.java} | 14 ++++++----
...rameTest.java => MainFrameBasicTests.java} | 28 ++++++-------------
...ojectTests.java => ProjectBasicTests.java} | 4 +--
4 files changed, 21 insertions(+), 29 deletions(-)
rename ttool/src/test/java/ui/bot/{JFrameBasicTextTest.java => HelpFrameTests.java} (84%)
rename ttool/src/test/java/ui/bot/{MainFrameTest.java => MainFrameBasicTests.java} (93%)
rename ttool/src/test/java/ui/bot/{OpenProjectTests.java => ProjectBasicTests.java} (90%)
diff --git a/ttool/launch_configurations/test/UIBotTests.launch b/ttool/launch_configurations/test/UIBotTests.launch
index 3ea45b5675..3ab23bbf57 100644
--- a/ttool/launch_configurations/test/UIBotTests.launch
+++ b/ttool/launch_configurations/test/UIBotTests.launch
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
- <listEntry value="/ttool/src/test/java/ui/bot/MainFrameTest.java"/>
+ <listEntry value="/ttool/src/test/java/ui/bot/MainFrameBasicTests.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -26,7 +26,7 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/src/main/resources" path="5" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
- <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ui.bot.MainFrameTest"/>
+ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ui.bot.MainFrameBasicTests"/>
<listAttribute key="org.eclipse.jdt.launching.MODULEPATH"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="ttool"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
diff --git a/ttool/src/test/java/ui/bot/JFrameBasicTextTest.java b/ttool/src/test/java/ui/bot/HelpFrameTests.java
similarity index 84%
rename from ttool/src/test/java/ui/bot/JFrameBasicTextTest.java
rename to ttool/src/test/java/ui/bot/HelpFrameTests.java
index f33e5d90a6..76bd9f4a99 100644
--- a/ttool/src/test/java/ui/bot/JFrameBasicTextTest.java
+++ b/ttool/src/test/java/ui/bot/HelpFrameTests.java
@@ -1,13 +1,17 @@
/*
* Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Arthur VUAGNIAUX
+ *
+ * This file was one of the first test file created in order to now if we could test
+ * other frame. This one was for the help frame.
+ * There is not a lot of tests, or some complex tests.
+ * But if those tests do not work, there is an issue
*/
package ui.bot;
-import static org.junit.Assert.*;
-
import org.assertj.swing.edt.GuiActionRunner;
-import org.assertj.swing.fixture.*;
+import org.assertj.swing.fixture.FrameFixture;
+import org.assertj.swing.fixture.JButtonFixture;
import org.assertj.swing.junit.testcase.AssertJSwingJUnitTestCase;
import org.junit.Test;
@@ -18,13 +22,13 @@ import ui.util.IconManager;
import ui.window.JFrameBasicText;
/*
- * Class Main
+ * Class HelpFrameTests
* Creation: 12/10/2018
* @version 1.0 12/10/2018
* @author Arthur VUAGNIAUX
*/
-public class JFrameBasicTextTest extends AssertJSwingJUnitTestCase {
+public class HelpFrameTests extends AssertJSwingJUnitTestCase {
private FrameFixture window;
@Test
diff --git a/ttool/src/test/java/ui/bot/MainFrameTest.java b/ttool/src/test/java/ui/bot/MainFrameBasicTests.java
similarity index 93%
rename from ttool/src/test/java/ui/bot/MainFrameTest.java
rename to ttool/src/test/java/ui/bot/MainFrameBasicTests.java
index 4201e5af85..51685e34d0 100644
--- a/ttool/src/test/java/ui/bot/MainFrameTest.java
+++ b/ttool/src/test/java/ui/bot/MainFrameBasicTests.java
@@ -4,41 +4,29 @@
package ui.bot;
-import static org.junit.Assert.*;
+import static org.assertj.swing.finder.WindowFinder.findFrame;
-import java.awt.Frame;
-import java.awt.MouseInfo;
-import java.awt.Point;
import java.awt.event.KeyEvent;
-import javax.swing.JButton;
-import javax.swing.JMenuItem;
-
-import org.assertj.swing.core.GenericTypeMatcher;
-import org.assertj.swing.core.matcher.FrameMatcher;
import org.assertj.swing.edt.GuiActionRunner;
import org.assertj.swing.finder.JFileChooserFinder;
-import org.assertj.swing.fixture.*;
+import org.assertj.swing.fixture.FrameFixture;
+import org.assertj.swing.fixture.JButtonFixture;
+import org.assertj.swing.fixture.JFileChooserFixture;
+import org.assertj.swing.fixture.JMenuItemFixture;
import org.assertj.swing.junit.testcase.AssertJSwingJUnitTestCase;
import org.junit.Test;
-import static org.assertj.swing.finder.WindowFinder.findFrame;
-import static org.assertj.swing.finder.JFileChooserFinder.findFileChooser;
-
-import common.ConfigurationTTool;
-import common.SpecConfigTTool;
import myutil.TraceManager;
-import ui.util.IconManager;
-import ui.window.JFrameBasicText;
/*
- * Class MainFrameTest
+ * Class MainFrameBasicTests
* Creation: 09/10/2018
* @version 1.0 09/10/2018
* @author Arthur VUAGNIAUX
*/
-public class MainFrameTest extends AssertJSwingJUnitTestCase {
+public class MainFrameBasicTests extends AssertJSwingJUnitTestCase {
private FrameFixture window;
private FrameFixture window2;
@@ -49,7 +37,7 @@ public class MainFrameTest extends AssertJSwingJUnitTestCase {
KeyEvent.VK_O, KeyEvent.VK_D, KeyEvent.VK_E, KeyEvent.VK_L, KeyEvent.VK_I ,
KeyEvent.VK_N, KeyEvent.VK_G, KeyEvent.VK_SLASH};
- // Path : /git/TTool/modeling/my-elt-filter.xml
+ // Path : git/TTool/modeling/my-elt-filter.xml
private int[] model = {KeyEvent.VK_G, KeyEvent.VK_I, KeyEvent.VK_T, KeyEvent.VK_SLASH,
KeyEvent.VK_CAPS_LOCK, KeyEvent.VK_T, KeyEvent.VK_T, KeyEvent.VK_CAPS_LOCK,
KeyEvent.VK_O, KeyEvent.VK_O, KeyEvent.VK_L, KeyEvent.VK_SLASH, KeyEvent.VK_M,
diff --git a/ttool/src/test/java/ui/bot/OpenProjectTests.java b/ttool/src/test/java/ui/bot/ProjectBasicTests.java
similarity index 90%
rename from ttool/src/test/java/ui/bot/OpenProjectTests.java
rename to ttool/src/test/java/ui/bot/ProjectBasicTests.java
index b21ef5648c..bb41bbbcff 100644
--- a/ttool/src/test/java/ui/bot/OpenProjectTests.java
+++ b/ttool/src/test/java/ui/bot/ProjectBasicTests.java
@@ -12,13 +12,13 @@ import org.assertj.swing.fixture.FrameFixture;
import org.assertj.swing.junit.testcase.AssertJSwingJUnitTestCase;
/*
- * Class MainFrameTest
+ * Class ProjectBasicTests
* Creation: 19/11/2018
* @version 1.0 19/11/2018
* @author Arthur VUAGNIAUX
*/
-public class OpenProjectTests extends AssertJSwingJUnitTestCase {
+public class ProjectBasicTests extends AssertJSwingJUnitTestCase {
private FrameFixture window;
@Override
--
GitLab