Skip to content

Commit 3065057

Browse files
committed
updated unit test and fixed error in logic
1 parent 2d56283 commit 3065057

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

MekHQ/src/mekhq/campaign/randomEvents/prisoners/PrisonerEventManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ int degradeTemporaryCapacity() {
180180

181181
if (temporaryCapacityModifier != DEFAULT_TEMPORARY_CAPACITY) {
182182
int differendInTemporaryCapacity = abs(DEFAULT_TEMPORARY_CAPACITY-temporaryCapacityModifier);
183-
int degreeOfChange = (int) min(1,round(differendInTemporaryCapacity * TEMPORARY_CAPACITY_DEGRADE_RATE));
183+
int degreeOfChange = (int) max(1,round(differendInTemporaryCapacity * TEMPORARY_CAPACITY_DEGRADE_RATE));
184184

185185
if (temporaryCapacityModifier < DEFAULT_TEMPORARY_CAPACITY) {
186186
temporaryCapacityModifier += degreeOfChange;

MekHQ/unittests/mekhq/campaign/randomEvents/prisoners/PrisonerEventManagerTest.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
*/
2828
package mekhq.campaign.randomEvents.prisoners;
2929

30+
import static java.lang.Math.abs;
3031
import static java.lang.Math.max;
3132
import static java.lang.Math.min;
3233
import static java.lang.Math.round;
@@ -78,7 +79,8 @@ void testDegradeTemporaryCapacity_DegradeDownTowardsDefault() {
7879
// Act
7980
int actualValue = eventManager.degradeTemporaryCapacity();
8081

81-
int degreeOfChange = (int) round(INITIAL_TEMPORARY_CAPACITY * TEMPORARY_CAPACITY_DEGRADE_RATE);
82+
int differendInTemporaryCapacity = abs(DEFAULT_TEMPORARY_CAPACITY-INITIAL_TEMPORARY_CAPACITY);
83+
int degreeOfChange = (int) max(1,round(differendInTemporaryCapacity * TEMPORARY_CAPACITY_DEGRADE_RATE));
8284
int expectedValue = max(DEFAULT_TEMPORARY_CAPACITY, INITIAL_TEMPORARY_CAPACITY - degreeOfChange);
8385

8486
// Assert
@@ -128,7 +130,8 @@ void testDegradeTemporaryCapacity_DegradeUpTowardsDefault() {
128130
// Act
129131
int actualValue = eventManager.degradeTemporaryCapacity();
130132

131-
int degreeOfChange = (int) round(INITIAL_TEMPORARY_CAPACITY * TEMPORARY_CAPACITY_DEGRADE_RATE);
133+
int differendInTemporaryCapacity = abs(DEFAULT_TEMPORARY_CAPACITY-INITIAL_TEMPORARY_CAPACITY);
134+
int degreeOfChange = (int) max(1,round(differendInTemporaryCapacity * TEMPORARY_CAPACITY_DEGRADE_RATE));
132135
int expectedValue = min(DEFAULT_TEMPORARY_CAPACITY, INITIAL_TEMPORARY_CAPACITY + degreeOfChange);
133136

134137
// Assert

0 commit comments

Comments
 (0)