Removed old-api tests, added (empty) core spec tests

include/yaml-cpp/parser.h

@@ -32,8 +32,6 @@ namespace YAML
 		void Load(std::istream& in);
 		bool HandleNextDocument(EventHandler& eventHandler);
 
-		bool GetNextDocument(Node& document); // old API only
-		
 		void PrintTokens(std::ostream& out);
 
 	private:

src/parser.cpp

@@ -3,7 +3,6 @@
 #include "yaml-cpp/exceptions.h"
 #include "yaml-cpp/node.h"
 #include "directives.h"
-#include "nodebuilder.h"
 #include "scanner.h"
 #include "singledocparser.h"
 #include "tag.h"
@@ -55,15 +54,6 @@ namespace YAML
 		return true;
 	}
 
-	// GetNextDocument
-	// . Reads the next document in the queue (of tokens).
-	// . Throws a ParserException on error.
-	bool Parser::GetNextDocument(Node& document)
-	{
-		NodeBuilder builder(document);
-		return HandleNextDocument(builder);
-	}
-
 	// ParseDirectives
 	// . Reads any directives that are next in the queue.
 	void Parser::ParseDirectives()

test/CMakeLists.txt

@@ -1,8 +1,8 @@
 file(GLOB test_headers [a-z]*.h)
 file(GLOB test_sources [a-z]*.cpp)
-file(GLOB test_old_api_sources old-api/[a-z]*.cpp)
+file(GLOB test_core_sources core/[a-z]*.cpp)
 
-list(APPEND test_sources ${test_old_api_sources})
+list(APPEND test_sources ${test_core_sources})
 
 include_directories(${YAML_CPP_SOURCE_DIR}/test)
 

test/emittertests.cpp

@@ -1,5 +1,6 @@
 #include "tests.h"
 #include "yaml-cpp/yaml.h"
+#include "yaml-cpp/eventhandler.h"
 #include <iostream>
 
 namespace Test
@@ -999,6 +1000,21 @@ namespace Test
 	}
 	
 	namespace {
+        class NullEventHandler: public YAML::EventHandler {
+            virtual void OnDocumentStart(const YAML::Mark&) {}
+            virtual void OnDocumentEnd() {}
+            
+            virtual void OnNull(const YAML::Mark&, YAML::anchor_t) {}
+            virtual void OnAlias(const YAML::Mark&, YAML::anchor_t) {}
+            virtual void OnScalar(const YAML::Mark&, const std::string&, YAML::anchor_t, const std::string&) {}
+            
+            virtual void OnSequenceStart(const YAML::Mark&, const std::string&, YAML::anchor_t) {}
+            virtual void OnSequenceEnd() {}
+            
+            virtual void OnMapStart(const YAML::Mark&, const std::string&, YAML::anchor_t) {}
+            virtual void OnMapEnd() {}
+        };
+        
 		void RunEmitterTest(void (*test)(YAML::Emitter&, std::string&), const std::string& name, int& passed, int& total) {
 			YAML::Emitter out;
 			std::string desiredOutput;
@@ -1010,8 +1026,8 @@ namespace Test
 				try {
 					std::stringstream stream(output);
 					YAML::Parser parser;
-					YAML::Node node;
+                    NullEventHandler handler;
-					parser.GetNextDocument(node);
+                    parser.HandleNextDocument(handler);
 					passed++;
 				} catch(const YAML::Exception& e) {
 					std::cout << "Emitter test failed: " << name << "\n";

test/nodetests.h

@@ -1,13 +0,0 @@
-#ifndef NODETESTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define NODETESTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-namespace Test {
-	bool RunNodeTests();
-}
-
-#endif // NODETESTS_H_62B23520_7C8E_11DE_8A39_0800200C9A6666
-

test/parsertests.h

@@ -1,13 +0,0 @@
-#ifndef PARSERTESTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define PARSERTESTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-namespace Test {
-	bool RunParserTests();
-}
-
-#endif // PARSERTESTS_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-

test/tests.cpp

@@ -1,7 +1,5 @@
 #include "tests.h"
 #include "emittertests.h"
-#include "nodetests.h"
-#include "parsertests.h"
 #include "spectests.h"
 #include "yaml-cpp/yaml.h"
 #include <fstream>
@@ -14,9 +12,6 @@ namespace Test
 	void RunAll()
 	{
 		bool passed = true;
-		if(!RunParserTests())
-			passed = false;
-			
 		if(!RunEmitterTests())
 			passed = false;