fix: add all relevant test

Author: dnitsch

src/dotnet/Schema.Generator/taskfile.yml

@@ -11,7 +11,7 @@ tasks:
       - rm -rf dist/dotnet/*
       - mkdir -p dist/dotnet
   # SchemaGenerator DOTNET
-  schemagenerator_bin-gen:
+  bin-gen:
     desc: Builds a single binary of the schema generator for each platform
     deps:
       - clean_dotnet
@@ -28,7 +28,7 @@ tasks:
     env:
       VERSION: "{{.GIT_TAG}}"
 
-  schemagenerator_test:
+  test:
     desc: Runs the tests for SchemaGenerator
     cmd: |
       cd src/dotnet/Schema.Generator
@@ -38,7 +38,7 @@ tasks:
     env:
       VERSION: 0.0.1
 
-  schemagenerator_show-coverage:
+  show-coverage:
     desc: Shows coverage in a visual tool
     preconditions:
       - dotnet --help
@@ -49,4 +49,4 @@ tasks:
       - |
         cd src/dotnet/Schema.Generator
         reportgenerator -reports:".coverage/*/coverage.cobertura.xml" -targetdir:".coverage/report" -reporttypes:Html
-        {{if eq OS "windows"}}start ""{{else}}open{{end}} .coverage/report/index.html
+        {{if eq OS "windows"}}start ""{{else}}open{{end}} .coverage/report/index.html

src/go/async-api-gen-doc/cmd/async-api-gen-doc/root_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 func Test_root_ok(t *testing.T) {
-	baseDir := "test/bazquxsample"
+	baseDir := "test/foo.sample"
 	b := new(bytes.Buffer)
 
 	cmd := asyncapigendoc.AsyncAPIGenCmd

src/go/async-api-gen-doc/cmd/async-api-gen-doc/single_ctx_test.go

@@ -12,7 +12,7 @@ import (
 )
 
 func Test_single_repo_Analyis_runs_ok(t *testing.T) {
-	baseDir := "test/bazquxsample"
+	baseDir := "test/foo.sample"
 
 	searchParentDir := fmt.Sprintf("local://%s", fshelper.DebugDirHelper(t, baseDir, "cmd/async-api-gen-doc", "../../"))
 

src/go/async-api-gen-doc/internal/fshelper/fshelper_test.go

@@ -12,7 +12,7 @@ import (
 )
 
 func Test_ListFiles_in_mock_directory(t *testing.T) {
-	baseDir := "test/bazquxsample"
+	baseDir := "test/foo.sample"
 
 	got, err := fshelper.ListFiles(fshelper.DebugDirHelper(t, baseDir, "internal/fshelper", "../../"))
 	if err != nil {
@@ -23,9 +23,9 @@ func Test_ListFiles_in_mock_directory(t *testing.T) {
 		expectPath string
 		expectType string
 	}{
-		{"someeventpoco.cs", "test/bazquxsample/src/someeventpoco.cs", "cs"},
-		{"index.md", "test/bazquxsample/index.md", "md"},
-		{"sample.tf", "test/bazquxsample/infra/sample.tf", "tf"},
+		{"someeventpoco.cs", "test/foo.sample/src/someeventpoco.cs", "cs"},
+		{"index.md", "test/foo.sample/index.md", "md"},
+		{"sample.tf", "test/foo.sample/infra/sample.tf", "tf"},
 	}
 	var found *fshelper.FileList = nil
 	for _, tt := range ttests {

src/go/async-api-gen-doc/internal/gendoc/gendoc_test.go

@@ -17,15 +17,15 @@ func Test_GenDoc_marshalled_successfully_from_string(t *testing.T) {
 		expect gendoc.GenDoc
 	}{
 		"when using full property names": {
-			`parent=domain-foo~bar-assigned id=BizContextAreaEvent category=message type=example subscribers=bazquxdemand,bazquxfoo,bazquxbar`,
+			`parent=domain-foo~bar-assigned id=BizContextAreaEvent category=message type=example subscribers=bazquxoperation,bazquxfoo,bazquxbar`,
 			gendoc.GenDoc{Id: "BizContextAreaEvent", Parent: "domain-foo~bar-assigned", CategoryType: gendoc.MessageBlock, ContentType: gendoc.Example},
 		},
 		"when using  shorthand property names": {
-			`parent=domain-foo~bar-assigned id=BizContextAreaEvent c=message type=example sbs=bazquxdemand,bazquxfoo,bazquxbar`,
+			`parent=domain-foo~bar-assigned id=BizContextAreaEvent c=message type=example sbs=bazquxoperation,bazquxfoo,bazquxbar`,
 			gendoc.GenDoc{Id: "BizContextAreaEvent", Parent: "domain-foo~bar-assigned", CategoryType: gendoc.MessageBlock, ContentType: gendoc.Example},
 		},
 		"when setting serviceId": {
-			`parent=domain-foo~bar-assigned id=BizContextAreaEvent serviceId=bazquxsample c=message type=example sbs=bazquxdemand,bazquxfoo,bazquxbar producers=bazquxsample`,
+			`parent=domain-foo~bar-assigned id=BizContextAreaEvent serviceId=bazquxsample c=message type=example sbs=bazquxoperation,bazquxfoo,bazquxbar producers=bazquxsample`,
 			gendoc.GenDoc{Id: "BizContextAreaEvent",
 				Parent:       "domain-foo~bar-assigned",
 				CategoryType: gendoc.MessageBlock,
@@ -34,7 +34,7 @@ func Test_GenDoc_marshalled_successfully_from_string(t *testing.T) {
 			},
 		},
 		"when setting channelId": {
-			`parent=domain-foo~bar-assigned id=BizContextAreaEvent serviceId=bazquxsample channelId=bazquxsample c=message type=example sbs=bazquxdemand,bazquxfoo,bazquxbar producers=bazquxsample`,
+			`parent=domain-foo~bar-assigned id=BizContextAreaEvent serviceId=bazquxsample channelId=bazquxsample c=message type=example sbs=bazquxoperation,bazquxfoo,bazquxbar producers=bazquxsample`,
 			gendoc.GenDoc{Id: "BizContextAreaEvent",
 				Parent:       "domain-foo~bar-assigned",
 				CategoryType: gendoc.MessageBlock,
@@ -44,7 +44,7 @@ func Test_GenDoc_marshalled_successfully_from_string(t *testing.T) {
 			},
 		},
 		"when including closing comments": {
-			`parent=domain-foo~bar-assigned id=BizContextAreaEvent serviceId=bazquxsample channelId=bazquxsample c=message type=example sbs=bazquxdemand,bazquxfoo,bazquxbar producers=bazquxsample -->`,
+			`parent=domain-foo~bar-assigned id=BizContextAreaEvent serviceId=bazquxsample channelId=bazquxsample c=message type=example sbs=bazquxoperation,bazquxfoo,bazquxbar producers=bazquxsample -->`,
 			gendoc.GenDoc{Id: "BizContextAreaEvent",
 				Parent:       "domain-foo~bar-assigned",
 				CategoryType: gendoc.MessageBlock,
@@ -73,7 +73,7 @@ func Test_Unmarshal_from_token_should_succeed(t *testing.T) {
 		expect gendoc.GenDoc
 	}{
 		"when using correct annotation": {
-			token.Token{MetaAnnotation: `parent=domain-foo~bar-assigned id=BizContextAreaEvent serviceId=bazquxsample channelId=bazquxsample c=message type=example sbs=bazquxdemand,bazquxfoo,bazquxbar producers=bazquxsample`},
+			token.Token{MetaAnnotation: `parent=domain-foo~bar-assigned id=BizContextAreaEvent serviceId=bazquxsample channelId=bazquxsample c=message type=example sbs=bazquxoperation,bazquxfoo,bazquxbar producers=bazquxsample`},
 			gendoc.GenDoc{Id: "BizContextAreaEvent",
 				Parent:       "domain-foo~bar-assigned",
 				CategoryType: gendoc.MessageBlock,

src/go/async-api-gen-doc/internal/generate/generate_test.go

@@ -2,7 +2,6 @@ package generate_test
 
 import (
 	"bytes"
-	"os"
 	"testing"
 
 	"github.com/dnitsch/async-api-generator/internal/fshelper"
@@ -11,12 +10,12 @@ import (
 	log "github.com/dnitsch/simplelog"
 )
 
-var baseDir = "test/bazquxsample"
+var baseDir = "test/foo.sample"
 
 func Test_SAMPLE_Generate_ProcessedInputs_from_directory_input(t *testing.T) {
 
 	inputs, _ := fshelper.ListFiles(fshelper.DebugDirHelper(t, baseDir, "internal/generate", "../../"))
-	g := generate.New(&generate.Config{ParserConfig: parser.Config{ServiceId: "bazquxsample", ServiceRepoUrl: "https://github.com/asynapi-gen"}}, log.New(os.Stderr, log.ErrorLvl))
+	g := generate.New(&generate.Config{ParserConfig: parser.Config{ServiceId: "bazquxsample", ServiceRepoUrl: "https://github.com/asynapi-gen"}}, log.New(&bytes.Buffer{}, log.ErrorLvl))
 	g.LoadInputsFromFiles(inputs)
 
 	err := g.GenDocBlox()

src/go/async-api-gen-doc/internal/generate/template_test.go

@@ -153,7 +153,7 @@ func Test_BuildAsyncAPIRoot_from_tree(t *testing.T) {
 		},
 	}
 
-	g := generate.New(globalConf, log.New(os.Stdout, log.DebugLvl))
+	g := generate.New(globalConf, log.New(&bytes.Buffer{}, log.DebugLvl))
 	g.LoadInputsFromFiles(input)
 
 	if err := g.ConvertProcessed(); err != nil {
@@ -171,7 +171,7 @@ func Test_BuildAsyncAPIRoot_from_tree(t *testing.T) {
 	got, _ := fshelper.ListFiles(testDir)
 
 	if len(got) != 2 {
-		t.Error("wanted 2 services written out")
+		t.Errorf("got (%v) wanted 2 services written out", len(got))
 	}
 
 	// for _, file := range got {

src/go/async-api-gen-doc/internal/parser/parser.go

@@ -315,16 +315,16 @@ func (p *Parser) serviceUrn(id string) string {
 //		locals {
 //			topics = [
 //			  //+gendoc category=channel type=nameId
-//			  "domain-demand~demand-cancelled-domain-event",
+//			  "foo~bar",
 //			  //-gendoc
-//			  "domain-demand~demand-updated-domain-event",
+//			  "domain-operation~operation-updated-domain-event",
 //			   ...
 //			]
 //
 // ...
 // ```
 //
-// The extracted Id will be `domain-demand~demand-cancelled-domain-event`
+// The extracted Id will be `foo~bar`
 //
 // If an Id is successfully extracted it is assigned to the Id value and it is returned else the object is returned unchanged
 func attemptIdExtract(a gendoc.GenDoc, docBlock *GenDocBlock) gendoc.GenDoc {

src/go/async-api-gen-doc/test/foo.sample/index.md

@@ -0,0 +1,8 @@
+<!-- //+gendoc type=description category=info id=foo.sample -->
+# Sample
+
+This is some lengthy description of the service itself.
+
+encompassed and in a Markdown readable format as per usual
+
+<!--//-gendoc -->

src/go/async-api-gen-doc/test/foo.sample/infra/sample.tf

@@ -0,0 +1,12 @@
+some: yml
+
+# //+gendoc category=info type=description
+envs: 
+  dev: 
+    url: "dev.domain.com"
+  preprod:
+    url: "pre.domain.com"
+  prod: 
+    url: "prod.domain.com"
+# //-gendoc
+

src/go/async-api-gen-doc/test/foo.sample/infra/sample_deploy.yml

@@ -0,0 +1,46 @@
+locals {
+  topics = [
+    //+gendoc category=channel type=nameId service_id=[foo.bar.app]
+    "foo-stuff~operation-cancelled-domain-event",
+    //-gendoc
+    "foo-stuff~operation-updated-domain-event",
+    "foo-stuff~operation-completed-domain-event",
+    "foo-stuff~operation-skipped-domain-event",
+  ]
+
+  subscriptions = [
+    {
+      //+gendoc category=channel id=foo-stuff-subscription service_id=[foo.bar.app]
+      topic : azurerm_servicebus_topic.cancelled-topic,
+      name : "foo-stuff-subscription"
+      //-gendoc
+    },
+    {
+/*
+//+gendoc category=channel id=foo-stuff-subscription type=description service_id=[foo.bar.app]
+This channel is used to convey subscriptions
+//-gendoc
+*/
+      topic : azurerm_servicebus_topic.ItemSortation-waypointComplete-topic,
+      //+gendoc category=channel id=foo-stuff-subscription type=nameId service_id=[foo.bar.app]
+      //-gendoc
+      name : "foo-stuff-subscription"
+    },
+    {
+      topic : azurerm_servicebus_topic.ItemSortation-operationWaypointStarted-topic,
+      name : "foo-stuff-subscription"
+    },
+   
+  ]
+}
+
+resource "azurerm_servicebus_topic" "default" {
+  for_each            = toset(local.topics)
+  ...
+}
+
+# Add the proper subscriptions
+resource "azurerm_servicebus_subscription" "default" {
+  for_each            = toset(local.topics)
+  ... 
+}

src/go/async-api-gen-doc/test/foo.sample/infra/sbus.tf

@@ -0,0 +1,35 @@
+{
+    "$id": "https://example.com/address.schema.json",
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "description": "An address similar to http://microformats.org/wiki/h-card",
+    "type": "object",
+    "properties": {
+      "postOfficeBox": {
+        "type": "string"
+      },
+      "extendedAddress": {
+        "type": "string"
+      },
+      "streetAddress": {
+        "type": "string"
+      },
+      "locality": {
+        "type": "string"
+      },
+      "region": {
+        "type": "string"
+      },
+      "postalCode": {
+        "type": "string"
+      },
+      "countryName": {
+        "type": "string"
+      }
+    },
+    "required": [ "locality", "region", "countryName" ],
+    "dependentRequired": {
+      "postOfficeBox": [ "streetAddress" ],
+      "extendedAddress": [ "streetAddress" ]
+    }
+  }
+  

src/go/async-api-gen-doc/test/foo.sample/src/schemas/some.schema.json

@@ -0,0 +1,23 @@
+using System;
+
+/*
+//+gendoc category=pubOperation type=description id=BuxQuz parent=foo-stuff~operation-cancelled-domain-event isSub=true
+this operation publishes this message
+//-gendoc
+*/
+
+// parent is the channel i.e. queue or topic name 
+// id is the name of the message itself
+//+gendoc id=BuxQuz category=message type=example
+namespace Foo.Bar.Contracts.Events;
+
+public class BuxQuz : FooMessage<BuxQuzPayload>
+{
+    public BuxQuz(BuxQuzPayload payload)
+    {
+        MessageTypeName = nameof(BuxQuz);
+        Guid = Guid.NewGuid();
+        ...
+    }
+}
+//-gendoc

src/go/async-api-gen-doc/test/foo.sample/src/someeventpoco.cs

@@ -0,0 +1,9 @@
+using System.Diagnostics;
+
+namespace Foo.Bar.Services.Foo;
+
+
+//+gendoc id=Bar category=message type=example
+public class Bar () {
+}
+//-gendoc

src/go/async-api-gen-doc/test/foo.sample/src/someexample.cs

@@ -0,0 +1,11 @@
+namespace Foo.Bar.Services.BuzQux.Contracts;
+
+public static class BuzQuxServiceConstants
+{
+    public const string Name = "foo-other-services-stuff";
+
+    public static class Events
+    {
+        public const string BuxQuz = "some-area-event";
+    }
+}