add json AST based test file and ability to run tests against json AST

Author: Brendan McKee

atelier-openapi/Cargo.toml

@@ -18,10 +18,11 @@ all-features = true
 
 [dependencies]
 atelier_core = { version = "~0.2", path = "../atelier-core" }
-okapi =  { git = "https://github.com/GREsau/okapi" }
+okapi = "0.7.0-rc.1"
 serde_json = "1.0"
 
 [dev-dependencies]
 atelier_test = { version = "0.1", path = "../atelier-test" }
 atelier_smithy = { version = "~0.2", path = "../atelier-smithy" }
+atelier_json = { version = "~0.2", path = "../atelier-json" }
 pretty_assertions = "1.1"

atelier-openapi/tests/describe_openapi_writer.rs

@@ -1,31 +1,37 @@
 use atelier_core::io::{read_model_from_file, write_model_to_string};
+use atelier_json::JsonReader;
 use atelier_openapi::OpenApiWriter;
 use atelier_smithy::SmithyReader;
 use okapi::openapi3;
 use pretty_assertions::assert_eq;
-use std::{fs, path::PathBuf};
+use std::{ffi::OsStr, fs, path::PathBuf};
+
+#[test]
+fn test_service() {
+    test("test-service.json");
+}
 
 #[test]
 fn test_unions() {
-    test("union-test");
+    test("union-test.smithy");
 }
 
 const MANIFEST_DIR: &str = env!("CARGO_MANIFEST_DIR");
 
-// test helper which reads a smithy file, converts it to openapi, and compares with the
-// corresponding openapi spec from the /models directory.
+// test helper which reads either a smithy idl file or smithy json file, converts it
+// to openapi, and compares with the corresponding openapi spec from the /models directory.
 fn test(file_name: &str) {
-    let source_file = PathBuf::from(format!(
-        "{}/tests/models/{}.smithy",
-        MANIFEST_DIR, file_name
-    ));
-    let expected_file_path = PathBuf::from(format!(
-        "{}/tests/models/{}.openapi.json",
-        MANIFEST_DIR, file_name
-    ));
-
-    let mut reader = SmithyReader::default();
-    let model = read_model_from_file(&mut reader, source_file).unwrap();
+    let source_file = PathBuf::from(format!("{}/tests/models/{}", MANIFEST_DIR, file_name));
+    let expected_file_path = source_file.with_extension("openapi.json");
+
+    let extension = source_file.extension().and_then(OsStr::to_str).unwrap();
+
+    let model = match extension {
+        "smithy" => read_model_from_file(&mut SmithyReader::default(), source_file),
+        "json" => read_model_from_file(&mut JsonReader::default(), source_file),
+        _ => todo!(),
+    }
+    .unwrap();
 
     let mut writer = OpenApiWriter::default();
     let actual_str = write_model_to_string(&mut writer, &model).unwrap();