I don't suspect the u-joint from what little you've mentioned, noise would be more and get worse.
But how did you check it? You are suppose to place one end in a vise, and force the other end. I'm sure I'm missing a little info on how-to, but you can look for that (or someone will reply) if you need it.
Probably not the u-joint. The click would not be one with every wheel rotation. It would be be more like 3 per rotation. For peace of mind, it never hurts to change the wheel dampers while you have it apart. Take a look at the brake pads to see if there is any unusual wear on them.