add test scenario

Author: makiuchi-d

Diff for: server/client/request.go

@@ -145,6 +145,26 @@ func WatchDirect(ctx context.Context, grpccon *grpc.ClientConn, wshost, appid, r
 	return connectToRoom(ctx, accinfo, res, warn)
 }
 
+// WatchByNumber : 部屋番号で観戦入室
+func WatchByNumber(ctx context.Context, accinfo *AccessInfo, number int32, query *Query, warn func(error)) (*Room, *Connection, error) {
+	var q []lobby.PropQueries
+	if query != nil {
+		q = []lobby.PropQueries(*query)
+	}
+	param := lobby.JoinParam{
+		Queries:    q,
+		ClientInfo: &pb.ClientInfo{Id: accinfo.UserId},
+		EncMACKey:  accinfo.EncMACKey,
+	}
+
+	res, err := lobbyRequest(ctx, accinfo, fmt.Sprintf("/rooms/watch/number/%d", number), param)
+	if err != nil {
+		return nil, nil, xerrors.Errorf("lobbyRequest: %w", err)
+	}
+
+	return connectToRoom(ctx, accinfo, res.Room, warn)
+}
+
 // Search : 部屋を検索する
 func Search(ctx context.Context, accinfo *AccessInfo, param *lobby.SearchParam) ([]*pb.RoomInfo, error) {
 	res, err := lobbyRequest(ctx, accinfo, "/rooms/search", param)

Diff for: server/cmd/wsnet2-bot/cmd/root.go

@@ -174,6 +174,22 @@ func joinRoom(ctx context.Context, player, roomId string, query *client.Query) (
 	return client.Join(ctx, accinfo, roomId, query, cinfo, nil)
 }
 
+// joinByNumber joins the player to a room specified by the number
+func joinByNumber(ctx context.Context, player string, number int32, query *client.Query) (*client.Room, *client.Connection, error) {
+	accinfo, err := client.GenAccessInfo(lobbyURL, appId, appKey, player)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if query == nil {
+		query = client.NewQuery()
+	}
+
+	cinfo := &pb.ClientInfo{Id: player}
+
+	return client.JoinByNumber(ctx, accinfo, number, query, cinfo, nil)
+}
+
 // joinRandom joins the player to a room randomly
 func joinRandom(ctx context.Context, player string, group uint32, query *client.Query) (*client.Room, *client.Connection, error) {
 	accinfo, err := client.GenAccessInfo(lobbyURL, appId, appKey, player)
@@ -200,6 +216,20 @@ func watchRoom(ctx context.Context, watcher, roomId string, query *client.Query)
 	return client.Watch(ctx, accinfo, roomId, query, nil)
 }
 
+// watchByNumber joins the watcher to a room specified by the number
+func watchByNumber(ctx context.Context, watcher string, number int32, query *client.Query) (*client.Room, *client.Connection, error) {
+	accinfo, err := client.GenAccessInfo(lobbyURL, appId, appKey, watcher)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	if query == nil {
+		query = client.NewQuery()
+	}
+
+	return client.WatchByNumber(ctx, accinfo, number, query, nil)
+}
+
 // searchCurrent search current rooms
 func searchCurrent(ctx context.Context, cid string) ([]*pb.RoomInfo, error) {
 	accinfo, err := client.GenAccessInfo(lobbyURL, appId, appKey, cid)

Diff for: server/cmd/wsnet2-bot/cmd/scenario.go

@@ -257,7 +257,7 @@ func scenarioJoinRoom(ctx context.Context) error {
 	clearEventBuffer(conn)
 
 	// 正常入室
-	_, p2, err := joinRoom(ctx, "joinroom_player2", room.Id, nil)
+	_, p2, err := joinByNumber(ctx, "joinroom_player2", *room.Number, nil)
 	if err != nil {
 		return fmt.Errorf("join-room: player2: %w", err)
 	}
@@ -286,6 +286,14 @@ func scenarioJoinRoom(ctx context.Context) error {
 	discardEvents(w1)
 	defer cleanupConn(ctx, w1)
 
+	_, w2, err := watchByNumber(ctx, "joinroom_watcher2", *room.Number, nil)
+	if err != nil {
+		return fmt.Errorf("join-room: watcher2: %w", err)
+	}
+	logger.Infof("join-room: watcher2 ok")
+	discardEvents(w2)
+	defer cleanupConn(ctx, w2)
+
 	clearEventBuffer(conn)
 
 	// MaxPlayerを+2増やしwatchable=falseに
@@ -310,12 +318,12 @@ func scenarioJoinRoom(ctx context.Context) error {
 	defer cleanupConn(ctx, p4)
 
 	// 観戦はエラー
-	_, w2, err := watchRoom(ctx, "joinroom_watcher2", room.Id, nil)
+	_, w3, err := watchRoom(ctx, "joinroom_watcher3", room.Id, nil)
 	if !errors.Is(err, client.ErrNoRoomFound) {
-		cleanupConn(ctx, w2)
-		return fmt.Errorf("join-room: watcher2 wants NoRoomFound: %v", err)
+		cleanupConn(ctx, w3)
+		return fmt.Errorf("join-room: watcher3 wants NoRoomFound: %v", err)
 	}
-	logger.Infof("join-room: watcher2 ok (no room found)")
+	logger.Infof("join-room: watcher3 ok (no room found)")
 
 	clearEventBuffer(conn)