joshuaclayton/unused
1
1
Fork 0
mirror of https://github.com/joshuaclayton/unused.git synced 2024-08-16 08:10:55 +03:00
Code Issues Projects Releases Wiki Activity

Store computed aliases on TermResults

Browse Source
This commit is contained in:
Joshua Clayton 2016-06-18 07:41:50 -04:00
parent a6e926e4d2
commit ce9b3b8a13
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Unused/Types.hs
View File

@ -15,6 +15,7 @@ module Unused.Types
import qualified Data.Map.Strict as Map
import Data.Csv
import qualified Data.List as L
import GHC.Generics
import Unused.Regex
@ -34,6 +35,7 @@ data Occurrences = Occurrences
data TermResults = TermResults
{ trTerm :: String
, trTerms :: [String]
, trMatches :: [TermMatch]
, trTestOccurrences :: Occurrences
, trAppOccurrences :: Occurrences
@ -63,6 +65,7 @@ resultsFromMatches :: [TermMatch] -> TermResults
resultsFromMatches m =
TermResults
{ trTerm = resultTerm terms
, trTerms = L.sort $ L.nub terms
, trMatches = m
, trAppOccurrences = appOccurrence
, trTestOccurrences = testOccurrence

8
test/Unused/ParserSpec.hs
View File

@ -18,10 +18,10 @@ spec = parallel $
, TermMatch "method_name" "app/path/other.rb" 5
, TermMatch "method_name" "spec/path/foo_spec.rb" 10
]
let r1Results = TermResults "method_name" r1Matches (Occurrences 1 10) (Occurrences 2 6) (Occurrences 3 16) (Removal Low "used frequently")
let r1Results = TermResults "method_name" ["method_name"] r1Matches (Occurrences 1 10) (Occurrences 2 6) (Occurrences 3 16) (Removal Low "used frequently")
let r2Matches = [ TermMatch "other" "app/path/other.rb" 1 ]
let r2Results = TermResults "other" r2Matches (Occurrences 0 0) (Occurrences 1 1) (Occurrences 1 1) (Removal High "used once")
let r2Results = TermResults "other" ["other"] r2Matches (Occurrences 0 0) (Occurrences 1 1) (Occurrences 1 1) (Removal High "used once")
(Right config) <- loadConfig
@ -35,7 +35,7 @@ spec = parallel $
, TermMatch "method_name" "app/path/other.rb" 5
, TermMatch "method_name" "spec/path/foo_spec.rb" 10
]
let r1Results = TermResults "method_name" r1Matches (Occurrences 1 10) (Occurrences 2 6) (Occurrences 3 16) (Removal Low "used frequently")
let r1Results = TermResults "method_name" ["method_name"] r1Matches (Occurrences 1 10) (Occurrences 2 6) (Occurrences 3 16) (Removal Low "used frequently")
let result = parseResults [] $ SearchResults r1Matches
@ -55,7 +55,7 @@ spec = parallel $
let result = parseResults config $ SearchResults searchResults
let results = TermResults "admin?" searchResults (Occurrences 2 4) (Occurrences 1 3) (Occurrences 3 7) (Removal Low "used frequently")
let results = TermResults "admin?" ["admin?", "be_admin"] searchResults (Occurrences 2 4) (Occurrences 1 3) (Occurrences 3 7) (Removal Low "used frequently")
result `shouldBe`
Map.fromList [ ("admin?|be_admin", results) ]

2
test/Unused/TypesSpec.hs
View File

@ -15,4 +15,4 @@ spec = parallel $
]
resultsFromMatches matches `shouldBe`
TermResults "ApplicationController" matches (Occurrences 1 10) (Occurrences 1 1) (Occurrences 2 11) (Removal NotCalculated "Likelihood not calculated")
TermResults "ApplicationController" ["ApplicationController"] matches (Occurrences 1 10) (Occurrences 1 1) (Occurrences 2 11) (Removal NotCalculated "Likelihood not calculated")