iwant-embedded included in essential classes

wipu · Nov 9, 2024 · 57c9de1 · 57c9de1
1 parent 30478a6
commit 57c9de1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
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
@@ -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
@@ -96,6 +96,7 @@ private static List<String> 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
@@ -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/...iwant-embedded/src/main/java/org/fluentjava/iwant/embedded/MockedAsEmbeddedIwantUser.java b/...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
+}