they did have desire of shahadat ..
but you put it nicely also
Intention or wanting (desire) of death for oneself is kufr (I did not write intention of Shahadah because there is no such death with intention that can be called Shahadah). One should never wish that he die. It is fard on human to save his own life to the best of his ability.
Desire of Shahadah for oneself is not kufr as such death comes unintentionally when a person has intention to risk his life in the cause of Islam and live (be victorious, be Ghazi) but in process dies.