Skip to content

Fixes ProjectContextInitializerTest #307

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

Merged
merged 1 commit into from
Aug 8, 2022
Merged

Fixes ProjectContextInitializerTest #307

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
137 changes: 71 additions & 66 deletions ...e/src/test/java/org/springframework/sbm/project/parser/ProjectContextInitializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
import org.springframework.sbm.java.refactoring.JavaRefactoringFactoryImpl;
import org.springframework.sbm.java.util.BasePackageCalculator;
import org.springframework.sbm.openrewrite.RewriteExecutionContext;
import org.springframework.sbm.project.RewriteSourceFileWrapper;
import org.springframework.sbm.project.parser.*;
import org.springframework.sbm.project.resource.*;
import org.springframework.sbm.properties.parser.RewritePropertiesParser;
import org.springframework.sbm.xml.parser.RewriteXmlParser;
Expand All @@ -56,50 +58,53 @@
import static org.mockito.Mockito.mock;
import static org.springframework.sbm.project.parser.ResourceVerifierTestHelper.*;

//@SpringBootTest(classes = {
// ProjectContextInitializer.class,
// RewriteMavenArtifactDownloader.class,
// JavaProvenanceMarkerFactory.class,
// BasePackageCalculator.class,
// BasePackageCalculator.class,
// ProjectRootPathResolver.class,
// PreconditionVerifier.class,
// ProjectContextFactory.class,
// RewriteMavenParserFactory.class, // FIXME: #7 remove class
// MavenPomCacheProvider.class,
// SbmApplicationProperties.class,
// PathScanner.class,
// RewriteJavaParser.class,
// RewritePlainTextParser.class,
// RewriteYamlParser.class,
// RewriteJsonParser.class,
// ResourceParser.class,
// RewritePropertiesParser.class,
// MavenProjectParser.class,
// RewriteMavenParser.class,
// RewriteXmlParser.class,
// ResourceHelper.class,
// ResourceLoader.class,
// GitSupport.class,
// ScanCommand.class,
// ProjectResourceSetHolder.class,
// JavaRefactoringFactoryImpl.class,
// ProjectResourceWrapperRegistry.class
//}, properties = {"sbm.gitSupportEnabled=false"})
@SpringBootTest(classes = {
ProjectContextInitializer.class,
RewriteMavenArtifactDownloader.class,
JavaProvenanceMarkerFactory.class,
BasePackageCalculator.class,
BasePackageCalculator.class,
ProjectRootPathResolver.class,
PreconditionVerifier.class,
ProjectContextFactory.class,
MavenPomCacheProvider.class,
SbmApplicationProperties.class,
PathScanner.class,
RewriteJavaParser.class,
RewritePlainTextParser.class,
RewriteYamlParser.class,
RewriteJsonParser.class,
ResourceParser.class,
RewritePropertiesParser.class,
MavenProjectParser.class,
RewriteMavenParser.class,
RewriteXmlParser.class,
ResourceHelper.class,
ResourceLoader.class,
GitSupport.class,
ScanCommand.class,
ProjectResourceSetHolder.class,
JavaRefactoringFactoryImpl.class,
ProjectResourceWrapperRegistry.class,
RewriteSourceFileWrapper.class
}, properties = {"sbm.gitSupportEnabled=false"})
@Disabled
class ProjectContextInitializerTest {

public static final int VERSION_PATTERN = 17;
private final Path projectDirectory = Path.of("./testcode/path-scanner").toAbsolutePath().normalize();

// @Autowired
@Autowired
private ProjectContextInitializer sut;

// @Autowired
@Autowired
private ScanCommand scanCommand;

@BeforeEach
void beforeEach() throws IOException {
FileSystemUtils.deleteRecursively(projectDirectory.toAbsolutePath().resolve(".git"));
Path repo = projectDirectory.toAbsolutePath().resolve(".git");
FileSystemUtils.deleteRecursively(repo);
GitSupport.initGit(repo.toFile());
}

@AfterEach
Expand All @@ -112,20 +117,20 @@ void afterEach() throws IOException {
@Disabled
void test() {

assertThat(projectDirectory.toAbsolutePath().resolve(".git")).doesNotExist();
//assertThat(projectDirectory.toAbsolutePath().resolve(".git")).doesNotExist();

ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
RewriteExecutionContext executionContext = new RewriteExecutionContext(eventPublisher);
List<Resource> resources = scanCommand.scanProjectRoot(projectDirectory.toString());
ProjectContext projectContext = sut.initProjectContext(projectDirectory, resources, executionContext);
List<RewriteSourceFileHolder<? extends SourceFile>> projectResources = projectContext.getProjectResources().list();

assertThat(projectDirectory.toAbsolutePath().resolve(".git")).exists();
//assertThat(projectDirectory.toAbsolutePath().resolve(".git")).exists();

assertThat(projectResources).hasSize(19);

verifyResource("testcode/pom.xml").wrapsInstanceOf(Xml.Document.class);
verifyIgnored(projectResources, "testcode/path-scanner/.git");
//verifyIgnored(projectResources, "testcode/path-scanner/.git");

verifyResource("testcode/path-scanner/pom.xml")
.wrapsInstanceOf(Xml.Document.class)
Expand All @@ -137,7 +142,7 @@ void test() {
noDependencies()
),
buildToolMarker("Maven", "3.6"), // TODO: does this work in all env (taken from .mvn)?
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "17", "11"),
javaProjectMarker(null, "com.example:example-project-parent:1.0.0-SNAPSHOT"),
gitProvenanceMarker("master")
)
Expand All @@ -157,7 +162,7 @@ void test() {
Scope.Test, List.of("org.jetbrains:annotations:23.0.0")
)),
buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
gitProvenanceMarker("master")
)
Expand All @@ -168,7 +173,7 @@ void test() {
.havingMarkers(
javaSourceSetMarker("main", ""),
buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
gitProvenanceMarker("master")
)
Expand All @@ -178,9 +183,9 @@ void test() {
.wrapsInstanceOf(PlainText.class)
.havingMarkers(
buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
javaSourceSetMarker("main", 1903),
javaSourceSetMarker("main", 1919),
gitProvenanceMarker("master")
)
.isContainedIn(projectResources);
Expand All @@ -189,9 +194,9 @@ void test() {
.wrapsInstanceOf(Xml.Document.class)
.havingMarkers(
buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
javaSourceSetMarker("main", 1903),
javaSourceSetMarker("main", 1919),
gitProvenanceMarker("master")
)
.isContainedIn(projectResources);
Expand All @@ -200,9 +205,9 @@ void test() {
.wrapsInstanceOf(Yaml.Documents.class)
.havingMarkers(
buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
javaSourceSetMarker("main", 1903),
javaSourceSetMarker("main", 1919),
gitProvenanceMarker("master")
)
.isContainedIn(projectResources);
Expand All @@ -211,9 +216,9 @@ void test() {
.wrapsInstanceOf(Properties.class)
.havingMarkers(
buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
javaSourceSetMarker("main", 1903),
javaSourceSetMarker("main", 1919),
gitProvenanceMarker("master")
)
.isContainedIn(projectResources);
Expand All @@ -222,9 +227,9 @@ void test() {
.wrapsInstanceOf(PlainText.class)
.havingMarkers(
buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
javaSourceSetMarker("main", 1903),
javaSourceSetMarker("main", 1919),
gitProvenanceMarker("master")
)
.isContainedIn(projectResources);
Expand All @@ -233,19 +238,19 @@ void test() {
.wrapsInstanceOf(PlainText.class)
.havingMarkers(
buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
javaSourceSetMarker("main", 1903),
javaSourceSetMarker("main", 1919),
gitProvenanceMarker("master")
)
.isContainedIn(projectResources);

verifyResource("testcode/path-scanner/module1/src/main/resources/some.txt")
.wrapsInstanceOf(PlainText.class)
.havingMarkers(buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
javaSourceSetMarker("main", 1903),
javaSourceSetMarker("main", 1919),
gitProvenanceMarker("master")
)
.isContainedIn(projectResources);
Expand All @@ -254,9 +259,9 @@ void test() {
.wrapsInstanceOf(Xml.Document.class)
.havingMarkers(
buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
javaSourceSetMarker("main", 1903),
javaSourceSetMarker("main", 1919),
gitProvenanceMarker("master")
)
.isContainedIn(projectResources);
Expand All @@ -265,9 +270,9 @@ void test() {
.wrapsInstanceOf(Xml.Document.class)
.havingMarkers(
buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
javaSourceSetMarker("main", 1903),
javaSourceSetMarker("main", 1919),
gitProvenanceMarker("master")
)
.isContainedIn(projectResources);
Expand All @@ -276,19 +281,19 @@ void test() {
.wrapsInstanceOf(Xml.Document.class)
.havingMarkers(
buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
javaSourceSetMarker("main", 1903),
javaSourceSetMarker("main", 1919),
gitProvenanceMarker("master")
)
.isContainedIn(projectResources);

verifyResource("testcode/path-scanner/module1/src/main/webapp/META-INF/some.xsl")
.wrapsInstanceOf(Xml.Document.class)
.havingMarkers(buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
javaSourceSetMarker("main", 1903),
javaSourceSetMarker("main", 1919),
gitProvenanceMarker("master")
)
.isContainedIn(projectResources);
Expand All @@ -297,9 +302,9 @@ void test() {
.wrapsInstanceOf(Xml.Document.class)
.havingMarkers(
buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module1:1.0.0-SNAPSHOT"),
javaSourceSetMarker("main", 1903),
javaSourceSetMarker("main", 1919),
gitProvenanceMarker("master")
)
.isContainedIn(projectResources);
Expand All @@ -320,7 +325,7 @@ void test() {
)
),
buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module2:1.0.0-SNAPSHOT"),
gitProvenanceMarker("master")
)
Expand All @@ -330,7 +335,7 @@ void test() {
.wrapsInstanceOf(J.CompilationUnit.class)
.havingMarkers(
buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module2:1.0.0-SNAPSHOT"),
javaSourceSetMarker("main", "java.awt.dnd.DragGestureRecognizer, java.nio.channels.ClosedByInterruptException, java.lang.management.ThreadMXBean"),
javaSourceSetMarker("test", "java.awt.dnd.DragGestureRecognizer, java.nio.channels.ClosedByInterruptException, java.lang.management.ThreadMXBean"),
Expand All @@ -342,7 +347,7 @@ void test() {
.wrapsInstanceOf(PlainText.class)
.havingMarkers(
buildToolMarker("Maven", "3.6"),
javaVersionMarker(11, "11", "11"),
javaVersionMarker(VERSION_PATTERN, "11", "11"),
javaProjectMarker(null, "com.example:module2:1.0.0-SNAPSHOT"),
javaSourceSetMarker("test", ""),
gitProvenanceMarker("master")
Expand Down