Add new IntegrationTest annotation #13249

swarajsaaj · 2020-12-12T06:53:51Z

This composite annotation is meant to abstract complexity of common
Integration test annotations in a single file. This commit also adds the
annotation to required integration test files.

Fix #12460

Please make sure the below checklist is followed for Pull Requests.

All continuous integration tests are green
Tests are added where necessary
jhipster-online was updated if necessary
Documentation is added/updated where necessary
Coding Rules & Commit Guidelines as per our CONTRIBUTING.md document are followed

When you are still working on the PR, consider converting it to Draft (bellow reviewers) and adding skip-ci label, you can still see CI build result at your branch.

This composite annotation is meant to abstract complexity of common Integration test annotations in a single file. This commit also adds the annotation to required integration test files. Fix jhipster#12460

Fix jhipster#12460

Move AbstractNeo4jIT and ReactiveSqlTestContainerExtension to base composite annotation Fix jhipster#12460

Fix jhipster#12460

pascalgrimaud · 2020-12-12T17:36:31Z

Thanks @swarajsaaj I'll review it soon !

pascalgrimaud · 2020-12-12T20:33:43Z

generators/server/files.js

+            templates: [
+                {
+                    file: 'package/IntegrationTest.java',
+                    renameTo: generator => `${generator.testDir}/${generator.mainClass}IntegrationTest.java`,


Not sure about my comment, but I think it's better to have simply IntegrationTest, as some project can have very long name, and this annotation will be so long.
What do you think ?

@pascalgrimaud Yes I agree annotation will be quite long for some (for e.g. @LibraryManagementSystemIntegrationTest is quite long), and package name provides enough namespace info already (com.librarymanagement.app.IntegrationTest) , so we can go with just @IntegrationTest

ok then, let's change to @IntegrationTest

@pascalgrimaud annotation refactored to @IntegrationTest. requested review

Rename <AppName>IntegrationTest annotation to IntegrationTest to avoid long length of annotation in case of long application names Fix jhipster#12460

Fix jhipster#12460

DanielFran · 2020-12-13T16:20:53Z

generators/server/templates/src/test/java/package/CassandraKeyspaceIT.java.ejs

-<%_ if (cacheProvider === 'redis') { _%>
-import <%= packageName %>.RedisTestContainerExtension;
-<%_ } _%>
+


Remove extra blank line

DanielFran · 2020-12-13T16:22:10Z

generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs

@@ -18,19 +18,11 @@
 -%>
 package <%= packageName %>.security;

+


Remove extra blank line

DanielFran · 2020-12-13T16:22:23Z

generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs

@@ -18,32 +18,20 @@
 -%>
 package <%= packageName %>.service;

+


Remove extra blank line

DanielFran · 2020-12-13T16:28:33Z

generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_oauth2.java.ejs

@@ -39,7 +30,7 @@ import <%= packageName %>.service.UserService;
 import org.junit.jupiter.api.BeforeEach;
 <%_ } _%>
 import org.junit.jupiter.api.Test;
-<%_ if (databaseType === 'neo4j' || cacheProvider === 'redis' || (reactive && ['mysql', 'postgresql', 'mssql'].includes(prodDatabaseType))) { _%>
+<%_ if (reactive && ['mysql', 'postgresql', 'mssql'].includes(prodDatabaseType)) { _%>


I believe this can be removed too, this condition is the same as 'reactiveSqlTestContainers'

Agreed, its an unused import.

DanielFran · 2020-12-13T16:29:22Z

...erver/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.ejs

 <%_ if (reactive && searchEngine === 'elasticsearch') { _%>
 import <%= packageName %>.repository.search.UserSearchRepository;
 <%_ } _%>
 import <%= packageName %>.security.AuthoritiesConstants;
 import org.junit.jupiter.api.Test;
-<%_ if (databaseType === 'neo4j' || cacheProvider === 'redis' || (reactive && ['mysql', 'postgresql', 'mssql'].includes(prodDatabaseType))) { _%>
+<%_ if (reactive && ['mysql', 'postgresql', 'mssql'].includes(prodDatabaseType)) { _%>


I believe this can be removed too, this condition is the same as 'reactiveSqlTestContainers'

Agreed, its an unused import.

DanielFran · 2020-12-13T16:29:38Z

generators/server/templates/src/test/java/package/web/rest/LogoutResourceIT.java.ejs

 import <%= packageName %>.config.TestSecurityConfiguration;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-<%_ if (databaseType === 'neo4j' || cacheProvider === 'redis' || (reactive && ['mysql', 'postgresql', 'mssql'].includes(prodDatabaseType))) { _%>
+<%_ if (reactive && ['mysql', 'postgresql', 'mssql'].includes(prodDatabaseType)) { _%>


I believe this can be removed too, this condition is the same as 'reactiveSqlTestContainers'

Agreed, its an unused import.

Fix jhipster#12460

swarajsaaj · 2020-12-16T15:47:28Z

Bounty claimed at https://opencollective.com/generator-jhipster/expenses/30044

pascalgrimaud · 2020-12-18T05:43:47Z

@swarajsaaj : approved, thanks for your work

Add new <AppName>IntegrationTest annotation

4a1fbe4

This composite annotation is meant to abstract complexity of common Integration test annotations in a single file. This commit also adds the annotation to required integration test files. Fix jhipster#12460

swarajsaaj mentioned this pull request Dec 12, 2020

Annotation for Integration Test #12460

Closed

swarajsaaj added 4 commits December 12, 2020 12:44

Add annotation in ExceptionTranslatorIT for reactive

0c70669

Fix jhipster#12460

Move Neo4J and reactivedatabase annotations to IntegrationTest

fee6b08

Move AbstractNeo4jIT and ReactiveSqlTestContainerExtension to base composite annotation Fix jhipster#12460

Fix missing bracket in EJS

6e17d5d

Fix jhipster#12460

Include missing annotation for EntityResourceIT

3021285

Fix jhipster#12460

DanielFran approved these changes Dec 12, 2020

View reviewed changes

pascalgrimaud self-requested a review December 12, 2020 17:36

pascalgrimaud added the pr: needs-review label Dec 12, 2020

pascalgrimaud reviewed Dec 12, 2020

View reviewed changes

Rename <AppName>IntegrationTest annotation to IntegrationTest

b036cf6

Rename <AppName>IntegrationTest annotation to IntegrationTest to avoid long length of annotation in case of long application names Fix jhipster#12460

DanielFran changed the title ~~Add new <AppName>IntegrationTest annotation~~ Add new IntegrationTest annotation Dec 13, 2020

DanielFran mentioned this pull request Dec 13, 2020

simplify integration tests by replaced long and repetitive annotations #12637

Closed

5 tasks

Fix class name in IntegrationTest annotation

6ad73d1

Fix jhipster#12460

swarajsaaj requested a review from pascalgrimaud December 13, 2020 15:56

DanielFran requested changes Dec 13, 2020

View reviewed changes

Remove unused import conditions and blank lines

df0aa12

Fix jhipster#12460

swarajsaaj requested a review from DanielFran December 13, 2020 16:47

DanielFran approved these changes Dec 13, 2020

View reviewed changes

DanielFran merged commit 82e5de1 into jhipster:main Dec 13, 2020

pascalgrimaud added this to the 7.0.0-beta.0 milestone Dec 18, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add new IntegrationTest annotation #13249

Add new IntegrationTest annotation #13249

swarajsaaj commented Dec 12, 2020 •

edited

Loading

pascalgrimaud commented Dec 12, 2020

pascalgrimaud Dec 12, 2020

swarajsaaj Dec 13, 2020

pascalgrimaud Dec 13, 2020

swarajsaaj Dec 13, 2020

DanielFran Dec 13, 2020

swarajsaaj Dec 13, 2020

DanielFran Dec 13, 2020

swarajsaaj Dec 13, 2020

DanielFran Dec 13, 2020

swarajsaaj Dec 13, 2020

DanielFran Dec 13, 2020

swarajsaaj Dec 13, 2020

DanielFran Dec 13, 2020

swarajsaaj Dec 13, 2020

DanielFran Dec 13, 2020

swarajsaaj Dec 13, 2020

swarajsaaj commented Dec 16, 2020

pascalgrimaud commented Dec 18, 2020

Add new IntegrationTest annotation #13249

Add new IntegrationTest annotation #13249

Conversation

swarajsaaj commented Dec 12, 2020 • edited Loading

pascalgrimaud commented Dec 12, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

swarajsaaj commented Dec 16, 2020

pascalgrimaud commented Dec 18, 2020

swarajsaaj commented Dec 12, 2020 •

edited

Loading