Correct namespace & names of test schema (#405)

Co-authored-by: Andy Coates <[email protected]>
specmesh · Oct 14, 2024 · 3bec34a · 3bec34a
1 parent ed58e14
commit 3bec34a
Show file tree

Hide file tree

Showing 26 changed files with 32 additions and 409 deletions.
diff --git a/cli/provision.properties b/cli/provision.properties
diff --git a/cli/resources/provision.properties b/cli/resources/provision.properties
diff --git a/cli/resources/schema/simple.schema_demo._public.super_user_signed_up.avsc b/cli/resources/schema/simple.schema_demo._public.super_user_signed_up.avsc
diff --git a/cli/resources/schema/simple.schema_demo._public.user_checkout.yml b/cli/resources/schema/simple.schema_demo._public.user_checkout.yml
diff --git a/cli/resources/schema/simple.schema_demo._public.user_info.proto b/cli/resources/schema/simple.schema_demo._public.user_info.proto
diff --git a/cli/resources/schema/simple.schema_demo._public.user_signed_up.avsc b/cli/resources/schema/simple.schema_demo._public.user_signed_up.avsc
diff --git a/cli/resources/schema/simple.schema_demo._public.user_signed_up_value.UserSignedUp.avsc b/cli/resources/schema/simple.schema_demo._public.user_signed_up_value.UserSignedUp.avsc
diff --git a/cli/resources/simple_schema_demo-api.yaml b/cli/resources/simple_schema_demo-api.yaml
diff --git a/cli/resources/simple_spec_demo-api.yaml b/cli/resources/simple_spec_demo-api.yaml
diff --git a/cli/src/test/java/io/specmesh/cli/ProvisionFunctionalTest.java b/cli/src/test/java/io/specmesh/cli/ProvisionFunctionalTest.java
@@ -82,7 +82,7 @@ void shouldProvisionTopicsAndAclResourcesWithSchemas() throws Exception {
                                                 + " --secret admin-secret"
                                                 + " --schema-registry "
                                                 + KAFKA_ENV.schemaRegistryServer()
-                                                + " --schema-path ./resources"
+                                                + " --schema-path ./src/test/resources"
                                                 + " -Dsome.property=testOne"
                                                 + " -Dsome.other.property=testTwo")
                                         .split(" "));

diff --git a/cli/src/test/java/io/specmesh/cli/ProvisionNestedFunctionalTest.java b/cli/src/test/java/io/specmesh/cli/ProvisionNestedFunctionalTest.java
@@ -56,7 +56,7 @@ void shouldProvisionTopicsAndAclResourcesWithNestedSchemasAndRepublishCorrectly(
                                         + " --secret admin-secret"
                                         + " --schema-registry "
                                         + KAFKA_ENV.schemaRegistryServer()
-                                        + " --schema-path ./resources")
+                                        + " --schema-path ./src/test/resources")
                                 .split(" "));
 
         // When:

diff --git a/cli/src/test/java/io/specmesh/cli/StorageConsumptionFunctionalTest.java b/cli/src/test/java/io/specmesh/cli/StorageConsumptionFunctionalTest.java
@@ -66,7 +66,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import picocli.CommandLine;
-import simple.schema_demo._public.user_signed_up_value.UserSignedUp;
+import simple.schema_demo._public.UserSignedUp;
 
 @SuppressFBWarnings({"UW_UNCOND_WAIT", "WA_NOT_IN_LOOP"})
 class StorageConsumptionFunctionalTest {
@@ -90,7 +90,7 @@ void shouldGetStorageAndConsumptionMetrics() throws Exception {
 
         Provisioner.builder()
                 .apiSpec(API_SPEC)
-                .schemaPath("./build/resources/test")
+                .schemaPath("./src/test/resources")
                 .adminClient(KAFKA_ENV.adminClient())
                 .closeAdminClient(true)
                 .schemaRegistryClient(KAFKA_ENV.srClient())

diff --git a/...ic/user_signed_up_value/UserSignedUp.java → ...ple/schema_demo/_public/UserSignedUp.java b/...ic/user_signed_up_value/UserSignedUp.java → ...ple/schema_demo/_public/UserSignedUp.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package simple.schema_demo._public.user_signed_up_value;
+package simple.schema_demo._public;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;