Fix(testsuite): Artifact type tests

Apicurio · Jan 14, 2025 · 0ef1ed5 · 0ef1ed5
1 parent 6746a0a
commit 0ef1ed5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/src/main/java/io/apicurio/registry/systemtests/client/ArtifactContent.java b/src/main/java/io/apicurio/registry/systemtests/client/ArtifactContent.java
@@ -19,7 +19,8 @@ public final class ArtifactContent {
             "{\"name\":\"price\", \"type\":\"string\"}" +
             "]" +
             "}\"";
-    public static final String DEFAULT_AVRO_UPDATED = "\"{\\\"key\\\":\\\"id\\\"}\"";;
+    public static final String DEFAULT_AVRO_UPDATED = "\"{\\\"key\\\":\\\"id\\\"}\"";
+    public static final String DEFAULT_AVRO_UPDATED_PLAIN = "\"{\"key\":\"id\"}\"";
 
     public static final String DEFAULT_PROTOBUF = "syntax = \"proto3\";\n" +
             "\n" +

diff --git a/src/test/java/io/apicurio/registry/systemtests/api/features/CreateReadUpdateDelete.java b/src/test/java/io/apicurio/registry/systemtests/api/features/CreateReadUpdateDelete.java
@@ -44,43 +44,43 @@ public class CreateReadUpdateDelete {
         put(ArtifactType.XML, ArtifactContent.DEFAULT_XML_UPDATED);
     }};
 
-    public static void testCreateReadUpdateDeleteAvro(ApicurioRegistry apicurioRegistry) {
+    public static void testCreateReadUpdateDeleteAvro(ApicurioRegistry3 apicurioRegistry) {
         testCreateReadUpdateDelete(apicurioRegistry, null, null, ArtifactType.AVRO, false);
     }
 
-    public static void testCreateReadUpdateDeleteProtobuf(ApicurioRegistry apicurioRegistry) {
+    public static void testCreateReadUpdateDeleteProtobuf(ApicurioRegistry3 apicurioRegistry) {
         testCreateReadUpdateDelete(apicurioRegistry, null, null, ArtifactType.PROTOBUF, false);
     }
 
-    public static void testCreateReadUpdateDeleteJson(ApicurioRegistry apicurioRegistry) {
+    public static void testCreateReadUpdateDeleteJson(ApicurioRegistry3 apicurioRegistry) {
         testCreateReadUpdateDelete(apicurioRegistry, null, null, ArtifactType.JSON, false);
     }
 
-    public static void testCreateReadUpdateDeleteOpenapi(ApicurioRegistry apicurioRegistry) {
+    public static void testCreateReadUpdateDeleteOpenapi(ApicurioRegistry3 apicurioRegistry) {
         testCreateReadUpdateDelete(apicurioRegistry, null, null, ArtifactType.OPENAPI, false);
     }
 
-    public static void testCreateReadUpdateDeleteAsyncapi(ApicurioRegistry apicurioRegistry) {
+    public static void testCreateReadUpdateDeleteAsyncapi(ApicurioRegistry3 apicurioRegistry) {
         testCreateReadUpdateDelete(apicurioRegistry, null, null, ArtifactType.ASYNCAPI, false);
     }
 
-    public static void testCreateReadUpdateDeleteGraphql(ApicurioRegistry apicurioRegistry) {
+    public static void testCreateReadUpdateDeleteGraphql(ApicurioRegistry3 apicurioRegistry) {
         testCreateReadUpdateDelete(apicurioRegistry, null, null, ArtifactType.GRAPHQL, false);
     }
 
-    public static void testCreateReadUpdateDeleteKconnect(ApicurioRegistry apicurioRegistry) {
+    public static void testCreateReadUpdateDeleteKconnect(ApicurioRegistry3 apicurioRegistry) {
         testCreateReadUpdateDelete(apicurioRegistry, null, null, ArtifactType.KCONNECT, false);
     }
 
-    public static void testCreateReadUpdateDeleteWsdl(ApicurioRegistry apicurioRegistry) {
+    public static void testCreateReadUpdateDeleteWsdl(ApicurioRegistry3 apicurioRegistry) {
         testCreateReadUpdateDelete(apicurioRegistry, null, null, ArtifactType.WSDL, false);
     }
 
-    public static void testCreateReadUpdateDeleteXsd(ApicurioRegistry apicurioRegistry) {
+    public static void testCreateReadUpdateDeleteXsd(ApicurioRegistry3 apicurioRegistry) {
         testCreateReadUpdateDelete(apicurioRegistry, null, null, ArtifactType.XSD, false);
     }
 
-    public static void testCreateReadUpdateDeleteXml(ApicurioRegistry apicurioRegistry) {
+    public static void testCreateReadUpdateDeleteXml(ApicurioRegistry3 apicurioRegistry) {
         testCreateReadUpdateDelete(apicurioRegistry, null, null, ArtifactType.XML, false);
     }
 
@@ -99,11 +99,8 @@ public static void testCreateReadUpdateDelete(
         // Prepare necessary variables
         String artifactGroupId = "registry-" + UUID.randomUUID();
         String artifactId = "registry-" + UUID.randomUUID();
-        String artifactContent = artifacts
-                .get(artifactType)
-                .replace(Constants.AVRO_ARTIFACT_ID_PLACEHOLDER, artifactId);
-        String updatedArtifactContent = updatedArtifacts
-                .get(artifactType);
+        String artifactContent = artifacts.get(artifactType);
+        String updatedArtifactContent = updatedArtifacts.get(artifactType);
         String hostname = ApicurioRegistryUtils.getApicurioRegistryHostname(apicurioRegistry);
 
         // Get API client