wip: fixing up todo comments

Author: danpape

jsonld-cpp/CMakeLists.txt

@@ -58,7 +58,6 @@ set(LIB_SOURCE_FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/FileLoader.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/JSONDocument.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/JsonLdError.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/JsonLdOptions.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/JsonLdProcessor.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/JsonLdUrl.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/JsonLdUtils.cpp

jsonld-cpp/ExpansionProcessor.cpp

@@ -1342,9 +1342,9 @@ namespace {
                     JsonLdUtils::addValue(reverseMap, expandedProperty, item, true);
                 }
             }
-                // 13.14)
-                // Otherwise, key is not a reverse property. Use add value to add expanded value to
-                // the expanded property entry in result using true for as array.
+            // 13.14)
+            // Otherwise, key is not a reverse property. Use add value to add expanded value to
+            // the expanded property entry in result using true for as array.
             else {
                 JsonLdUtils::addValue(result, expandedProperty, expandedValue, true);
             }

jsonld-cpp/JsonLdOptions.cpp

@@ -1,7 +1,7 @@
+#include "jsonld-cpp/WellFormed.h"
+#include "jsonld-cpp/JsonLdUtils.h"
+#include "jsonld-cpp/RDFRegex.h"
 #include <regex>
-#include "WellFormed.h"
-#include "JsonLdUtils.h"
-#include "RDFRegex.h"
 
 bool WellFormed::iri(const std::string &str) {
     return JsonLdUtils::isAbsoluteIri(str);

jsonld-cpp/WellFormed.cpp

@@ -23,7 +23,3 @@ std::map<std::string, TestCase> ManifestLoader::load() {
 
     return result;
 }
-
-// todo: make sure to clean up extra test files like duplicate_quads.nq ... what was that for?
-
-// todo: also create a readme for what and how we updated the canonicalize tests when we go from 2015 to the new 1.0 spec

jsonld-cpp/test/testjsonld-cpp/ManifestLoader.cpp

@@ -65,22 +65,3 @@ TEST(DocumentLoaderTest, process_duplicate_quads_when_reading) {
     EXPECT_EQ(expected.numTriples(), 2);
 }
 
-
-// todo: need to re-implement cache for these tests to be meaningful
-//TEST(DocumentLoaderTest, load_sample_document_from_cache) {
-//    FileLoader dl;
-//    dl.addDocumentToCache("foo.json", R"({ "pi": 3 })");
-//
-//    RemoteDocument d = dl.loadDocument("foo.json");
-//    EXPECT_EQ(3, d.getJSONContent()["pi"]);
-//}
-//
-//TEST(DocumentLoaderTest, load_document_from_cache_miss) {
-//    FileLoader dl;
-//    dl.addDocumentToCache("foo.json", R"({ "pi": 3 })");
-//
-//    EXPECT_THROW(dl.loadDocument("bar.json"), std::runtime_error);
-//}
-
-
-