Saliva tests usually range from 12 to 24 hours depending on smoking habits and oral hygiene. You sound like a habitual user that has good hygiene, especially right before the test. I think your going to be fine, you've done a good job abstaining and masking. Urine testing is more my specialty, but Ive read alot about swab testing and your situation sounds pretty solid. Hate to tell your going to pass and be wrong so I'll just say... Good Luck. Be sure to let us know your results.