Skip to content
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.

Sign up for GitHub

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

Jump to bottom

merge Project and View #752

Merged
merged 20 commits into from
Dec 13, 2023
Merged

merge Project and View #752

merged 20 commits into from
Dec 13, 2023

Conversation

stschott
Copy link
Collaborator

@stschott stschott commented Nov 22, 2023 •
edited
Loading

Changes:

  • Move Language into MultiReleaseJarInputLocation
  • Move List of BodyInterceptors to apply to AnalysisInputLocation
  • Merge Project and View
  • Remove Scope

closes #746

@codecov Codecov
Copy link

codecov bot commented Nov 23, 2023 •
edited
Loading

Codecov Report

Attention: 75 lines in your changes are missing coverage. Please review.

Comparison is base (5d63bd8) 63.55% compared to head (937c393) 63.81%.

Files Patch % Lines
...location/MultiReleaseJarAnalysisInputLocation.java 69.38% 41 Missing and 4 partials ⚠️
...putlocation/ArchiveBasedAnalysisInputLocation.java 70.96% 9 Missing ⚠️
.../inputlocation/PathBasedAnalysisInputLocation.java 66.66% 7 Missing ⚠️
...in/java/sootup/java/core/views/JavaModuleView.java 85.00% 3 Missing ⚠️
...putlocation/DefaultRTJarAnalysisInputLocation.java 0.00% 2 Missing ⚠️
.../sootup/core/inputlocation/EagerInputLocation.java 80.00% 1 Missing ⚠️
.../src/main/java/sootup/core/views/AbstractView.java 80.00% 1 Missing ⚠️
...utlocation/JavaClassPathAnalysisInputLocation.java 83.33% 1 Missing ⚠️
...tlocation/JavaModulePathAnalysisInputLocation.java 83.33% 1 Missing ⚠️
.../src/main/java/sootup/java/core/JavaSootClass.java 0.00% 1 Missing ⚠️
... and 4 more
Additional details and impacted files 
@@              Coverage Diff              @@
##             develop     #752      +/-   ##
=============================================
+ Coverage      63.55%   63.81%   +0.25%     
- Complexity      3347     3383      +36     
=============================================
  Files            318      315       -3     
  Lines          15088    15010      -78     
  Branches        2543     2534       -9     
=============================================
- Hits            9589     9578      -11     
+ Misses          4602     4540      -62     
+ Partials         897      892       -5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

stschott and others added 6 commits November 23, 2023 12:40
@stschott
remove language from JavaProject and adjust test cases
5b7eb64
@stschott
fmt
cb56161
@stschott
start making the JavaModuleView only being created explicitly, not im…
f7a09d6 
…plicitly
@stschott
merge Project and View
2d91b0d
@stschott
Merge remote-tracking branch 'origin/develop' into feature/moveLangua…
5fd6ff0 
…geIntoInputLocation

# Conflicts:
#	sootup.analysis/src/test/java/sootup/analysis/interprocedural/icfg/ICFGDotExporterTest.java
#	sootup.analysis/src/test/java/sootup/analysis/interprocedural/ifds/CGEdgeUtilTest.java
#	sootup.analysis/src/test/java/sootup/analysis/interprocedural/ifds/IFDSTaintTestSetUp.java
#	sootup.callgraph/src/test/java/sootup/callgraph/CallGraphTestBase.java
#	sootup.callgraph/src/test/java/sootup/callgraph/ConcreteDispatchTest.java
#	sootup.callgraph/src/test/java/sootup/callgraph/InstantiateClassValueVisitorTest.java
#	sootup.examples/src/test/java/sootup/examples/callgraph/CallgraphExample.java
#	sootup.examples/src/test/java/sootup/examples/classhierarchy/ClassHierarchy.java
#	sootup.java.bytecode/src/main/java/sootup/java/bytecode/inputlocation/PathBasedAnalysisInputLocation.java
#	sootup.java.bytecode/src/test/java/sootup/java/bytecode/RuntimeJarConversionTests.java
#	sootup.java.bytecode/src/test/java/sootup/java/bytecode/frontend/AsmMethodSourceTest.java
#	sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/JrtFileSystemAnalysisInputLocationTest.java
#	sootup.java.bytecode/src/test/java/sootup/java/bytecode/inputlocation/PathBasedAnalysisInputLocationTest.java
#	sootup.java.bytecode/src/test/java/sootup/java/bytecode/interceptors/typeresolving/TypeAssignerTestSuite.java
#	sootup.tests/src/test/java/sootup/tests/CallGraphTest.java
#	sootup.tests/src/test/java/sootup/tests/typehierarchy/HierarchyComparatorTest.java
@stschott
resolve merge conflicts
4139a54
@github-actions GitHub Actions
Copy link
Contributor

You updated the documentation - Doc Preview.

@stschott stschott changed the title move the language logic from the Project to the AnalysisInputLocation merge Project and View Nov 24, 2023
@JonasKlauke
Copy link
Collaborator

could you test getClassSources on MultiReleaseJarAnalysisInputLocation. it is completly untested

@swissiety
Copy link
Collaborator

swissiety commented Nov 30, 2023 •
edited
Loading

could you test getClassSources on MultiReleaseJarAnalysisInputLocation. it is completly untested

I already added a test in #738

@swissiety swissiety merged commit 89f4004 into develop Dec 13, 2023
9 checks passed
@swissiety swissiety deleted the feature/moveLanguageIntoInputLocation branch December 13, 2023 14:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@swissiety swissiety swissiety approved these changes

@JonasKlauke JonasKlauke JonasKlauke approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

move Classloadingoptions, Language, etc. logic into AnalysisInputLocation
3 participants
@stschott @JonasKlauke @swissiety