Skip to content

Commit 391d1fb

Browse files
authored
Merge pull request #179 from cicirello/junit-migration
Migrated test cases to JUnit Jupiter 5.8.2
2 parents c1f7a13 + a1370a0 commit 391d1fb

File tree

9 files changed

+613
-596
lines changed

9 files changed

+613
-596
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## [Unreleased] - 2022-02-14
7+
## [Unreleased] - 2022-02-15
88

99
### Added
1010

1111
### Changed
1212
* Bumped dependency rho-mu to 1.2.0
1313
* Bumped dependency org.cicirello.core to 1.1.0
14+
* Migrated test cases to JUnit 5 (specifically JUnit Jupiter 5.8.2).
1415

1516
### Deprecated
1617

pom.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,10 @@
165165

166166
<dependencies>
167167
<dependency>
168-
<groupId>junit</groupId>
169-
<artifactId>junit</artifactId>
170-
<version>4.13.2</version>
171-
<type>jar</type>
168+
<groupId>org.junit.jupiter</groupId>
169+
<artifactId>junit-jupiter</artifactId>
170+
<version>5.8.2</version>
172171
<scope>test</scope>
173-
<optional>true</optional>
174172
</dependency>
175173
<dependency>
176174
<groupId>org.cicirello</groupId>

src/main/java/org/cicirello/permutations/PermutationIterator.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018-2021 Vincent A. Cicirello, <https://www.cicirello.org/>.
2+
* Copyright 2018-2022 Vincent A. Cicirello, <https://www.cicirello.org/>.
33
*
44
* This file is part of JavaPermutationTools (https://jpt.cicirello.org/).
55
*
@@ -17,7 +17,6 @@
1717
*
1818
* You should have received a copy of the GNU General Public License
1919
* along with JavaPermutationTools. If not, see <http://www.gnu.org/licenses/>.
20-
*
2120
*/
2221

2322
package org.cicirello.permutations;
@@ -33,7 +32,6 @@
3332
* modify the returned Permutation without risk of interfering with the operation of the Iterator.
3433
*
3534
* @author <a href=https://www.cicirello.org/ target=_top>Vincent A. Cicirello</a>, <a href=https://www.cicirello.org/ target=_top>https://www.cicirello.org/</a>
36-
* @version 5.24.2021
3735
*/
3836
public class PermutationIterator implements Iterator<Permutation> {
3937

@@ -67,15 +65,18 @@ public PermutationIterator(Permutation p) {
6765
}
6866

6967
/**
70-
* {@inheritDoc}
68+
* Checks if this PermutationIterator has more Permutations.
69+
* @return true if and only if this PermutationIterator has more Permutations to iterate over.
7170
*/
7271
@Override
7372
public boolean hasNext() {
7473
return !done;
7574
}
7675

7776
/**
78-
* {@inheritDoc}
77+
* Gets the Permutation for the next iteration.
78+
* @return The Permutation for the next iteration.
79+
* @throws NoSuchElementException if hasNext() is false
7980
*/
8081
@Override
8182
public Permutation next() {

0 commit comments

Comments
 (0)