You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/12/07 08:41:45 UTC
[isis] branch master updated: ISIS-2297: tooling: test fixes
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 4ed4a347e1 ISIS-2297: tooling: test fixes
4ed4a347e1 is described below
commit 4ed4a347e1a6c5cfdf09dfe9f4f4e9f58dd1c552
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Dec 7 09:41:38 2022 +0100
ISIS-2297: tooling: test fixes
---
.../tooling/javamodel/test/AnalyzerTest.java | 18 ++++---
.../tooling/javamodel/test/ProjectSamples.java | 59 +++++++---------------
2 files changed, 29 insertions(+), 48 deletions(-)
diff --git a/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/AnalyzerTest.java b/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/AnalyzerTest.java
index c20f24188c..f42ae6a38c 100644
--- a/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/AnalyzerTest.java
+++ b/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/AnalyzerTest.java
@@ -23,8 +23,8 @@ import static guru.nidi.codeassert.config.Language.JAVA;
import java.io.File;
import java.util.stream.Stream;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Files;
@@ -54,7 +54,8 @@ class AnalyzerTest {
ProjectSamples.assertHasApacheCausewayRuntimeSourceFiles(sources);
}
- @Test @Disabled("work in progress, as of yet a proof of concept")
+ @Test //work in progress, as of yet a proof of concept
+ @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
void testJavaDocMining() {
val projDir = ProjectSamples.self();
@@ -67,27 +68,28 @@ class AnalyzerTest {
.map(CompilationUnits::parse)
.flatMap(CompilationUnits::streamTypeDeclarations)
.peek(td->{
-
+
td.getJavadoc().ifPresent(javadoc->{
-
+
javadoc.getBlockTags().stream()
.filter(tag->tag.getTagName().equals("since"))
.forEach(tag->System.out.println("--- SINCE " + tag.getContent().toText()));
-
+
});
-
+
})
.map(AnyTypeDeclaration::getPublicMethodDeclarations)
.flatMap(Can::stream)
.forEach(md->{
-
+
System.out.println("javadoc: " + md.getJavadocComment());
System.out.println("non private method: " + md.getDeclarationAsString());
});
}
- @Test @Disabled("fails when run with the CI pipeline")
+ @Test //fails when run with the CI pipeline
+ @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
void testAnnotationGathering() {
val projDir = ProjectSamples.apacheCausewayRuntime();
diff --git a/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/ProjectSamples.java b/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/ProjectSamples.java
index aa7a5c60cc..fb31ec0695 100644
--- a/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/ProjectSamples.java
+++ b/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/ProjectSamples.java
@@ -32,62 +32,41 @@ class ProjectSamples {
final File projRootFolder = new File("./").getAbsoluteFile().getParentFile().getParentFile().getParentFile();
return projRootFolder;
}
-
+
static File apacheCausewayApplib() {
return new File(apacheCausewayRoot(), "api/applib");
}
-
+
static File apacheCausewayRuntime() {
return new File(apacheCausewayRoot(), "core/runtime");
}
-
+
static File self() {
return new File("./").getAbsoluteFile();
}
-
- static void assertHasApacheCausewayRuntimeClasses(Stream<String> classNames) {
-
+
+ static void assertHasApacheCausewayRuntimeClasses(final Stream<String> classNames) {
+
val components = classNames
- .map(s->s.replace("org.apache.causeway.", "o.a.i."))
+ .map(s->s.replace("org.apache.causeway.", "~."))
//.peek(System.out::println) //debug
.collect(Collectors.toSet());
-
- assertTrue(components.contains("o.a.i.core.runtime.persistence.transaction.AuditerDispatchService"));
- assertTrue(components.contains("o.a.i.core.runtime.persistence.transaction.ChangedObjectsService"));
- assertTrue(components.contains("o.a.i.core.runtime.events.persistence.TimestampService"));
- assertTrue(components.contains("o.a.i.core.runtime.events.RuntimeEventService"));
+
+ assertTrue(components.contains("~.core.runtime.events.MetamodelEventService"));
+ assertTrue(components.contains("~.core.runtime.events.TransactionEventEmitter"));
}
-
- static void assertHasApacheCausewayRuntimeSourceFiles(Stream<String> sourcePaths) {
-
+
+ static void assertHasApacheCausewayRuntimeSourceFiles(final Stream<String> sourcePaths) {
+
val sources = sourcePaths
.map(s->s.replace("\\", "/"))
- .map(s->s.replace("/src/main/java/org/apache/causeway/", "o.a.i/"))
+ .map(s->s.replace("/src/main/java/org/apache/causeway/", "~/"))
//.peek(System.out::println) //debug
.collect(Collectors.toSet());
-
- assertTrue(sources.contains("o.a.i/core/runtime/context/MetaModelContext.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/context/CausewayContext.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/context/memento/ObjectMemento.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/context/memento/ObjectMementoCollection.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/context/memento/ObjectMementoForEmpty.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/context/memento/ObjectMementoService.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/context/RuntimeContext.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/context/RuntimeContextBase.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/events/app/AppLifecycleEvent.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/events/iactn/CausewayInteractionLifecycleEvent.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/events/persistence/PostStoreEvent.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/events/persistence/PreStoreEvent.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/events/persistence/TimestampService.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/events/RuntimeEventService.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/iactn/CausewayInteraction.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/iactn/InteractionService.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/iactn/InteractionTracker.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/iactn/scope/CausewayInteractionScope.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/iactn/scope/CausewayInteractionScopeBeanFactoryPostProcessor.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/iactn/scope/CausewayInteractionScopeCloseListener.java"));
- assertTrue(sources.contains("o.a.i/core/runtime/CausewayModuleCoreRuntime.java"));
-
+
+ assertTrue(sources.contains("~/core/runtime/CausewayModuleCoreRuntime.java"));
+ assertTrue(sources.contains("~/core/runtime/events/MetamodelEventService.java"));
+ assertTrue(sources.contains("~/core/runtime/events/TransactionEventEmitter.java"));
}
-
+
}