Skip to content

Increase coverage #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 44 commits into from
Jun 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
d655c21
Update ValueDictionaryTests.f90
DavidAKopriva May 26, 2023
5b0f9a7
More coverage of FTValueDictionary
DavidAKopriva May 27, 2023
6b2da68
Update ValueClassTests.f90
DavidAKopriva May 28, 2023
10b678e
Update ValueClassTests.f90
DavidAKopriva May 28, 2023
7898fd7
Logical tests/conversions
DavidAKopriva May 28, 2023
39b6023
Dictionary updates
DavidAKopriva May 29, 2023
80a4829
Update DictionaryTests.f90
DavidAKopriva May 30, 2023
69a8bd7
Tests on StringSets and Values
DavidAKopriva Jun 2, 2023
a396cf5
ObjectArray updates
DavidAKopriva Jun 2, 2023
2d8ea23
Exception Coverage
DavidAKopriva Jun 5, 2023
9e69380
Update ExceptionTests.f90
DavidAKopriva Jun 5, 2023
44ea4c3
Update StacksTests.f90
DavidAKopriva Jun 6, 2023
dd75ad4
LinkedListCoverage
DavidAKopriva Jun 7, 2023
cbdffd1
SparseMatrixCoverage
DavidAKopriva Jun 8, 2023
64a3464
Update Comparisons.f90 (#22)
DavidAKopriva Jun 20, 2023
396d455
Merge branch 'main' into IncreaseCoverage
andrewwinters5000 Jun 20, 2023
24bbc16
ignore variable name as a type
andrewwinters5000 Jun 20, 2023
17e1bda
AddAboluteErrorTests
DavidAKopriva Jun 20, 2023
d83962a
Update Comparisons.f90
DavidAKopriva Jun 20, 2023
01afe1d
Update MultiIndexTableTests.f90
DavidAKopriva Jun 21, 2023
5a1987d
TestSuiteManagerCoverage
DavidAKopriva Jun 21, 2023
5cf744c
ComparisonCoverage
DavidAKopriva Jun 21, 2023
49bbce6
Update ComparisonTests.f90
DavidAKopriva Jun 21, 2023
d19e833
FTDataCoverage
DavidAKopriva Jun 22, 2023
7d13626
Update Makefile
DavidAKopriva Jun 22, 2023
05ce02c
Update DataTests.f90
DavidAKopriva Jun 22, 2023
c407cfc
AddAssertionTests
DavidAKopriva Jun 22, 2023
0f6119e
Update AssertionFailureTests.f90
DavidAKopriva Jun 22, 2023
e815bd2
Update AssertionFailureTests.f90
DavidAKopriva Jun 22, 2023
6b27b99
Update AssertionFailureTests.f90
DavidAKopriva Jun 22, 2023
35bbd1d
Update Source/FTTesting/Comparisons.f90
DavidAKopriva Jun 26, 2023
63956c4
Update Source/FTTesting/Comparisons.f90
DavidAKopriva Jun 26, 2023
b0daf34
Update Source/FTTesting/Comparisons.f90
DavidAKopriva Jun 26, 2023
55d5414
Update Testing/TestMain.f90
DavidAKopriva Jun 26, 2023
4561972
Update Testing/TestMain.f90
DavidAKopriva Jun 26, 2023
433c376
Update Testing/Tests/ExceptionTests.f90
DavidAKopriva Jun 26, 2023
d5b9ccc
Update Testing/Tests/StacksTests.f90
DavidAKopriva Jun 26, 2023
7ee9733
Update Testing/Tests/ExceptionTests.f90
DavidAKopriva Jun 26, 2023
2a307f0
Update Testing/Tests/ValueClassTests.f90
DavidAKopriva Jun 26, 2023
cc11d23
Update Source/FTTesting/Assert.f90
DavidAKopriva Jun 26, 2023
77fc1fa
Update Source/FTTesting/Assert.f90
DavidAKopriva Jun 26, 2023
1189002
Update Comparisons.f90
DavidAKopriva Jun 26, 2023
cd321aa
Merge branch 'IncreaseCoverage' of https://github.com/trixi-framework…
DavidAKopriva Jun 26, 2023
2373c40
Merge branch 'main' into IncreaseCoverage
andrewwinters5000 Jun 27, 2023
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
1 change: 1 addition & 0 deletions .typos.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[default.extend-words]
doub = "doub"
INOUT = "INOUT"
sav = "sav"

16 changes: 9 additions & 7 deletions Source/FTObjects/FTDataClass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ Module FTDataClass
PROCEDURE, PUBLIC :: initWithDataOfType
PROCEDURE, PUBLIC :: storedData
PROCEDURE, PUBLIC :: storedDataSize
PROCEDURE, PUBLIC :: storedDataType
PROCEDURE, PUBLIC :: dataIsOfType
PROCEDURE, PUBLIC :: className => dataClassName
FINAL :: destructData
END TYPE FTData
Expand Down Expand Up @@ -104,15 +106,15 @@ SUBROUTINE destructData(self)
IMPLICIT NONE
TYPE(FTData) :: self

DEALLOCATE( self % dataStorage)
IF(ASSOCIATED(self % dataStorage)) DEALLOCATE( self % dataStorage)

END SUBROUTINE destructData
!
!////////////////////////////////////////////////////////////////////////
!
SUBROUTINE releaseFTData(self)
IMPLICIT NONE
TYPE(FTData) , POINTER :: self
TYPE(FTData) , POINTER :: self
CLASS(FTObject), POINTER :: obj

IF(.NOT. ASSOCIATED(self)) RETURN
Expand Down Expand Up @@ -142,12 +144,12 @@ END FUNCTION storedDataSize
!
!////////////////////////////////////////////////////////////////////////
!
FUNCTION dataType(self) RESULT(t)
FUNCTION storedDataType(self) RESULT(t)
IMPLICIT NONE
CLASS(FTData) :: self
CHARACTER(LEN=DATA_CLASS_TYPE_LENGTH) :: t
t = self % dataType
END FUNCTION dataType
END FUNCTION storedDataType
!
!////////////////////////////////////////////////////////////////////////
!
Expand Down Expand Up @@ -195,9 +197,9 @@ END FUNCTION dataClassName
!
FUNCTION dataIsOfType(self, dataType) RESULT(t)
IMPLICIT NONE
CLASS(FTData) :: self
CHARACTER(LEN=DATA_CLASS_TYPE_LENGTH) :: dataType
LOGICAL :: t
CLASS(FTData) :: self
CHARACTER(LEN=*) :: dataType
LOGICAL :: t

IF ( dataType == self % dataType ) THEN
t = .TRUE.
Expand Down
3 changes: 1 addition & 2 deletions Source/FTObjects/FTDictionaryClass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -438,8 +438,7 @@ CHARACTER(LEN=DESCRIPTION_CHARACTER_LENGTH) FUNCTION FTDictionaryDescription(sel
s = self % entries(i) % description()
IF ( LEN_TRIM(s) > 0 ) THEN
FTDictionaryDescription = TRIM(FTDictionaryDescription) // &
TRIM(self % entries(i) % description()) // &
CHAR(13)
TRIM(s) // NEW_LINE('a')
END IF
END DO

Expand Down
2 changes: 1 addition & 1 deletion Source/FTObjects/FTExceptionClass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ SUBROUTINE destructFTExceptions
END IF
PRINT *," ***********************************"
PRINT *
CALL errorStack % printDescription(iUnit = 6)
CALL printAllExceptions
END IF
!
! -----------------------
Expand Down
45 changes: 0 additions & 45 deletions Source/FTObjects/FTLinkedListClass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -445,51 +445,6 @@ LOGICAL FUNCTION isCircular(self)
END FUNCTION isCircular
!
!////////////////////////////////////////////////////////////////////////
!
SUBROUTINE removeObject1(self,obj)
IMPLICIT NONE
CLASS(FTLinkedList) :: self
CLASS(FTObject) , POINTER :: obj

CLASS(FTLinkedListRecord), POINTER :: current => NULL(), previous => NULL()

IF ( .NOT.ASSOCIATED(self % head) ) RETURN

current => self % head
previous => NULL()
!
! -------------------------------------------------------------
! Find the object in the list by a linear search and remove it.
! It will be deallocated if necessary.
! -------------------------------------------------------------
!
DO WHILE (ASSOCIATED(current))
IF ( ASSOCIATED(current % recordObject,obj) ) THEN

IF ( ASSOCIATED(previous) ) THEN
previous % next => current % next
ELSE
self % head => current % next
END IF

IF ( ASSOCIATED(current,self % tail) ) THEN
self % tail => previous
END IF

obj => current
CALL release(obj)

self % nRecords = self % nRecords - 1
EXIT
END IF

previous => current
current => current % next
END DO

END SUBROUTINE removeObject1
!
!////////////////////////////////////////////////////////////////////////
!
SUBROUTINE removeObject(self,obj)
IMPLICIT NONE
Expand Down
6 changes: 3 additions & 3 deletions Source/FTObjects/FTObjectArrayClass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -481,9 +481,9 @@ END FUNCTION objectArrayFromObject
!
SUBROUTINE castToMutableObjectArray(obj,cast)
!
! -----------------------------------------------------
! Cast the base class FTObject to the FTException class
! -----------------------------------------------------
! --------------------------------------------------------------
! Cast the base class FTObject to the FTMutableObjectArray class
! --------------------------------------------------------------
!
IMPLICIT NONE
CLASS(FTObject) , POINTER :: obj
Expand Down
10 changes: 5 additions & 5 deletions Source/FTObjects/FTSparseMatrixClass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ SUBROUTINE castObjectToMatrixData(obj,cast)
IMPLICIT NONE
!
! -----------------------------------------------------
! Cast the base class FTObject to the FTException class
! Cast the base class FTObject to the MatrixData class
! -----------------------------------------------------
!
CLASS(FTObject) , POINTER :: obj
Expand All @@ -146,7 +146,7 @@ FUNCTION matrixDataCast(obj) RESULT(cast)
IMPLICIT NONE
!
! -----------------------------------------------------
! Cast the base class FTObject to the FTException class
! Cast the base class FTObject to the MatrixData class
! -----------------------------------------------------
!
CLASS(FTObject) , POINTER :: obj
Expand Down Expand Up @@ -511,9 +511,9 @@ END FUNCTION SparseMatrixSize
!
FUNCTION SparseMatrixFromObject(obj) RESULT(cast)
!
! -----------------------------------------------------
! Cast the base class FTObject to the FTException class
! -----------------------------------------------------
! --------------------------------------------------------
! Cast the base class FTObject to the FTSparseMatrix class
! --------------------------------------------------------
!
IMPLICIT NONE
CLASS(FTObject) , POINTER :: obj
Expand Down
4 changes: 2 additions & 2 deletions Source/FTObjects/FTValueClass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -658,9 +658,9 @@ FUNCTION stringValue(self,requestedLength) RESULT(s)
CASE (FTVALUECLASS_LOGICAL)
l = TRANSFER(self % valueStorage, l)
IF ( l ) THEN
s = "TRUE"
s = ".true."
ELSE
s = "FALSE"
s = ".false."
END IF
END SELECT

Expand Down
8 changes: 5 additions & 3 deletions Source/FTObjects/FTValueDictionaryClass.f90
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,8 @@ END FUNCTION stringValueForKey
SUBROUTINE castDictionaryToValueDictionary(dict,valueDict)
!
! -----------------------------------------------------
! Cast the base class FTObject to the FTException class
! Cast a FTDictionary to a FTValueDictionary as a
! subroutine call.
! -----------------------------------------------------
!
IMPLICIT NONE
Expand Down Expand Up @@ -405,7 +406,7 @@ SUBROUTINE castObjectToValueDictionary(obj,valueDict)
CLASS(FTValueDictionary), POINTER :: valueDict
CLASS(FTObject) , POINTER :: obj

obj => NULL()
valueDict => NULL()
SELECT TYPE (obj)
TYPE is (FTValueDictionary)
valueDict => obj
Expand All @@ -420,7 +421,8 @@ END SUBROUTINE castObjectToValueDictionary
FUNCTION valueDictionaryFromDictionary(dict) RESULT(valueDict)
!
! -----------------------------------------------------
! Cast the base class FTObject to the FTException class
! Cast FTDictionary to the FTValueDictionary class as
! a function call.
! -----------------------------------------------------
!
IMPLICIT NONE
Expand Down
Loading