-
Notifications
You must be signed in to change notification settings - Fork 300
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
Add support to test caught exceptions (fixes #591) #813
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
archunit/src/main/java/com/tngtech/archunit/core/domain/TryCatchBlock.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| /* | ||
| * Copyright 2014-2022 TNG Technology Consulting GmbH | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.tngtech.archunit.core.domain; | ||
|
|
||
| import java.util.Set; | ||
|
|
||
| import com.google.common.collect.ImmutableSet; | ||
| import com.tngtech.archunit.PublicAPI; | ||
| import com.tngtech.archunit.core.domain.properties.HasOwner; | ||
| import com.tngtech.archunit.core.domain.properties.HasSourceCodeLocation; | ||
| import com.tngtech.archunit.core.importer.DomainBuilders.TryCatchBlockBuilder; | ||
|
|
||
| import static com.google.common.base.MoreObjects.toStringHelper; | ||
| import static com.google.common.base.Preconditions.checkNotNull; | ||
| import static com.tngtech.archunit.PublicAPI.Usage.ACCESS; | ||
| import static com.tngtech.archunit.core.domain.properties.HasName.Utils.namesOf; | ||
|
|
||
| @PublicAPI(usage = ACCESS) | ||
| public final class TryCatchBlock implements HasOwner<JavaCodeUnit>, HasSourceCodeLocation { | ||
| private final JavaCodeUnit owner; | ||
| private final Set<JavaClass> caughtThrowables; | ||
| private final SourceCodeLocation sourceCodeLocation; | ||
| private final Set<JavaAccess<?>> accessesContainedInTryBlock; | ||
|
|
||
| TryCatchBlock(TryCatchBlockBuilder builder) { | ||
| this.owner = checkNotNull(builder.getOwner()); | ||
| this.caughtThrowables = ImmutableSet.copyOf(builder.getCaughtThrowables()); | ||
| this.sourceCodeLocation = checkNotNull(builder.getSourceCodeLocation()); | ||
| this.accessesContainedInTryBlock = ImmutableSet.copyOf(builder.getAccessesContainedInTryBlock()); | ||
| } | ||
|
|
||
| @Override | ||
| @PublicAPI(usage = ACCESS) | ||
| public JavaCodeUnit getOwner() { | ||
| return owner; | ||
| } | ||
|
|
||
| @PublicAPI(usage = ACCESS) | ||
| public Set<JavaClass> getCaughtThrowables() { | ||
| return caughtThrowables; | ||
| } | ||
|
|
||
| @Override | ||
| @PublicAPI(usage = ACCESS) | ||
| public SourceCodeLocation getSourceCodeLocation() { | ||
| return sourceCodeLocation; | ||
| } | ||
|
|
||
| @PublicAPI(usage = ACCESS) | ||
| public Set<JavaAccess<?>> getAccessesContainedInTryBlock() { | ||
| return accessesContainedInTryBlock; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return toStringHelper(this) | ||
| .add("owner", owner.getFullName()) | ||
| .add("caughtThrowables", namesOf(caughtThrowables)) | ||
| .add("location", sourceCodeLocation) | ||
| .toString(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@codecholeric, why would we need
? extends Class?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is part of the Java Generics variance behavior. At least AFAIS without the
? extendsyou can't use it forwhile you can use it for
The problem seems to be that in the former case the inferred type is
List<Class<? extends Serializable>>which seems to conflict withIterable<Class<?>>. So to make the API more convenient I changed the signature to allow subtypes ofClass<?>, because then the former case compiles without the need to explicitly fix the type byImmutableList.<Class<?>>. Should maybe add a test though and split out the commit 😉 (because I saw that the final state actually compiles without this change, so I think I added it at some point when I stumbled over it, but the reason afterwards wasn't necessary to be added to the PR after all 🤷♂️)