test: migrate fixtures to can://<app>/java/...

Rewrite every hard-coded can:// literal in src/test/java to the
app-outermost grammar, preferring composition through CanId helpers
(applicationId/moduleId/childId/ordinalId/externalId/artifactId) over
literal strings so the next grammar change costs nothing. Literal id
strings stay only in CanIdTest, where the exact string is the thing
under test.

Full suite: 560 tests, only CodeAnalyzerIntegrationTest fails (Docker
unavailable), plus the pre-existing 3 Neo4jBoltWriterTest skips
(Docker) and 1 L4GateTest skip (no WALA build in this environment).

Author: rahlk

src/test/java/com/ibm/cldk/CodeAnalyzerV2CliTest.java

@@ -12,6 +12,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.ibm.cldk.schema.CanId;
 import com.networknt.schema.JsonSchema;
 import com.networknt.schema.JsonSchemaFactory;
 import com.networknt.schema.SpecVersion;
@@ -128,7 +129,7 @@ void v2SchemaWritesCanonicalEnvelopeToAnalysisJson(@TempDir Path tmp) throws IOE
         assertEquals("codeanalyzer-java", root.getAsJsonObject("analyzer").get("name").getAsString());
 
         JsonObject app = root.getAsJsonObject("application");
-        assertEquals("can://java/widgets", app.get("id").getAsString());
+        assertEquals(CanId.applicationId("widgets"), app.get("id").getAsString());
         JsonObject symbolTable = app.getAsJsonObject("symbol_table");
         assertTrue(symbolTable.has("src/main/java/com/example/Widget.java"),
                 "keyed by relative path, got: " + symbolTable.keySet());

src/test/java/com/ibm/cldk/artifacts/ArtifactDiscoveryTest.java

@@ -5,6 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.ibm.cldk.schema.CanId;
 import com.ibm.cldk.schema.JArtifact;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -46,7 +47,7 @@ void discover_classifiesPomXmlAsADependencyManifest(@TempDir Path tmp) throws IO
 
         JArtifact pom = artifacts.get("pom.xml");
         assertNotNull(pom);
-        assertEquals("can://artifact/app/pom.xml", pom.getId());
+        assertEquals(CanId.artifactId("app", "pom.xml"), pom.getId());
         assertEquals("pom.xml", pom.getPath());
         // configKeys/extraction are later tasks' fields; discovery must leave their defaults alone.
         assertEquals("artifact", pom.getKind());

src/test/java/com/ibm/cldk/neo4j/BoltWriterPurgeTest.java

@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.ibm.cldk.schema.CanId;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -15,7 +16,7 @@
  * except identity.
  *
  * <p>Scoping on the module's own {@code can://} id fixes both at once, because the id is a path —
- * {@code can://java/<app>/<file>} — so a prefix match is language-, application- and module-scoped
+ * {@code can://<app>/java/<file>} — so a prefix match is language-, application- and module-scoped
  * simultaneously.
  *
  * <p>Asserted on the statement text rather than through a live database: that path needs Docker and
@@ -49,13 +50,15 @@ void thePurgeCarriesALabelSoThePrefixPredicateCanSeek() {
 
     @Test
     void theDescendantPrefixEndsWithTheSeparator() {
-        // Dropping the separator is silent and wrong: can://java/app/src/Foo.java also prefixes
-        // can://java/app/src/Foo.javaX, so a bare STARTS WITH would purge a different module.
-        String prefix = BoltWriter.descendantPrefix("can://java/app/src/Foo.java");
+        // Dropping the separator is silent and wrong: <moduleId> also prefixes <moduleId>X,
+        // so a bare STARTS WITH would purge a different module.
+        String app = CanId.applicationId("app");
+        String moduleId = CanId.moduleId(app, "src/Foo.java");
+        String prefix = BoltWriter.descendantPrefix(moduleId);
         assertTrue(prefix.endsWith("/"), prefix);
-        assertFalse("can://java/app/src/Foo.javaX".startsWith(prefix),
+        assertFalse((moduleId + "X").startsWith(prefix),
                 "a sibling module whose path merely starts the same way must not match");
-        assertTrue("can://java/app/src/Foo.java/Foo/m()".startsWith(prefix),
+        assertTrue(CanId.childId(CanId.childId(moduleId, "Foo"), "m()").startsWith(prefix),
                 "a real declaration of this module must match");
     }
 
@@ -83,7 +86,7 @@ void theOrphanPruneMatchesAV2RootByIdAndALegacyV1RootByNameButNotAnotherApplicat
     void aCanIdIsRecognizedAndAVersionOneIdIsNot() {
         // What selects the purge path at all: v1 ids are FQN-shaped and carry no application
         // segment, so there is nothing to prefix and the purge is skipped rather than mis-scoped.
-        assertTrue(RowBuilder.isCanId("can://java/app/src/Foo.java"));
+        assertTrue(RowBuilder.isCanId(CanId.moduleId(CanId.applicationId("app"), "src/Foo.java")));
         assertFalse(RowBuilder.isCanId("com.l4.Arity#caller(int, int)@22:16-22:25"));
         assertFalse(RowBuilder.isCanId(null));
     }

src/test/java/com/ibm/cldk/neo4j/CypherWriterStreamingTest.java

@@ -5,6 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.ibm.cldk.neo4j.GraphRows.NodeRef;
+import com.ibm.cldk.schema.CanId;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
@@ -30,7 +31,8 @@ private static GraphRows sampleRows(int nodes) {
             Map<String, Object> p = RowBuilder.props();
             p.put("name", "Type" + i);
             p.put("code", "class Type" + i + " { void m() {} }");
-            refs.add(b.node(Arrays.asList("JType", "JSymbol"), "id", "can://java/app/T" + i + ".java/Type" + i, p));
+            String moduleId = CanId.moduleId(CanId.applicationId("app"), "T" + i + ".java");
+            refs.add(b.node(Arrays.asList("JType", "JSymbol"), "id", CanId.childId(moduleId, "Type" + i), p));
         }
         for (int i = 1; i < nodes; i++) {
             b.edge("J_CALLS", refs.get(i - 1), refs.get(i));

src/test/java/com/ibm/cldk/neo4j/V2Neo4jSchemaConformanceTest.java

@@ -466,8 +466,8 @@ void twoApplicationsProjectAsTwoDistinctRoots() {
         String idb = b.nodes.stream().filter(n -> n.labels.contains("JApplication"))
                 .findFirst().orElseThrow().value;
         assertNotEquals(ida, idb, "two services must not share a root node");
-        assertEquals("can://svc-quotes", ida);
-        assertEquals("can://svc-orders", idb);
+        assertEquals(CanId.applicationId("svc-quotes"), ida);
+        assertEquals(CanId.applicationId("svc-orders"), idb);
     }
 
     @Test

src/test/java/com/ibm/cldk/schema/ArtifactModelTest.java

@@ -13,9 +13,9 @@ class ArtifactModelTest {
 
     @Test
     void artifactIdIsLanguageNeutral() {
-        assertEquals("can://artifact/myapp/deploy/docker-compose.yml",
+        assertEquals(CanId.applicationId("myapp") + "/artifact/deploy/docker-compose.yml",
                 CanId.artifactId("myapp", "deploy/docker-compose.yml"),
-                "the scheme carries `artifact`, not `java` — sibling analyzers must land on this node");
+                "the segment carries `artifact`, not `java` — sibling analyzers must land on this node");
     }
 
     @Test
@@ -61,7 +61,7 @@ void unsetOptionalsAreOmittedNotNulled() {
     @Test
     void applicationOmitsTheLayerWhenEmpty() {
         JApplication app = new JApplication();
-        app.setId("can://java/x");
+        app.setId(CanId.applicationId("x"));
         String json = V2Json.compact().toJson(app);
         assertFalse(json.contains("artifacts"), json);
         assertFalse(json.contains("dependencies"), json);

src/test/java/com/ibm/cldk/schema/L2CallGraphGateTest.java

@@ -44,15 +44,17 @@ class L2CallGraphGateTest {
     private static final String APP = "call-graph-test";
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
-    private static final String USER = "can://java/call-graph-test/src/main/java/org/example/User.java/User";
+    private static final String APP_ID = CanId.applicationId(APP);
+    private static final String USER = CanId.childId(
+            CanId.moduleId(APP_ID, "src/main/java/org/example/User.java"), "User");
     private static final String HELLO = USER + "/helloString()";
     private static final String LOG = USER + "/log()";
     private static final String GETNAME = USER + "/getName()";
     private static final String LOGLOG = USER + "/loglog()";
-    private static final String GREETER =
-            "can://java/call-graph-test/src/main/java/org/example/greeting/Greeter.java/Greeter";
+    private static final String GREETER = CanId.childId(
+            CanId.moduleId(APP_ID, "src/main/java/org/example/greeting/Greeter.java"), "Greeter");
     private static final String GREET = GREETER + "/greet(java.lang.String)";
-    private static final String TRIM = "can://java/call-graph-test/@external/java.lang.String/trim()";
+    private static final String TRIM = CanId.externalId(APP, "java.lang.String", "trim()");
 
     /** Analyse the fixture at level 2 (declared only) and return the emitted payload as a Gson tree. */
     private static JsonObject analyseL2() throws IOException {

src/test/java/com/ibm/cldk/schema/L2SchemaOracleTest.java

@@ -29,14 +29,26 @@ class L2SchemaOracleTest {
 
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
+    private static final String APP_ID = CanId.applicationId("myapp");
+    private static final String USER_TYPE =
+            CanId.childId(CanId.moduleId(APP_ID, "src/main/java/org/example/User.java"), "User");
+    private static final String USER_HELLO = USER_TYPE + "/helloString()";
+    private static final String USER_LOG = USER_TYPE + "/log()";
+    private static final String A_TYPE = CanId.childId(CanId.moduleId(APP_ID, "A.java"), "A");
+    private static final String A_F = A_TYPE + "/f()";
+    private static final String A_G = A_TYPE + "/g()";
+    private static final String STRING_VALUE_OF = CanId.externalId("myapp", "java.lang.String", "valueOf(int)");
+    private static final String STRING_CASE_ORDER =
+            CanId.externalId("myapp", "java.lang.String", "CASE_INSENSITIVE_ORDER");
+
     /** Wrap application-level members in an otherwise-minimal conformant envelope. */
     private static String payload(String applicationMembers) {
         return "{"
                 + "\"schema_version\":\"2.0.0\","
                 + "\"language\":\"java\","
                 + "\"max_level\":2,"
                 + "\"application\":{"
-                + "\"id\":\"can://java/myapp\","
+                + "\"id\":\"" + APP_ID + "\","
                 + "\"kind\":\"application\","
                 + "\"symbol_table\":{}"
                 + (applicationMembers.isEmpty() ? "" : "," + applicationMembers)
@@ -62,12 +74,12 @@ private static void assertRejected(String json, String because) throws IOExcepti
     }
 
     private static final String EDGE = "{"
-            + "\"src\":\"can://java/myapp/src/main/java/org/example/User.java/User/helloString()\","
-            + "\"dst\":\"can://java/myapp/src/main/java/org/example/User.java/User/log()\","
+            + "\"src\":\"" + USER_HELLO + "\","
+            + "\"dst\":\"" + USER_LOG + "\","
             + "\"prov\":[\"declared\",\"rta\"],"
             + "\"weight\":2}";
 
-    private static final String EXTERNAL = "\"can://java/myapp/@external/java.lang.String/valueOf(int)\":{"
+    private static final String EXTERNAL = "\"" + STRING_VALUE_OF + "\":{"
             + "\"kind\":\"method\","
             + "\"signature\":\"valueOf(int)\","
             + "\"declaring_type\":\"java.lang.String\"}";
@@ -86,26 +98,26 @@ void anL1PayloadCarryingNeitherSurfaceStillValidates() throws IOException {
     @Test
     void anEdgeMissingItsWeightIsRejected() throws IOException {
         assertRejected(payload("\"call_graph\":[{"
-                        + "\"src\":\"can://java/myapp/A.java/A/f()\","
-                        + "\"dst\":\"can://java/myapp/A.java/A/g()\","
+                        + "\"src\":\"" + A_F + "\","
+                        + "\"dst\":\"" + A_G + "\","
                         + "\"prov\":[\"declared\"]}]"),
                 "weight is the call-site count, so an edge without one asserts nothing about strength");
     }
 
     @Test
     void aZeroWeightEdgeIsRejected() throws IOException {
         assertRejected(payload("\"call_graph\":[{"
-                        + "\"src\":\"can://java/myapp/A.java/A/f()\","
-                        + "\"dst\":\"can://java/myapp/A.java/A/g()\","
+                        + "\"src\":\"" + A_F + "\","
+                        + "\"dst\":\"" + A_G + "\","
                         + "\"prov\":[\"declared\"],\"weight\":0}]"),
                 "an edge with no call sites behind it should not have been emitted at all");
     }
 
     @Test
     void anEdgeWithNoProvenanceIsRejected() throws IOException {
         assertRejected(payload("\"call_graph\":[{"
-                        + "\"src\":\"can://java/myapp/A.java/A/f()\","
-                        + "\"dst\":\"can://java/myapp/A.java/A/g()\","
+                        + "\"src\":\"" + A_F + "\","
+                        + "\"dst\":\"" + A_G + "\","
                         + "\"prov\":[],\"weight\":1}]"),
                 "every edge is attested by at least one analysis");
     }
@@ -115,8 +127,8 @@ void anEdgeProvenanceOutsideTheL2VocabularyIsRejected() throws IOException {
         // `ast` is reserved for a future purely-syntactic fallback. Until something produces it, the
         // oracle accepting it would let a typo through as a new analysis name.
         assertRejected(payload("\"call_graph\":[{"
-                        + "\"src\":\"can://java/myapp/A.java/A/f()\","
-                        + "\"dst\":\"can://java/myapp/A.java/A/g()\","
+                        + "\"src\":\"" + A_F + "\","
+                        + "\"dst\":\"" + A_G + "\","
                         + "\"prov\":[\"ast\"],\"weight\":1}]"),
                 "L2 provenance is the closed enum [declared, rta]");
     }
@@ -125,16 +137,16 @@ void anEdgeProvenanceOutsideTheL2VocabularyIsRejected() throws IOException {
     void anEdgeEndpointThatIsNotACanIdIsRejected() throws IOException {
         assertRejected(payload("\"call_graph\":[{"
                         + "\"src\":\"org.example.A.f()\","
-                        + "\"dst\":\"can://java/myapp/A.java/A/g()\","
+                        + "\"dst\":\"" + A_G + "\","
                         + "\"prov\":[\"declared\"],\"weight\":1}]"),
                 "endpoints are durable can-ids, not display names");
     }
 
     @Test
     void anEdgeCarryingAnUnknownKeyIsRejected() throws IOException {
         assertRejected(payload("\"call_graph\":[{"
-                        + "\"src\":\"can://java/myapp/A.java/A/f()\","
-                        + "\"dst\":\"can://java/myapp/A.java/A/g()\","
+                        + "\"src\":\"" + A_F + "\","
+                        + "\"dst\":\"" + A_G + "\","
                         + "\"prov\":[\"declared\"],\"weight\":1,\"line\":12}]"),
                 "a stray key means a producer emitting a fact no consumer was told about");
     }
@@ -144,15 +156,15 @@ void anInProjectIdKeyingTheExternalMapIsRejected() throws IOException {
         // The overlay rule: external_symbols may only ever describe symbols outside the project. An
         // in-project id here would be a type the tree should have held, silently reclassified.
         assertRejected(payload("\"external_symbols\":{"
-                        + "\"can://java/myapp/src/main/java/org/example/User.java/User/log()\":{"
+                        + "\"" + USER_LOG + "\":{"
                         + "\"kind\":\"method\",\"signature\":\"log()\",\"declaring_type\":\"org.example.User\"}}"),
                 "an in-project can-id is not an external symbol");
     }
 
     @Test
     void anExternalSymbolMissingItsDeclaringTypeIsRejected() throws IOException {
         assertRejected(payload("\"external_symbols\":{"
-                        + "\"can://java/myapp/@external/java.lang.String/valueOf(int)\":{"
+                        + "\"" + STRING_VALUE_OF + "\":{"
                         + "\"kind\":\"method\",\"signature\":\"valueOf(int)\"}}"),
                 "declaring_type is the dotted source spelling the id only carries in binary form");
     }
@@ -161,7 +173,7 @@ void anExternalSymbolMissingItsDeclaringTypeIsRejected() throws IOException {
     void anExternalSymbolOfAnUnmodelledKindIsRejected() throws IOException {
         // Only call sites mint external symbols, and a call site resolves to a method or a constructor.
         assertRejected(payload("\"external_symbols\":{"
-                        + "\"can://java/myapp/@external/java.lang.String/CASE_INSENSITIVE_ORDER\":{"
+                        + "\"" + STRING_CASE_ORDER + "\":{"
                         + "\"kind\":\"field\",\"signature\":\"CASE_INSENSITIVE_ORDER\","
                         + "\"declaring_type\":\"java.lang.String\"}}"),
                 "external symbol kinds are exactly [method, constructor]");
@@ -170,7 +182,7 @@ void anExternalSymbolOfAnUnmodelledKindIsRejected() throws IOException {
     @Test
     void anExternalSymbolCarryingAnUnknownKeyIsRejected() throws IOException {
         assertRejected(payload("\"external_symbols\":{"
-                        + "\"can://java/myapp/@external/java.lang.String/valueOf(int)\":{"
+                        + "\"" + STRING_VALUE_OF + "\":{"
                         + "\"kind\":\"method\",\"signature\":\"valueOf(int)\","
                         + "\"declaring_type\":\"java.lang.String\",\"jar\":\"rt.jar\"}}"),
                 "a stray key means a producer emitting a fact no consumer was told about");

src/test/java/com/ibm/cldk/schema/L3SchemaOracleTest.java

@@ -29,20 +29,25 @@ class L3SchemaOracleTest {
 
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
+    private static final String APP_ID = CanId.applicationId("myapp");
+    private static final String MODULE_ID = CanId.moduleId(APP_ID, "Foo.java");
+    private static final String TYPE_ID = CanId.childId(MODULE_ID, "Foo");
+    private static final String CALLABLE_ID = TYPE_ID + "/m()";
+
     /** A level-3 payload with one callable carrying the given cfg/cdg/ddg member JSON. */
     private static String payload(String overlays) {
         String callable = "{"
-                + "\"id\":\"can://java/myapp/Foo.java/Foo/m()\","
+                + "\"id\":\"" + CALLABLE_ID + "\","
                 + "\"kind\":\"method\","
                 + "\"signature\":\"m()\","
                 + overlays
                 + "}";
         String type = "{"
-                + "\"id\":\"can://java/myapp/Foo.java/Foo\","
+                + "\"id\":\"" + TYPE_ID + "\","
                 + "\"kind\":\"class\","
                 + "\"callables\":{\"m()\":" + callable + "}}";
         String module = "{"
-                + "\"id\":\"can://java/myapp/Foo.java\","
+                + "\"id\":\"" + MODULE_ID + "\","
                 + "\"kind\":\"module\","
                 + "\"source\":\"\","
                 + "\"types\":{\"Foo\":" + type + "}}";
@@ -51,7 +56,7 @@ private static String payload(String overlays) {
                 + "\"language\":\"java\","
                 + "\"max_level\":3,"
                 + "\"application\":{"
-                + "\"id\":\"can://java/myapp\","
+                + "\"id\":\"" + APP_ID + "\","
                 + "\"kind\":\"application\","
                 + "\"symbol_table\":{\"Foo.java\":" + module + "}}}";
     }
@@ -98,7 +103,7 @@ void aCfgEdgeWithAnUnknownKindIsRejected() throws IOException {
 
     @Test
     void aCfgEdgeWithACanIdEndpointIsRejected() throws IOException {
-        assertRejected(payload("\"cfg\":[{\"src\":\"can://java/x\",\"dst\":\"2:5\",\"kind\":\"true\"}]"),
+        assertRejected(payload("\"cfg\":[{\"src\":\"" + CanId.applicationId("x") + "\",\"dst\":\"2:5\",\"kind\":\"true\"}]"),
                 "cfg endpoints are body-node local ids, not can:// ids");
     }
 

src/test/java/com/ibm/cldk/schema/L4ModelSerializationTest.java

@@ -25,13 +25,15 @@ void syntheticVertexFieldsSerializeAsOfAndParent() {
     @Test
     void applicationCarriesParamEdgesOnlyWhenSet() {
         JApplication app = new JApplication();
-        app.setId("can://java/x");
+        String appId = CanId.applicationId("x");
+        app.setId(appId);
         assertFalse(V2Json.compact().toJson(app).contains("param_in"),
                 "absent means no fact — no empty lists below L4");
 
+        String aType = CanId.childId(CanId.moduleId(appId, "f.java"), "A");
         JIdEdge e = new JIdEdge();
-        e.setSrc("can://java/x/f.java/A/a(int)@3:16/actual_in:0");
-        e.setDst("can://java/x/f.java/A/b(int)@formal_in:0");
+        e.setSrc(CanId.ordinalId(aType + "/a(int)", "3:16/actual_in:0"));
+        e.setDst(CanId.ordinalId(aType + "/b(int)", "formal_in:0"));
         app.setParamIn(List.of(e));
         String json = V2Json.compact().toJson(app);
         assertTrue(json.contains("\"param_in\""), json);