Skip to content

Commit

Permalink
addressing comments in code review
Browse files Browse the repository at this point in the history
  • Loading branch information
K-Felk committed Dec 4, 2020
1 parent 5b4d3d9 commit 110f16a
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 13 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
.vscode
*.class
.factorypath
target/
Expand Down
5 changes: 2 additions & 3 deletions src/test/java/api/loans/DeclareLostAPITests.java
Original file line number Diff line number Diff line change
Expand Up @@ -459,16 +459,15 @@ public void cannotDeclareItemLostTwice() {
}

@Test
public void shouldNotChargeOverdueOnCheckinWhenItemLostAndRefundFeePeriodPassed() {
public void shouldNotChargeOverdueFeesDuringCheckInWhenItemDeclaredLostAndRefundFeePeriodHasPassed() {
ItemResource item = itemsFixture.basedUponSmallAngryPlanet();

IndividualResource overduePolicy = overdueFinePoliciesFixture.facultyStandard();
IndividualResource lostItemPolicy = lostItemFeePoliciesFixture.ageToLostAfterOneWeek();

policiesActivation.use(PoliciesToActivate.builder()
.lostItemPolicy(lostItemPolicy)
.overduePolicy(overduePolicy)
);
.overduePolicy(overduePolicy));

IndividualResource loan = checkOutFixture
.checkOutByBarcode(item, usersFixture.jessica());
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/api/loans/OverrideRenewByBarcodeTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ public void renewalNoticeIsSentWhenPolicyDefinesRenewalNoticeConfiguration() {
}

@Test
public void shouldNotChargeOverdueOnRenewalWhenItemAgedToLostAndRefundFeePeriodPast() {
public void shouldNotChargeOverdueFeesDuringRenewalWhenItemHasAgedToLostAndRefundFeePeriodHasPassed() {

IndividualResource overDueFinePolicy = overdueFinePoliciesFixture.facultyStandard();
IndividualResource lostItemPolicy = lostItemFeePoliciesFixture.ageToLostAfterOneWeek();
Expand All @@ -733,7 +733,7 @@ public void shouldNotChargeOverdueOnRenewalWhenItemAgedToLostAndRefundFeePeriodP
assertThat(renewedLoan, hasNoOverdueFine());
}

public void shouldNotChargeOverdueOnRenewalWhenItemDeclaredLostAndRefundFeePeriodPassed() {
public void shouldNotChargeOverdueFeesDuringRenewalWhenItemIsDeclaredLostAndRefundFeePeriodHasPassed() {
ItemResource item = itemsFixture.basedUponSmallAngryPlanet();
UserResource user = usersFixture.jessica();

Expand All @@ -745,8 +745,7 @@ public void shouldNotChargeOverdueOnRenewalWhenItemDeclaredLostAndRefundFeePerio
.overduePolicy(overduePolicy)
);

IndividualResource loan = checkOutFixture
.checkOutByBarcode(item, user);
IndividualResource loan = checkOutFixture.checkOutByBarcode(item, user);

// advance system time by five weeks to accrue fines before declared lost
final DateTime declareLostDate = now(UTC).plusWeeks(5);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ public void shouldCloseLoanWhenNoFeesToCharge() {
}

@Test
public void shouldNotChargeOverdueOnCheckinWhenAgedToLostAndRefundFeePeriodPassed() {
public void shouldNotChargeOverdueFeesDuringCheckInWhenItemHasAgedToLostAndRefundFeePeriodHasPassed() {
// for a loan that charges both lost fees and overdue fines
// where the policies are set such that:
// 1. the item charges overdue fees on checkin
Expand All @@ -348,7 +348,6 @@ public void shouldNotChargeOverdueOnCheckinWhenAgedToLostAndRefundFeePeriodPasse
final DateTime checkInDate = now(UTC).plusWeeks(9);
mockClockManagerToReturnFixedDateTime(checkInDate);
checkInFixture.checkInByBarcode(result.getItem(), checkInDate);

assertThat(loansFixture.getLoanById(loanId), hasNoOverdueFine());

}
Expand Down
4 changes: 1 addition & 3 deletions src/test/java/api/support/fixtures/AgeToLostFixture.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,12 @@ public AgeToLostResult createAgedToLostLoan(UnaryOperator<HoldingBuilder> holdin
return ageToLostResult;
}

public AgeToLostResult createLoanAgeToLostAndChargeFeesWithOverdues(IndividualResource lostPolicy, IndividualResource overduePolicy) {

public AgeToLostResult createLoanAgeToLostAndChargeFeesWithOverdues(IndividualResource lostPolicy, IndividualResource overduePolicy) {
return createLoanAgeToLostAndChargeFees(UnaryOperator.identity(),
PoliciesToActivate.builder()
.lostItemPolicy(lostPolicy)
.overduePolicy(overduePolicy)
);

}

public AgeToLostResult createLoanAgeToLostAndChargeFees(LostItemFeePolicyBuilder builder) {
Expand Down

0 comments on commit 110f16a

Please sign in to comment.