Skip to content

Commit

Permalink
[Refactor] removed prefix diago
Browse files Browse the repository at this point in the history
  • Loading branch information
JanGalek committed Jan 3, 2025
1 parent 42fdb50 commit 55796bf
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions diagoMiddleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
"net/http"
)

type DiagoData struct {
type Data struct {
ExtensionsPanelHtml []template.HTML
ExtensionsJSHtml []template.HTML
ExtensionsHtml []template.HTML
}

func DiagoMiddleware(r *router.Router, d *Diago) gin.HandlerFunc {
func Middleware(r *router.Router, d *Diago) gin.HandlerFunc {
return func(c *gin.Context) {

if r != nil && r.IsRelease() {
Expand Down Expand Up @@ -56,7 +56,7 @@ func DiagoMiddleware(r *router.Router, d *Diago) gin.HandlerFunc {
extensionsJSHtml = append(extensionsJSHtml, template.HTML(e.GetJSHtml(c)))
}

diagoData := DiagoData{
diagoData := Data{
ExtensionsHtml: extensionsHtml,
ExtensionsPanelHtml: extensionsPanelHtml,
ExtensionsJSHtml: extensionsJSHtml,
Expand Down
26 changes: 13 additions & 13 deletions tests/diagoLatencyExtension_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
)

func TestDiagoLatencyExtension(t *testing.T) {
latencyExtension := extensions.NewDiagoLatencyExtension()
latencyExtension := extensions.NewLatencyExtension()

r := gin.Default()

Expand Down Expand Up @@ -43,53 +43,53 @@ func TestDiagoLatencyExtension(t *testing.T) {
}

func TestDiagoLatencyExtension_GetLatency(t *testing.T) {
latencyExtension := extensions.NewDiagoLatencyExtension()
latencyExtension := extensions.NewLatencyExtension()
latencyExtension.SetLatency(2 * time.Second)

latency := latencyExtension.GetLatency()
assert.Equal(t, latency, 2*time.Second, "Latency should be equal")
}

func TestDiagoLatencyExtension_GetHtml(t *testing.T) {
latencyExtension := extensions.NewDiagoLatencyExtension()
latencyExtension := extensions.NewLatencyExtension()

html := latencyExtension.GetHtml(nil)
assert.Empty(t, html, "GetHtml should return an empty string")
}

func TestDiagoLatencyExtension_GetJSHtml(t *testing.T) {
latencyExtension := extensions.NewDiagoLatencyExtension()
latencyExtension := extensions.NewLatencyExtension()

jsHtml := latencyExtension.GetJSHtml(nil)
assert.Empty(t, jsHtml, "GetJSHtml should return an empty string")
}

func TestDiagoLatencyExtension_GetPanelHtml_Seconds(t *testing.T) {
latencyExtension := extensions.NewDiagoLatencyExtension()
latencyExtension := extensions.NewLatencyExtension()
latencyExtension.SetLatency(2 * time.Second)

panelHtml := latencyExtension.GetPanelHtml(nil)
assert.Contains(t, panelHtml, "2.00 s", "Panel HTML should contain latency in seconds")
}

func TestDiagoLatencyExtension_GetPanelHtml_Milliseconds(t *testing.T) {
latencyExtension := extensions.NewDiagoLatencyExtension()
latencyExtension := extensions.NewLatencyExtension()
latencyExtension.SetLatency(150 * time.Millisecond)

panelHtml := latencyExtension.GetPanelHtml(nil)
assert.Contains(t, panelHtml, "150.00 ms", "Panel HTML should contain latency in milliseconds")
}

func TestDiagoLatencyExtension_GetPanelHtml_Microseconds(t *testing.T) {
latencyExtension := extensions.NewDiagoLatencyExtension()
latencyExtension := extensions.NewLatencyExtension()
latencyExtension.SetLatency(500 * time.Microsecond)

panelHtml := latencyExtension.GetPanelHtml(nil)
assert.Contains(t, panelHtml, "500.00 µs", "Panel HTML should contain latency in microseconds")
}

func TestDiagoLatencyExtension_GetPanelHtml_Nanoseconds(t *testing.T) {
latencyExtension := extensions.NewDiagoLatencyExtension()
latencyExtension := extensions.NewLatencyExtension()
latencyExtension.SetLatency(500 * time.Nanosecond)

panelHtml := latencyExtension.GetPanelHtml(nil)
Expand All @@ -103,7 +103,7 @@ func (m *mockDiagoPanelGeneratorWithError) GenerateHTML(name string, templatePro
}

func TestDiagoLatencyExtension_GetPanelHtml_ErrorHandling(t *testing.T) {
latencyExtension := extensions.NewDiagoLatencyExtension()
latencyExtension := extensions.NewLatencyExtension()

gen := &mockDiagoPanelGeneratorWithError{}
latencyExtension.PanelGenerator = gen
Expand Down Expand Up @@ -134,7 +134,7 @@ func (m *mockTemplateProviderWithExecuteError) GetTemplate() string {
func TestGenerateDiagoPanelHTML_TemplateParseError(t *testing.T) {
mockProvider := &mockTemplateProviderWithParseError{}

latencyExtension := extensions.NewDiagoLatencyExtension()
latencyExtension := extensions.NewLatencyExtension()

result, err := latencyExtension.PanelGenerator.GenerateHTML("error", mockProvider, extensions.LatencyData{Latency: "500 ms"})

Expand All @@ -151,7 +151,7 @@ func (m *mockInvalidTemplateProvider) GetDiagoLatencyPanelTemplate() string {
func TestGenerateDiagoPanelHTML_TemplateExecuteError(t *testing.T) {
mockProvider := &mockTemplateProviderWithExecuteError{}

latencyExtension := extensions.NewDiagoLatencyExtension()
latencyExtension := extensions.NewLatencyExtension()

result, err := latencyExtension.PanelGenerator.GenerateHTML("test", mockProvider, extensions.LatencyData{Latency: "500 ms"})

Expand All @@ -160,7 +160,7 @@ func TestGenerateDiagoPanelHTML_TemplateExecuteError(t *testing.T) {
}

func TestDiagoLatencyExtension_TemplateProvider(t *testing.T) {
latencyExtension := extensions.NewDiagoLatencyExtension()
latencyExtension := extensions.NewLatencyExtension()

mockProvider := &mockTemplateProviderWithParseError{}

Expand All @@ -170,7 +170,7 @@ func TestDiagoLatencyExtension_TemplateProvider(t *testing.T) {
}

func TestDiagoLatencyExtension_PanelGenerator(t *testing.T) {
latencyExtension := extensions.NewDiagoLatencyExtension()
latencyExtension := extensions.NewLatencyExtension()

mockProvider := &MockPanelGenerator{}

Expand Down
4 changes: 2 additions & 2 deletions tests/diagoMiddleware_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func TestDiagoMiddleware(t *testing.T) {

d.AddExtension(&MyExtension{})

r.GET("/test", diago.DiagoMiddleware(nil, d), func(c *gin.Context) {
r.GET("/test", diago.Middleware(nil, d), func(c *gin.Context) {
c.Header("Content-Type", "text/html; charset=utf-8")
c.String(200, "Hello, world!")
})
Expand Down Expand Up @@ -78,7 +78,7 @@ func TestDiagoMiddlewareReleaseMode(t *testing.T) {

d.AddExtension(&MyExtension{})

n.GET("/test", diago.DiagoMiddleware(r, d), func(c *gin.Context) {
n.GET("/test", diago.Middleware(r, d), func(c *gin.Context) {
c.Header("Content-Type", "text/html; charset=utf-8")
c.String(200, "Hello, world!")
})
Expand Down
10 changes: 5 additions & 5 deletions tests/template_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func TestDiagoMiddleware_ContentTypeAndCharset(t *testing.T) {
n.LoadHTMLGlob("templates/*")
d := diago.NewDiago()

middleware := diago.DiagoMiddleware(r, d)
middleware := diago.Middleware(r, d)

n.Use(middleware)

Expand Down Expand Up @@ -72,7 +72,7 @@ func TestDiagoMiddleware_ContentTypeAndCharsetAdd(t *testing.T) {
d.AddContentCharset("utf-8")
d.AddContentType(diago.ContentType_HTML)

middleware := diago.DiagoMiddleware(r, d)
middleware := diago.Middleware(r, d)

n.Use(middleware)

Expand Down Expand Up @@ -103,7 +103,7 @@ func TestDiagoMiddleware_ContentTypeAndCharset_NotAllowed(t *testing.T) {
Charsets: []string{},
})

middleware := diago.DiagoMiddleware(r, d)
middleware := diago.Middleware(r, d)

n.Use(middleware)

Expand Down Expand Up @@ -132,7 +132,7 @@ func TestDiagoMiddleware_Handle_404(t *testing.T) {
n := r.GetNativeRouter()
n.LoadHTMLGlob("templates/*")

middleware := diago.DiagoMiddleware(r, &diago.Diago{PanelGenerator: mockPanelGenerator, TemplateProvider: diago.NewDefaultTemplateProvider()})
middleware := diago.Middleware(r, &diago.Diago{PanelGenerator: mockPanelGenerator, TemplateProvider: diago.NewDefaultTemplateProvider()})

n.Use(middleware)

Expand All @@ -154,7 +154,7 @@ func TestDiagoMiddleware_GenerateHTML_Error(t *testing.T) {
n := r.GetNativeRouter()
n.LoadHTMLGlob("templates/*")

middleware := diago.DiagoMiddleware(r, &diago.Diago{
middleware := diago.Middleware(r, &diago.Diago{
PanelGenerator: mockPanelGenerator,
TemplateProvider: diago.NewDefaultTemplateProvider(),
AllowedContentTypes: diago.ContentType{
Expand Down

0 comments on commit 55796bf

Please sign in to comment.