Skip to content

Commit

Permalink
Better classpath setting, so gradle tests now pass
Browse files Browse the repository at this point in the history
  • Loading branch information
@holly-cummins
holly-cummins committed Aug 30, 2023
1 parent f95ecb6 commit 8f88f8a
Show file tree
Hide file tree
Showing 4 changed files with 205 additions and 123 deletions.
128 changes: 68 additions & 60 deletions .../deployment/src/main/java/io/quarkus/deployment/dev/testing/CoreQuarkusTestExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
import io.quarkus.bootstrap.resolver.AppModelResolverException;
import io.quarkus.bootstrap.runner.Timing;
import io.quarkus.bootstrap.utils.BuildToolHelper;
import io.quarkus.bootstrap.workspace.ArtifactSources;
import io.quarkus.bootstrap.workspace.SourceDir;
import io.quarkus.bootstrap.workspace.WorkspaceModule;
import io.quarkus.builder.BuildChainBuilder;
import io.quarkus.builder.BuildContext;
import io.quarkus.builder.BuildStep;
Expand Down Expand Up @@ -100,7 +103,8 @@ protected PrepareResult createAugmentor(Class requiredTestClass, Class<? extends
Collection<Runnable> shutdownTasks) throws Exception {

Path testClassLocation = getTestClassesLocation(requiredTestClass);
return createAugmentor(testClassLocation, profile, shutdownTasks);
// TODO this is probably wrong since we find the gradle path in the method but the other path elsewhere
return createAugmentor(testClassLocation, requiredTestClass, profile, shutdownTasks);
}

// TODO Re-used from AbstractJvmQuarkusTestExtension
Expand All @@ -111,8 +115,10 @@ protected ApplicationModel getGradleAppModelForIDE(Path projectRoot) throws IOEx
}

// TODO Re-used from AbstractJvmQuarkusTestExtension
protected PrepareResult createAugmentor(Path testClassLocation, Class<? extends QuarkusTestProfile> profile,
protected PrepareResult createAugmentor(Path testClassLocation, Class<?> requiredTestClass,
Class<? extends QuarkusTestProfile> profile,
Collection<Runnable> shutdownTasks) throws Exception {
System.out.println("HOLLY creating augmentor with prarams" + testClassLocation + " " + requiredTestClass);

// I think the required test class is just an example, since the augmentor is only
// created once per test profile
Expand All @@ -129,62 +135,63 @@ protected PrepareResult createAugmentor(Path testClassLocation, Class<? extends
.normalize()
.toAbsolutePath();

// final ApplicationModel gradleAppModel = getGradleAppModelForIDE(projectRoot);
// If gradle project running directly with IDE
// if (gradleAppModel != null && gradleAppModel.getApplicationModule() != null) {
// final WorkspaceModule module = gradleAppModel.getApplicationModule();
// final String testClassFileName = requiredTestClass.getName().replace('.',
// '/') + ".class";
// Path testClassesDir = null;
// for (String classifier : module.getSourceClassifiers()) {
// final ArtifactSources sources = module.getSources(classifier);
// if (sources.isOutputAvailable() && sources.getOutputTree().contains
// (testClassFileName)) {
// for (SourceDir src : sources.getSourceDirs()) {
// addToBuilderIfConditionMet.accept(src.getOutputDir());
// if (Files.exists(src.getOutputDir().resolve(testClassFileName))) {
// testClassesDir = src.getOutputDir();
// }
// }
// for (SourceDir src : sources.getResourceDirs()) {
// addToBuilderIfConditionMet.accept(src.getOutputDir());
// }
// for (SourceDir src : module.getMainSources().getSourceDirs()) {
// addToBuilderIfConditionMet.accept(src.getOutputDir());
// }
// for (SourceDir src : module.getMainSources().getResourceDirs()) {
// addToBuilderIfConditionMet.accept(src.getOutputDir());
// }
// break;
// }
// }
// if (testClassesDir == null) {
// final StringBuilder sb = new StringBuilder();
// sb.append("Failed to locate ").append(requiredTestClass.getName())
// .append(" in ");
// for (String classifier : module.getSourceClassifiers()) {
// final ArtifactSources sources = module.getSources(classifier);
// if (sources.isOutputAvailable()) {
// for (SourceDir d : sources.getSourceDirs()) {
// if (Files.exists(d.getOutputDir())) {
// sb.append(System.lineSeparator()).append(d.getOutputDir
// ());
// }
// }
// }
// }
// throw new RuntimeException(sb.toString());
// }
// testClassLocation = testClassesDir;
//
// } else {
if (System.getProperty(BootstrapConstants.OUTPUT_SOURCES_DIR) != null) {
final String[] sourceDirectories = System.getProperty(
BootstrapConstants.OUTPUT_SOURCES_DIR)
.split(",");
for (String sourceDirectory : sourceDirectories) {
final Path directory = Paths.get(sourceDirectory);
addToBuilderIfConditionMet.accept(directory);
final ApplicationModel gradleAppModel = getGradleAppModelForIDE(projectRoot);
System.out.println("HOLLY gradle app model is " + gradleAppModel);
//If gradle project running directly with IDE
if (gradleAppModel != null && gradleAppModel.getApplicationModule() != null) {
System.out.println("HOLLY going down IDE gradle path");
final WorkspaceModule module = gradleAppModel.getApplicationModule();
final String testClassFileName = requiredTestClass.getName().replace('.',
'/') + ".class";
Path testClassesDir = null;
for (String classifier : module.getSourceClassifiers()) {
final ArtifactSources sources = module.getSources(classifier);
if (sources.isOutputAvailable() && sources.getOutputTree().contains(testClassFileName)) {
for (SourceDir src : sources.getSourceDirs()) {
addToBuilderIfConditionMet.accept(src.getOutputDir());
if (Files.exists(src.getOutputDir().resolve(testClassFileName))) {
testClassesDir = src.getOutputDir();
}
}
for (SourceDir src : sources.getResourceDirs()) {
addToBuilderIfConditionMet.accept(src.getOutputDir());
}
for (SourceDir src : module.getMainSources().getSourceDirs()) {
addToBuilderIfConditionMet.accept(src.getOutputDir());
}
for (SourceDir src : module.getMainSources().getResourceDirs()) {
addToBuilderIfConditionMet.accept(src.getOutputDir());
}
break;
}
}
if (testClassesDir == null) {
final StringBuilder sb = new StringBuilder();
sb.append("Failed to locate ").append(requiredTestClass.getName())
.append(" in ");
for (String classifier : module.getSourceClassifiers()) {
final ArtifactSources sources = module.getSources(classifier);
if (sources.isOutputAvailable()) {
for (SourceDir d : sources.getSourceDirs()) {
if (Files.exists(d.getOutputDir())) {
sb.append(System.lineSeparator()).append(d.getOutputDir());
}
}
}
}
throw new RuntimeException(sb.toString());
}
testClassLocation = testClassesDir;

} else {
if (System.getProperty(BootstrapConstants.OUTPUT_SOURCES_DIR) != null) {
final String[] sourceDirectories = System.getProperty(
BootstrapConstants.OUTPUT_SOURCES_DIR)
.split(",");
for (String sourceDirectory : sourceDirectories) {
final Path directory = Paths.get(sourceDirectory);
addToBuilderIfConditionMet.accept(directory);
}
}
}

Expand Down Expand Up @@ -281,7 +288,7 @@ protected PrepareResult createAugmentor(Path testClassLocation, Class<? extends
" working directory.");
}

//TODO is this needed?
//TODO is this needed? Or could we take advantage of this more?
// Index testClassesIndex = TestClassIndexer.indexTestClasses(testClassLocation);
// // we need to write the Index to make it reusable from other parts of the testing
// // infrastructure that run in different ClassLoaders
Expand Down Expand Up @@ -330,7 +337,8 @@ public ClassLoader doJavaStart(Path location, CuratedApplication curatedApplicat
Class<? extends QuarkusTestProfile> profile = null;
// TODO do we want any of these?
Collection shutdownTasks = new HashSet();
PrepareResult result = createAugmentor(location, profile, shutdownTasks);
// TODO clearly passing null is not really ideal
PrepareResult result = createAugmentor(location, null, profile, shutdownTasks);
AugmentAction augmentAction = result.augmentAction;
QuarkusTestProfile profileInstance = result.profileInstance;

Expand Down
1 change: 1 addition & 0 deletions core/deployment/src/main/java/io/quarkus/deployment/index/IndexWrapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ static boolean index(Indexer indexer, String className, ClassLoader classLoader)
indexer.index(stream);
result = true;
} else {
System.out.println("HOLLY IndexWrapper error path" + className + classLoader);
LOGGER.warnf("Failed to index %s: Class does not exist in ClassLoader %s", className, classLoader);
}
} catch (IOException e) {
Expand Down
3 changes: 3 additions & 0 deletions independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/BeanArchives.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,9 @@ static boolean index(Indexer indexer, String className, ClassLoader classLoader)
indexer.index(stream);
result = true;
} else {
System.out.println("HOLLY BeanArchives error path" + className + " in " + classLoader);
System.out.printf("HOLLY my go at message Failed to index %s: Class does not exist in ClassLoader %s",
className, classLoader);
LOGGER.warnf("Failed to index %s: Class does not exist in ClassLoader %s", className, classLoader);
}
} catch (IOException e) {
Expand Down
Loading

0 comments on commit 8f88f8a

Please sign in to comment.