Convert remaining tests to junit 5 #5394
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,3 @@ | ||
| --add-modules | ||
| // Add junit5 module dependency | ||
| org.junit.jupiter.api | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| package org.jabref.logic.shared; | ||
|
|
||
| import java.sql.SQLException; | ||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.stream.Stream; | ||
|
|
||
| import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException; | ||
| import org.jabref.model.Defaults; | ||
|
|
@@ -17,11 +19,9 @@ | |
| import org.jabref.model.util.DummyFileUpdateMonitor; | ||
| import org.jabref.testutils.category.DatabaseTest; | ||
|
|
||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.MethodSource; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
|
|
@@ -32,23 +32,27 @@ | |
| @DatabaseTest | ||
| public class SynchronizationTestSimulator { | ||
|
|
||
| public DBMSType dbmsType; | ||
| private BibDatabaseContext clientContextA; | ||
| private BibDatabaseContext clientContextB; | ||
| private SynchronizationTestEventListener eventListenerB; // used to monitor occurring events | ||
| private final GlobalBibtexKeyPattern pattern = GlobalBibtexKeyPattern.fromPattern("[auth][year]"); | ||
|
|
||
| private static Stream<Object[]> getTestingDatabaseSystems() throws InvalidDBMSConnectionPropertiesException, SQLException { | ||
| Collection<Object[]> result = new ArrayList<>(); | ||
| for (DBMSType dbmsType : TestManager.getDBMSTypeTestParameter()) { | ||
| result.add(new Object[] { | ||
| dbmsType, | ||
| TestConnector.getTestDBMSConnection(dbmsType), | ||
| DBMSProcessor.getProcessorInstance(TestConnector.getTestDBMSConnection(dbmsType))}); | ||
| } | ||
| return result.stream(); | ||
| } | ||
|
|
||
| @BeforeEach | ||
| @MethodSource("getTestingDatabaseSystems") | ||
| public void setUp(DBMSType dbmsType, DBMSConnection dbmsConnection, DBMSProcessor dbmsProcessor) throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException { | ||
|
There was a problem hiding this comment. Does this really works, i.e. did you tested that all test methods are invoked correctly? According to the documentation the
But this is in a slightly different context. If this method works, then it should also be used in There was a problem hiding this comment. Well I will see if I can test it locally, but otherwise Travis is green and so I thought it's working There was a problem hiding this comment. Without double chcking (but trying to understand the implications of Tobias' explanation), I would bet that the test use only one database system and not all avaiable. |
||
|
|
||
| clientContextA = new BibDatabaseContext(new Defaults(BibDatabaseMode.BIBTEX)); | ||
| DBMSSynchronizer synchronizerA = new DBMSSynchronizer(clientContextA, ',', pattern, new DummyFileUpdateMonitor()); | ||
| clientContextA.convertToSharedDatabase(synchronizerA); | ||
|
|
@@ -62,7 +66,8 @@ public void setUp() throws SQLException, DatabaseNotSupportedException, InvalidD | |
| clientContextB.getDBMSSynchronizer().registerListener(eventListenerB); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource("getTestingDatabaseSystems") | ||
| public void simulateEntryInsertionAndManualPull() { | ||
| //client A inserts an entry | ||
| clientContextA.getDatabase().insertEntry(getBibEntryExample(1)); | ||
|
|
@@ -74,7 +79,8 @@ public void simulateEntryInsertionAndManualPull() { | |
| assertEquals(clientContextA.getDatabase().getEntries(), clientContextB.getDatabase().getEntries()); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource("getTestingDatabaseSystems") | ||
| public void simulateEntryUpdateAndManualPull() { | ||
| BibEntry bibEntry = getBibEntryExample(1); | ||
| //client A inserts an entry | ||
|
|
@@ -89,7 +95,8 @@ public void simulateEntryUpdateAndManualPull() { | |
| assertEquals(clientContextA.getDatabase().getEntries(), clientContextB.getDatabase().getEntries()); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource("getTestingDatabaseSystems") | ||
| public void simulateEntryDelitionAndManualPull() { | ||
| BibEntry bibEntry = getBibEntryExample(1); | ||
| //client A inserts an entry | ||
|
|
@@ -110,7 +117,8 @@ public void simulateEntryDelitionAndManualPull() { | |
| assertTrue(clientContextB.getDatabase().getEntries().isEmpty()); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource("getTestingDatabaseSystems") | ||
| public void simulateUpdateOnNoLongerExistingEntry() { | ||
| BibEntry bibEntryOfClientA = getBibEntryExample(1); | ||
| //client A inserts an entry | ||
|
|
@@ -136,7 +144,8 @@ public void simulateUpdateOnNoLongerExistingEntry() { | |
| assertEquals(bibEntryOfClientB, eventListenerB.getSharedEntryNotPresentEvent().getBibEntry()); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource("getTestingDatabaseSystems") | ||
| public void simulateEntryChangeConflicts() { | ||
| BibEntry bibEntryOfClientA = getBibEntryExample(1); | ||
| //client A inserts an entry | ||
|
|
@@ -172,8 +181,4 @@ private BibEntry getBibEntryExample(int index) { | |
| return bibEntry; | ||
| } | ||
|
|
||
tobiasdiez marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See here that the title is different @tobiasdiez