At the end of John 14, didn't Jesus tells his disciples to leave the upper room with him?

John 14:31 But that the world may know that I love the Father; and as the Father gave me commandment, even so I do. Arise, let us go hence.

So as soon as Jesus said that, did they not leave the upper room, and head for Gethsemane?

If so, then weren't chapters 15, 16, and 17 spoken while they walked to Gethsemane?

After finishing his high priestly prayer in John 17, didn't they then cross the brook Cedron to enter the garden?

John 18:1 When Jesus had spoken these words, he went forth with his disciples over the brook Cedron, where was a garden, into the which he entered, and his disciples.

For so many years, I had thought that all the chapters 14 - 17 were said in the upper room.

but apparently that may not be the case?