Skip to content

Commit f3eac4a

Browse files
davetccdavetcc
authored
Merge pull request #507 from TcMenu/main-all-builder-theme
#500 migrate tests to integration to allow regular tests to run
2 parents 3b88c32 + 63e6066 commit f3eac4a

29 files changed

+71
-35
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: mvn -B install -Dgpg.skip=true --file tcMenuJavaApi/pom.xml
2727

2828
- name: Build tcMenuGenerator
29-
run: mvn -B compile -Dgpg.skip=true --file tcMenuGenerator/pom.xml
29+
run: mvn -B install -Dgpg.skip=true --file tcMenuGenerator/pom.xml
3030

3131
- name: Build embeddedJavaExample
3232
run: mvn -B package --file embeddedJavaExample/pom.xml

‎.idea/modules.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tcMenuGenerator/menuEditorUI.iml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module version="4">
3+
<component name="AdditionalModuleElements">
4+
<content url="file://$MODULE_DIR$" dumb="true">
5+
<sourceFolder url="file://$MODULE_DIR$/src/it" isTestSource="true" />
6+
</content>
7+
</component>
8+
</module>

‎tcMenuGenerator/pom.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,25 @@
301301
</execution>
302302
</executions>
303303
</plugin>
304+
<plugin>
305+
<groupId>org.codehaus.mojo</groupId>
306+
<artifactId>build-helper-maven-plugin</artifactId>
307+
<version>3.6.0</version>
308+
<executions>
309+
<execution>
310+
<id>add-test-source</id>
311+
<phase>generate-sources</phase>
312+
<goals>
313+
<goal>add-test-source</goal>
314+
</goals>
315+
<configuration>
316+
<sources>
317+
<source>src/it/java</source>
318+
</sources>
319+
</configuration>
320+
</execution>
321+
</executions>
322+
</plugin>
304323
</plugins>
305324
</build>
306325
</project>

tcMenuGenerator/src/test/java/com/thecoderscorner/menu/editorint/uitests/AboutDialogTestCases.java renamed to tcMenuGenerator/src/it/com/thecoderscorner/menu/uitests/AboutDialogTestCases.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
*/
66

7-
package com.thecoderscorner.menu.editorint.uitests;
7+
package com.thecoderscorner.menu.uitests;
88

99
import com.thecoderscorner.menu.editorui.dialog.AboutDialog;
1010
import com.thecoderscorner.menu.editorui.storage.ConfigurationStorage;

tcMenuGenerator/src/test/java/com/thecoderscorner/menu/editorint/uitests/AddDialogTestCases.java renamed to tcMenuGenerator/src/it/com/thecoderscorner/menu/uitests/AddDialogTestCases.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
*/
66

7-
package com.thecoderscorner.menu.editorint.uitests;
7+
package com.thecoderscorner.menu.uitests;
88

99
import com.thecoderscorner.menu.domain.*;
1010
import com.thecoderscorner.menu.editorui.dialog.NewItemDialog;
@@ -17,7 +17,8 @@
1717
import org.testfx.framework.junit5.ApplicationExtension;
1818
import org.testfx.framework.junit5.Start;
1919

20-
import static com.thecoderscorner.menu.domain.CustomBuilderMenuItem.CustomMenuType.*;
20+
import static com.thecoderscorner.menu.domain.CustomBuilderMenuItem.CustomMenuType.AUTHENTICATION;
21+
import static com.thecoderscorner.menu.domain.CustomBuilderMenuItem.CustomMenuType.REMOTE_IOT_MONITOR;
2122
import static org.assertj.core.api.Assertions.assertThat;
2223
import static org.junit.jupiter.api.Assertions.assertTrue;
2324
import static org.mockito.Mockito.*;

tcMenuGenerator/src/test/java/com/thecoderscorner/menu/editorui/util/BackupManagerTest.java renamed to tcMenuGenerator/src/it/com/thecoderscorner/menu/uitests/BackupManagerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package com.thecoderscorner.menu.editorui.util;
1+
package com.thecoderscorner.menu.uitests;
22

33
import com.thecoderscorner.menu.editorui.storage.ConfigurationStorage;
4+
import com.thecoderscorner.menu.editorui.util.BackupManager;
45
import org.junit.jupiter.api.AfterEach;
56
import org.junit.jupiter.api.BeforeEach;
67
import org.junit.jupiter.api.Test;

tcMenuGenerator/src/test/java/com/thecoderscorner/menu/editorint/uitests/EditEEPROMTestCase.java renamed to tcMenuGenerator/src/it/com/thecoderscorner/menu/uitests/EditEEPROMTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thecoderscorner.menu.editorint.uitests;
1+
package com.thecoderscorner.menu.uitests;
22

33
import com.thecoderscorner.menu.editorui.dialog.SelectEepromTypeDialog;
44
import com.thecoderscorner.menu.editorui.generator.parameters.eeprom.*;

tcMenuGenerator/src/test/java/com/thecoderscorner/menu/editorint/uitests/EditFontTestCase.java renamed to tcMenuGenerator/src/it/com/thecoderscorner/menu/uitests/EditFontTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thecoderscorner.menu.editorint.uitests;
1+
package com.thecoderscorner.menu.uitests;
22

33
import com.thecoderscorner.menu.editorui.MenuEditorApp;
44
import com.thecoderscorner.menu.editorui.dialog.ChooseFontDialog;

tcMenuGenerator/src/test/java/com/thecoderscorner/menu/editorint/uitests/GenerateCodeDialogTest.java renamed to tcMenuGenerator/src/it/com/thecoderscorner/menu/uitests/GenerateCodeDialogTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thecoderscorner.menu.editorint.uitests;
1+
package com.thecoderscorner.menu.uitests;
22

33
import com.thecoderscorner.embedcontrol.core.util.TccDatabaseUtilities;
44
import com.thecoderscorner.menu.editorui.MenuEditorApp;

0 commit comments

Comments
 (0)