Update gitignore to account for subdirs / missing files.

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

diff --git a/samltest/samltest.h b/samltest/samltest.h
index e6283d9..687e2f0 100644 (file)
--- a/samltest/samltest.h
+++ b/samltest/samltest.h
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2005 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 #include "internal.h"
@@ -22,6 +26,8 @@
 #include <xmltooling/util/ReplayCache.h>
 #include <xmltooling/util/TemplateEngine.h>
 
+using namespace opensaml;
+
 //#define SAML_LEAKCHECK
 
 std::string data_path = "../samltest/data/";
@@ -33,6 +39,8 @@ public:
         XMLToolingConfig::getConfig().log_config();
         if (!SAMLConfig::getConfig().init())
             return false;
+        if (!SAMLConfig::getConfig().init())    // should be a no-op
+            return false;
         XMLToolingConfig::getConfig().setReplayCache(new ReplayCache());
         XMLToolingConfig::getConfig().setTemplateEngine(new TemplateEngine());
         SAMLConfig::getConfig().setArtifactMap(new ArtifactMap());
@@ -45,7 +53,9 @@ public:
         return true;
     }
     bool tearDownWorld() {
+        SAMLConfig::getConfig().term();     // should be a no-op
         SAMLConfig::getConfig().term();
+        SAMLConfig::getConfig().term();     // shouldn't cause a crash
 #if defined(_MSC_VER ) && defined(SAML_LEAKCHECK)
        _CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE );
        _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDOUT );