test: move tests to concrete dir (#135)

test/integration/Integration.t.sol

@@ -8,6 +8,7 @@ import { Broker } from "src/types/DataTypes.sol";
 
 import { Base_Test } from "../Base.t.sol";
 
+/// @notice Common logic needed by all integration tests, both concrete and fuzz tests.
 abstract contract Integration_Test is Base_Test {
     Broker internal defaultBroker;
     uint256 internal defaultStreamId;

test/integration/adjust-rate-per-second/adjustRatePerSecond.t.sol → test/integration/concrete/adjust-rate-per-second/adjustRatePerSecond.t.sol

@@ -3,9 +3,9 @@ pragma solidity >=0.8.22;
 
 import { Errors } from "src/libraries/Errors.sol";
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract AdjustRatePerSecond_Integration_Test is Integration_Test {
+contract AdjustRatePerSecond_Integration_Concrete_Test is Integration_Test {
     function setUp() public override {
         Integration_Test.setUp();
     }

test/integration/amount-owed-of/amountOwedOf.t.sol → test/integration/concrete/amount-owed-of/amountOwedOf.t.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.22;
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract AmountOwedOf_Integration_Test is Integration_Test {
+contract AmountOwedOf_Integration_Concrete_Test is Integration_Test {
     function setUp() public virtual override {
         Integration_Test.setUp();
 

test/integration/amount-owed-of/amountOwedOf.tree → test/integration/concrete/amount-owed-of/amountOwedOf.tree

@@ -1,4 +1,4 @@
-AmountOwedOf_Integration_Test
+AmountOwedOf_Integration_Concrete_Test
 ├── given null
 │   └── it should revert
 └── given not null

test/integration/constructor.t.sol → test/integration/concrete/constructor.t.sol

@@ -4,7 +4,7 @@ pragma solidity >=0.8.22;
 import { UD60x18 } from "@prb/math/src/UD60x18.sol";
 import { SablierFlow } from "src/SablierFlow.sol";
 
-import { Integration_Test } from "./Integration.t.sol";
+import { Integration_Test } from "../Integration.t.sol";
 
 contract Constructor_Integration_Concrete_Test is Integration_Test {
     function test_Constructor() external {

test/integration/create-and-deposit-via-broker/createAndDepositViaBroker.t.sol → test/integration/concrete/create-and-deposit-via-broker/createAndDepositViaBroker.t.sol

@@ -5,9 +5,9 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import { Flow } from "src/types/DataTypes.sol";
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract CreateAndDepositViaBroker_Integration_Test is Integration_Test {
+contract CreateAndDepositViaBroker_Integration_Concrete_Test is Integration_Test {
     function test_RevertWhen_DelegateCall() external {
         bytes memory callData = abi.encodeCall(
             flow.createAndDepositViaBroker,

test/integration/create-and-deposit-via-broker/createAndDepositViaBroker.tree → test/integration/concrete/create-and-deposit-via-broker/createAndDepositViaBroker.tree

@@ -1,4 +1,4 @@
-CreateAndDepositViaBroker_Integration_Test
+CreateAndDepositViaBroker_Integration_Concrete_Test
 ├── when delegate call
 │   └── it should revert
 └── when not delegate call
@@ -7,4 +7,4 @@ CreateAndDepositViaBroker_Integration_Test
     ├── it should mint the NFT
     ├── it should update the stream balance
     ├── it should perform the ERC20 transfers
-    └── it should emit events: 1 {MetadataUpdate}, 1 {CreateFlowStream}, 2 {Transfer}, 1 {DepositFlowStream}
+    └── it should emit events: 1 {MetadataUpdate}, 1 {CreateFlowStream}, 2 {Transfer}, 1 {DepositFlowStream}

test/integration/create/create.t.sol → test/integration/concrete/create/create.t.sol

@@ -7,9 +7,9 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { Errors } from "src/libraries/Errors.sol";
 import { Flow } from "src/types/DataTypes.sol";
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract Create_Integration_Test is Integration_Test {
+contract Create_Integration_Concrete_Test is Integration_Test {
     function setUp() public override {
         Integration_Test.setUp();
     }

test/integration/depletion-time-of/depletionTimeOf.t.sol → test/integration/concrete/depletion-time-of/depletionTimeOf.t.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.22;
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract DepletionTimeOf_Integration_Test is Integration_Test {
+contract DepletionTimeOf_Integration_Concrete_Test is Integration_Test {
     function test_RevertGiven_Null() external {
         bytes memory callData = abi.encodeCall(flow.depletionTimeOf, nullStreamId);
         expectRevert_Null(callData);

test/integration/depletion-time-of/depletionTimeOf.tree → test/integration/concrete/depletion-time-of/depletionTimeOf.tree

@@ -1,4 +1,4 @@
-DepletionTimeOf_Integration_Test
+DepletionTimeOf_Integration_Concrete_Test
 ├── given null
 │   └── it should revert
 └── given not null

test/integration/deposit-and-pause/depositAndPause.t.sol → test/integration/concrete/deposit-and-pause/depositAndPause.t.sol

@@ -3,9 +3,9 @@ pragma solidity >=0.8.22;
 
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract DepositAndPause_Integration_Test is Integration_Test {
+contract DepositAndPause_Integration_Concrete_Test is Integration_Test {
     function setUp() public override {
         Integration_Test.setUp();
 

test/integration/deposit-and-pause/depositAndPause.tree → test/integration/concrete/deposit-and-pause/depositAndPause.tree

@@ -1,4 +1,4 @@
-DepositAndPause_Integration_Test
+DepositAndPause_Integration_Concrete_Test
 ├── when delegate called
 │   └── it should revert
 └── when not delegate call

test/integration/deposit-via-broker/depositViaBroker.t.sol → test/integration/concrete/deposit-via-broker/depositViaBroker.t.sol

@@ -7,9 +7,9 @@ import { ud } from "@prb/math/src/UD60x18.sol";
 import { Errors } from "src/libraries/Errors.sol";
 import { Broker } from "src/types/DataTypes.sol";
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract DepositViaBroker_Integration_Test is Integration_Test {
+contract DepositViaBroker_Integration_Concrete_Test is Integration_Test {
     function test_RevertWhen_DelegateCall() external {
         bytes memory callData =
             abi.encodeCall(flow.depositViaBroker, (defaultStreamId, DEPOSIT_AMOUNT_WITH_BROKER_FEE, defaultBroker));

test/integration/deposit-via-broker/depositViaBroker.tree → test/integration/concrete/deposit-via-broker/depositViaBroker.tree

@@ -1,4 +1,4 @@
-DepositViaBroker_Integration_Test
+DepositViaBroker_Integration_Concrete_Test
 ├── when delegate call
 │   └── it should revert
 └── when not delegate call

test/integration/deposit/deposit.t.sol → test/integration/concrete/deposit/deposit.t.sol

@@ -5,9 +5,9 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import { Errors } from "src/libraries/Errors.sol";
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract Deposit_Integration_Test is Integration_Test {
+contract Deposit_Integration_Concrete_Test is Integration_Test {
     function setUp() public override {
         Integration_Test.setUp();
     }

test/integration/pause/pause.t.sol → test/integration/concrete/pause/pause.t.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.22;
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract Pause_Integration_Test is Integration_Test {
+contract Pause_Integration_Concrete_Test is Integration_Test {
     function setUp() public override {
         Integration_Test.setUp();
 

test/integration/recent-amount-of/recentAmountOf.t.sol → test/integration/concrete/recent-amount-of/recentAmountOf.t.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.22;
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract RecentAmountOf_Integration_Test is Integration_Test {
+contract RecentAmountOf_Integration_Concrete_Test is Integration_Test {
     function setUp() public override {
         Integration_Test.setUp();
     }

test/integration/refund-and-pause/refundAndPause.t.sol → test/integration/concrete/refund-and-pause/refundAndPause.t.sol

@@ -3,9 +3,9 @@ pragma solidity >=0.8.22;
 
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract RefundAndPause_Integration_Test is Integration_Test {
+contract RefundAndPause_Integration_Concrete_Test is Integration_Test {
     function setUp() public override {
         Integration_Test.setUp();
 

test/integration/refund-and-pause/refundAndPause.tree → test/integration/concrete/refund-and-pause/refundAndPause.tree

@@ -1,4 +1,4 @@
-RefundAndPause_Integration_Test
+RefundAndPause_Integration_Concrete_Test
 ├── when delegate call
 │   └── it should revert
 └── when not delegate call

test/integration/refund/refund.t.sol → test/integration/concrete/refund/refund.t.sol

@@ -5,9 +5,9 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import { Errors } from "src/libraries/Errors.sol";
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract Refund_Integration_Test is Integration_Test {
+contract Refund_Integration_Concrete_Test is Integration_Test {
     function setUp() public override {
         Integration_Test.setUp();
 

test/integration/refundable-amount-of/refundableAmountOf.t.sol → test/integration/concrete/refundable-amount-of/refundableAmountOf.t.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.22;
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract RefundableAmountOf_Integration_Test is Integration_Test {
+contract RefundableAmountOf_Integration_Concrete_Test is Integration_Test {
     function setUp() public override {
         Integration_Test.setUp();
     }

test/integration/restart-and-deposit/restartAndDeposit.t.sol → test/integration/concrete/restart-and-deposit/restartAndDeposit.t.sol

@@ -3,9 +3,9 @@ pragma solidity >=0.8.22;
 
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract RestartAndDeposit_Integration_Test is Integration_Test {
+contract RestartAndDeposit_Integration_Concrete_Test is Integration_Test {
     function setUp() public override {
         Integration_Test.setUp();
 

test/integration/restart/restart.t.sol → test/integration/concrete/restart/restart.t.sol

@@ -3,9 +3,9 @@ pragma solidity >=0.8.22;
 
 import { Errors } from "src/libraries/Errors.sol";
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract Restart_Integration_Test is Integration_Test {
+contract Restart_Integration_Concrete_Test is Integration_Test {
     function setUp() public override {
         Integration_Test.setUp();
 

test/integration/set-nft-descriptor/setNFTDescriptor.t.sol → test/integration/concrete/set-nft-descriptor/setNFTDescriptor.t.sol

@@ -4,9 +4,9 @@ pragma solidity >=0.8.22;
 import { Errors } from "src/libraries/Errors.sol";
 import { SablierFlowNFTDescriptor } from "src/SablierFlowNFTDescriptor.sol";
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract SetNFTDescriptor_Integration_Test is Integration_Test {
+contract SetNFTDescriptor_Integration_Concrete_Test is Integration_Test {
     function setUp() public virtual override {
         Integration_Test.setUp();
 

test/integration/set-nft-descriptor/setNFTDescriptor.tree → test/integration/concrete/set-nft-descriptor/setNFTDescriptor.tree

@@ -1,4 +1,4 @@
-SetNFTDescriptor_Integration_Test
+SetNFTDescriptor_Integration_Concrete_Test
 ├── when caller is not admin
 │  └── it should revert
 └── when caller is admin

test/integration/stream-debt-of/streamDebtOf.t.sol → test/integration/concrete/stream-debt-of/streamDebtOf.t.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.22;
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract StreamDebtOf_Integration_Test is Integration_Test {
+contract StreamDebtOf_Integration_Concrete_Test is Integration_Test {
     function setUp() public override {
         Integration_Test.setUp();
     }

test/integration/token-uri/tokenURI.t.sol → test/integration/concrete/token-uri/tokenURI.t.sol

@@ -3,9 +3,9 @@ pragma solidity >=0.8.22;
 
 import { IERC721Errors } from "@openzeppelin/contracts/interfaces/draft-IERC6093.sol";
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract TokenURI_Integration_Test is Integration_Test {
+contract TokenURI_Integration_Concrete_Test is Integration_Test {
     function test_RevertGiven_NFTDoesNotExist() external {
         vm.expectRevert(abi.encodeWithSelector(IERC721Errors.ERC721NonexistentToken.selector, nullStreamId));
         flow.tokenURI({ streamId: nullStreamId });

test/integration/token-uri/tokenURI.tree → test/integration/concrete/token-uri/tokenURI.tree

@@ -1,4 +1,4 @@
-TokenURI_Integration_Test
+TokenURI_Integration_Concrete_Test
 ├── given NFT does not exist
 │  └── it should revert
 └── given NFT exists

test/integration/transfer-from/transferFrom.t.sol → test/integration/concrete/transfer-from/transferFrom.t.sol

@@ -3,7 +3,7 @@ pragma solidity >=0.8.22 <0.9.0;
 
 import { Errors } from "src/libraries/Errors.sol";
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
 contract TransferFrom_Integration_Concrete_Test is Integration_Test {
     function setUp() public virtual override {

test/integration/withdraw-at/withdrawAt.t.sol → test/integration/concrete/withdraw-at/withdrawAt.t.sol

@@ -5,9 +5,9 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import { Errors } from "src/libraries/Errors.sol";
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract WithdrawAt_Integration_Test is Integration_Test {
+contract WithdrawAt_Integration_Concrete_Test is Integration_Test {
     function setUp() public override {
         Integration_Test.setUp();
 

test/integration/withdraw-max/withdrawMax.t.sol → test/integration/concrete/withdraw-max/withdrawMax.t.sol

@@ -3,7 +3,7 @@ pragma solidity >=0.8.22;
 
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
 contract WithdrawMax_Integration_Concrete_Test is Integration_Test {
     function setUp() public override {

test/integration/withdrawable-amount-of/withdrawableAmountOf.t.sol → test/integration/concrete/withdrawable-amount-of/withdrawableAmountOf.t.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.22;
 
-import { Integration_Test } from "../Integration.t.sol";
+import { Integration_Test } from "../../Integration.t.sol";
 
-contract WithdrawableAmountOf_Integration_Test is Integration_Test {
+contract WithdrawableAmountOf_Integration_Concrete_Test is Integration_Test {
     function setUp() public override {
         Integration_Test.setUp();
     }