Raptor won't fly on the Falcon, so it depends on the arrival of the BFR. Elon wants that to be doing Mars missions in the 2022 window, so test flights would have to precede that by some time. Construction of the first BFR is due to start around Q2 next year; when it gets in the air is anybody's guess.