Promoted isSecure.

[shibboleth/cpp-opensaml.git] / samltest / internal.h

diff --git a/samltest/internal.h b/samltest/internal.h
index b5e1bd5..5dddfa1 100644 (file)
--- a/samltest/internal.h
+++ b/samltest/internal.h
@@ -14,16 +14,20 @@
  * limitations under the License.
  */
 
+#ifdef WIN32\r
+# define _CRT_SECURE_NO_DEPRECATE 1\r
+# define _CRT_NONSTDC_NO_DEPRECATE 1\r
+#endif\r
+
 #include <cxxtest/TestSuite.h>
 
 #include <fstream>
 #include <saml/exceptions.h>
 #include <saml/util/SAMLConstants.h>
-#include <xmltooling/exceptions.h>
-#include <xmltooling/validation/Validator.h>
 #include <xmltooling/XMLObject.h>
 #include <xmltooling/XMLObjectBuilder.h>
 #include <xmltooling/XMLToolingConfig.h>
+#include <xmltooling/validation/Validator.h>
 
 using namespace opensaml;
 using namespace xmltooling;
@@ -102,10 +106,10 @@ protected:
         char* buf = NULL;
         if (!XMLString::equals(expectedString, testString)) {
             buf = XMLString::transcode(testString);
-            TS_TRACE(buf);
+            TS_TRACE(buf ? buf : "(NULL)");
             XMLString::release(&buf);
             buf = XMLString::transcode(expectedString);
-            TS_TRACE(buf);
+            TS_TRACE(buf ? buf : "(NULL)");
             XMLString::release(&buf);
             TSM_ASSERT(failMessage, false);
         }