From 57c9de16eff06faa05c4452110c2f9622c6d83a0 Mon Sep 17 00:00:00 2001 From: Ville Oikarinen Date: Sat, 9 Nov 2024 14:54:37 +0200 Subject: [PATCH] iwant-embedded included in essential classes --- .../main/java/org/fluentjava/iwant/wsdef/IwantModules.java | 1 + .../src/main/java/org/fluentjava/iwant/entry2/Iwant2.java | 1 + .../test/java/org/fluentjava/iwant/entry2/Iwant2Test.java | 7 +++++++ .../iwant/embedded/MockedAsEmbeddedIwantUser.java | 5 +++++ 4 files changed, 14 insertions(+) create mode 100644 private/iwant-mock-wsroot/essential/iwant-embedded/src/main/java/org/fluentjava/iwant/embedded/MockedAsEmbeddedIwantUser.java diff --git a/as-iwant-developer/i-have/wsdef/src/main/java/org/fluentjava/iwant/wsdef/IwantModules.java b/as-iwant-developer/i-have/wsdef/src/main/java/org/fluentjava/iwant/wsdef/IwantModules.java index 646835bb..2311d20e 100644 --- a/as-iwant-developer/i-have/wsdef/src/main/java/org/fluentjava/iwant/wsdef/IwantModules.java +++ b/as-iwant-developer/i-have/wsdef/src/main/java/org/fluentjava/iwant/wsdef/IwantModules.java @@ -326,6 +326,7 @@ private static IwantSrcModuleSpex withMockrootMainJavas( mod.mainJava("essential/iwant-api-model/src/main/java"); mod.mainJava("essential/iwant-api-wsdef/src/main/java"); mod.mainJava("essential/iwant-coreservices/src/main/java"); + mod.mainJava("essential/iwant-embedded/src/main/java"); mod.mainJava("essential/iwant-entry/as-some-developer/with/java"); mod.mainJava("essential/iwant-entry2/src/main/java"); mod.mainJava("essential/iwant-entry3/src/main/java"); diff --git a/essential/iwant-entry2/src/main/java/org/fluentjava/iwant/entry2/Iwant2.java b/essential/iwant-entry2/src/main/java/org/fluentjava/iwant/entry2/Iwant2.java index a201db2c..b66fb376 100644 --- a/essential/iwant-entry2/src/main/java/org/fluentjava/iwant/entry2/Iwant2.java +++ b/essential/iwant-entry2/src/main/java/org/fluentjava/iwant/entry2/Iwant2.java @@ -96,6 +96,7 @@ private static List relativeIwantSrcDirs() { srcDirs.add("iwant-coreservices/" + "src/main/java"); srcDirs.add("iwant-entry/" + "as-some-developer/with/java"); srcDirs.add("iwant-eclipse-settings/" + "src/main/java"); + srcDirs.add("iwant-embedded/" + "src/main/java"); srcDirs.add("iwant-entry2/" + "src/main/java"); srcDirs.add("iwant-entry3/" + "src/main/java"); srcDirs.add("iwant-iwant-wsroot-finder/" + "src/main/java"); diff --git a/essential/iwant-entry2/src/test/java/org/fluentjava/iwant/entry2/Iwant2Test.java b/essential/iwant-entry2/src/test/java/org/fluentjava/iwant/entry2/Iwant2Test.java index ceeb4154..68622c62 100644 --- a/essential/iwant-entry2/src/test/java/org/fluentjava/iwant/entry2/Iwant2Test.java +++ b/essential/iwant-entry2/src/test/java/org/fluentjava/iwant/entry2/Iwant2Test.java @@ -153,6 +153,13 @@ public void testIwant2CallsIwant3UsingCorrectClasspath() throws Exception { + "/iwant-wsroot-marker/, file:" + testArea.root() + "/all-iwant-classes/, " + antJar.toURI() + ", " + antLauncherJar.toURI() + "]\n", out()); + + // all essential module main sources can be found in the combined + // essentials: + // TODO assert some more, perhaps + testArea.shallContainFragmentIn("all-iwant-classes/" + + "org/fluentjava/iwant/embedded/MockedAsEmbeddedIwantUser.class", + "MockedAsEmbeddedIwantUser"); } public void testIwant2CompilesIwantWithDebugInformation() throws Exception { diff --git a/private/iwant-mock-wsroot/essential/iwant-embedded/src/main/java/org/fluentjava/iwant/embedded/MockedAsEmbeddedIwantUser.java b/private/iwant-mock-wsroot/essential/iwant-embedded/src/main/java/org/fluentjava/iwant/embedded/MockedAsEmbeddedIwantUser.java new file mode 100644 index 00000000..36d71d89 --- /dev/null +++ b/private/iwant-mock-wsroot/essential/iwant-embedded/src/main/java/org/fluentjava/iwant/embedded/MockedAsEmbeddedIwantUser.java @@ -0,0 +1,5 @@ +package org.fluentjava.iwant.embedded; + +public class MockedAsEmbeddedIwantUser { + // just a tracer, to test this src dir is included in essentials +}