test(various): clean up

Author: jodi-ivan

adapter/render_to_string.go

@@ -11,7 +11,9 @@ import (
 
 type RenderStringCanvasDelegator struct{}
 
-func (rscd *RenderStringCanvasDelegator) OnBeforeStartWrite() {}
+func (rscd *RenderStringCanvasDelegator) OnBeforeStartWrite() {
+	// no pre operation needed for string operation
+}
 func (rscd *RenderStringCanvasDelegator) OnError(err error) canvas.DelegatorErrorFlowControl {
 	return canvas.DelegatorErrorFlowControlStop
 }

adapter/renderer.go

@@ -59,6 +59,12 @@ func (rh *RenderHTTP) ServeHTTP(w http.ResponseWriter, r *http.Request, ps httpr
 	var variant []string
 	num, err := strconv.Atoi(raw)
 	if err != nil {
+		if len(raw) == 0 {
+			log.Printf("invalid number: %v", err.Error())
+			w.WriteHeader(http.StatusBadRequest)
+			w.Write([]byte("Invalid URL"))
+			return
+		}
 		num, err = strconv.Atoi(raw[0 : len(raw)-1])
 		if err != nil {
 			log.Printf("invalid number: %v", err.Error())

adapter/renderer_test.go

@@ -39,6 +39,24 @@ func TestRenderHTTP_ServeHTTP(t *testing.T) {
 				return res
 			},
 		},
+		{
+			name: "invalid parameter#2",
+			args: args{
+				ps: httprouter.Params([]httprouter.Param{
+					httprouter.Param{
+						Key:   "number",
+						Value: "a",
+					},
+				}),
+				r: &http.Request{},
+			},
+			initHTTPResponseWriterMock: func(ctrl *gomock.Controller) *webserver.MockResponseWriter {
+				res := webserver.NewMockResponseWriter(ctrl)
+				res.EXPECT().WriteHeader(http.StatusBadRequest)
+				res.EXPECT().Write([]byte("Invalid URL"))
+				return res
+			},
+		},
 		{
 			name: "everything went fine",
 			args: args{
@@ -60,6 +78,27 @@ func TestRenderHTTP_ServeHTTP(t *testing.T) {
 				return res
 			},
 		},
+		{
+			name: "everything went fine#2",
+			args: args{
+				ps: httprouter.Params([]httprouter.Param{
+					httprouter.Param{
+						Key:   "number",
+						Value: "1a",
+					},
+				}),
+				r: &http.Request{},
+			},
+			initHTTPResponseWriterMock: func(ctrl *gomock.Controller) *webserver.MockResponseWriter {
+				res := webserver.NewMockResponseWriter(ctrl)
+				return res
+			},
+			initMock: func(ctrl *gomock.Controller) *usecase.MockUsecase {
+				res := usecase.NewMockUsecase(ctrl)
+				res.EXPECT().RenderHymn(gomock.Any(), gomock.Any(), int(1), "a")
+				return res
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

internal/barline/barline_test.go

@@ -190,10 +190,10 @@ func Test_barlineInteractor_GetRendererRightBarline(t *testing.T) {
 					},
 				},
 			},
-			wantBarlinePos: 30,
+			wantBarlinePos: 35,
 			wantRenderer: &entity.NoteRenderer{
 				MeasureNumber: 1,
-				PositionX:     30,
+				PositionX:     25,
 				Barline: &musicxml.Barline{
 					Location: musicxml.BarlineLocationRight,
 					BarStyle: musicxml.BarLineStyleLightHeavy,

internal/entity/renderer_test.go

@@ -51,7 +51,7 @@ func TestNoteRenderer_UpdateBeam(t *testing.T) {
 			Beam: map[int]Beam{},
 		}
 		nr.UpdateBeam(1, musicxml.NoteBeamTypeBegin)
-		expect := map[int]Beam{1: Beam{1, musicxml.NoteBeamTypeBegin}}
+		expect := map[int]Beam{}
 		assert.Equal(t, expect, nr.Beam)
 	})
 

internal/musicxml/entity_test.go

@@ -212,6 +212,7 @@ func TestMeasure_Build(t *testing.T) {
 				}
 			},
 			wantMeasure: &Measure{
+				NewLineIndex: map[int]bool{1: true},
 				Appendix: []Element{
 					Element{
 						Content: pitch,
@@ -267,7 +268,6 @@ func TestMeasure_Build(t *testing.T) {
 						},
 					},
 				},
-				NewLineIndex: map[int]bool{},
 			},
 		},
 		{