Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/futs_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: |
choco upgrade mingw --version="'15.1.0'" -y
choco install -y make
cmake -G "Unix Makefiles" -Bbuild -DBUILD_TESTS=ON
cmake -G "Unix Makefiles" -DCMAKE_Fortran_FLAGS="-fmodule-private" -Bbuild -DBUILD_TESTS=ON
cmake --build build
./build/FortUTF_Tests.exe

10 changes: 10 additions & 0 deletions src/assertions.f90
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ MODULE FUTF_ASSERTIONS
USE FUTF_UTILITIES, ONLY: APPEND_CHAR

IMPLICIT NONE
PRIVATE

PUBLIC :: ASSERT_EQUAL, ASSERT_ALMOST_EQUAL, ASSERT_TRUE, ASSERT_FALSE
PUBLIC :: ASSERT_NOT_EQUAL, ASSERT_LESS_THAN, ASSERT_LESS_THAN_EQUAL
PUBLIC :: ASSERT_GREATER_THAN, ASSERT_GREATER_THAN_EQUAL
PUBLIC :: ASSERT_IS_INT, ASSERT_IS_REAL, ASSERT_IS_CHARACTER, ASSERT_IS_COMPLEX
PUBLIC :: ASSERT_ARRAY_CONTAINS

PUBLIC :: INT_KIND_1BYTE, INT_KIND_2BYTE, INT_KIND_4BYTE, INT_KIND_8BYTE
PUBLIC :: REAL_KIND_4BYTE, REAL_KIND_8BYTE

INTEGER, PARAMETER :: INT_KIND_1BYTE = SELECTED_INT_KIND(2)
INTEGER, PARAMETER :: INT_KIND_2BYTE = SELECTED_INT_KIND(4)
Expand Down
6 changes: 5 additions & 1 deletion src/specials.f90
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
MODULE FUTF_SPECIALS
USE FUTF_SUITE, ONLY: FUTF_TOTAL, FUTF_PASSED, &
REGISTER_FAILED, REGISTER_PASSED, INFO_STRINGS, APPEND_CHAR
REGISTER_FAILED, REGISTER_PASSED, INFO_STRINGS
USE FUTF_UTILITIES, ONLY: APPEND_CHAR

IMPLICIT NONE
PRIVATE

PUBLIC :: FAIL, SUCCEED

CONTAINS

Expand Down
3 changes: 3 additions & 0 deletions src/string_check.f90
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ MODULE FTF_STRING_CHECK
USE FUTF_SUITE, ONLY: REGISTER_FAILED, REGISTER_PASSED, INFO_STRINGS
USE FUTF_UTILITIES, ONLY: APPEND_CHAR
IMPLICIT NONE
PRIVATE

PUBLIC :: STRING_CONTAINS, STRING_HAS_SUFFIX, STRING_HAS_PREFIX

CHARACTER(LEN=300), PRIVATE :: INFO

Expand Down
8 changes: 7 additions & 1 deletion src/suite.f90
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
MODULE FUTF_SUITE
USE FUTF_UTILITIES, ONLY: APPEND_CHAR, APPEND_INT
IMPLICIT NONE
PRIVATE

PUBLIC :: FUTF_PASSED, FUTF_TOTAL, FUTF_EXIT_CODE
PUBLIC :: IDENTIFIER, TEST_NAMES, TEST_RESULTS, INFO_STRINGS
PUBLIC :: TAG_TEST, REGISTER_PASSED, REGISTER_FAILED
PUBLIC :: TEST_SUMMARY, FAILED_TEST_SUMMARY
PUBLIC :: RESET_LAST_TEST_STATUS

PUBLIC
INTEGER :: FUTF_PASSED = 0 ! Number of FUTF_PASSED Tests
INTEGER :: FUTF_TOTAL = 0 ! FUTF_TOTAL Number of Tests
INTEGER :: FUTF_EXIT_CODE = 0 ! Test Suite Exit Code
Expand Down
4 changes: 2 additions & 2 deletions src/test_suite.f90
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
MODULE FORTUTF
USE FUTF_ASSERTIONS
USE FUTF_UTILITIES
USE FUTF_SUITE
USE FUTF_SPECIALS
USE FTF_STRING_CHECK
USE FUTF_SUITE
USE FUTF_UTILITIES
END MODULE FORTUTF
4 changes: 4 additions & 0 deletions src/utilities.f90
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
MODULE FUTF_UTILITIES
IMPLICIT NONE
PRIVATE

PUBLIC :: APPEND_CHAR, APPEND_INT, GET_INDEX_STRARRAY

CONTAINS
FUNCTION APPEND_CHAR(INPUT_ARRAY, ELEMENT, INT_LEN) RESULT(OUTPUT_ARRAY)
INTEGER, INTENT(IN) :: INT_LEN
Expand Down
Loading