Skip to content

Commit

Permalink
Fix test logic
Browse files Browse the repository at this point in the history
  • Loading branch information
jssblck committed May 7, 2024
1 parent d01bb26 commit 070acc4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/Strategy/Maven/Common.hs
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,12 @@ filterMavenDependencyByScope :: MavenScopeFilters -> Graphing MavenDependency ->
filterMavenDependencyByScope scopeFilters = Graphing.shrink $ mavenDependencyShouldBeIncluded scopeFilters
where
mavenDependencyShouldBeIncluded :: MavenScopeFilters -> MavenDependency -> Bool
mavenDependencyShouldBeIncluded (MavenScopeOnlyFilters filters) _ | filters == mempty = True
mavenDependencyShouldBeIncluded (MavenScopeExcludeFilters filters) _ | filters == mempty = True
mavenDependencyShouldBeIncluded (MavenScopeOnlyFilters filters) MavenDependency{dependencyScopes} | Set.null dependencyScopes = Set.null filters
mavenDependencyShouldBeIncluded (MavenScopeExcludeFilters _) MavenDependency{dependencyScopes} | Set.null dependencyScopes = True
mavenDependencyShouldBeIncluded (MavenScopeOnlyFilters predicates) MavenDependency{dependencyScopes} = Set.isSubsetOf predicates dependencyScopes
mavenDependencyShouldBeIncluded (MavenScopeExcludeFilters predicates) dep = isNothing . List.find (mavenScopeFilterPredicateMatches dep) $ Set.toList predicates

mavenScopeFilterPredicateMatches :: MavenDependency -> MavenScopeFilterPredicate -> Bool
mavenScopeFilterPredicateMatches MavenDependency{dependencyScopes} _ | dependencyScopes == mempty = True
mavenScopeFilterPredicateMatches MavenDependency{dependencyScopes} _ | Set.null dependencyScopes = True
mavenScopeFilterPredicateMatches MavenDependency{dependencyScopes} (MavenScopeFilterPredicateSingle predicates) = Set.member predicates dependencyScopes
mavenScopeFilterPredicateMatches MavenDependency{dependencyScopes} (MavenScopeFilterPredicateCombined predicates) = Set.isSubsetOf predicates dependencyScopes

0 comments on commit 070acc4

Please sign in to comment.