expand DepsLog test, fix two bugs it revealed

1 files changed, 27 insertions, 11 deletions

diff --git a/src/deps_log_test.cc b/src/deps_log_test.cc
index 540865b..3f47fef 100644
--- a/src/deps_log_test.cc
+++ b/src/deps_log_test.cc
@@ -39,25 +39,41 @@ TEST_F(DepsLogTest, WriteRead) {
   EXPECT_TRUE(log1.OpenForWrite(kTestFilename, &err));
   ASSERT_EQ("", err);
 
-  vector<Node*> deps;
-  deps.push_back(state1.GetNode("foo.h"));
-  deps.push_back(state1.GetNode("bar.h"));
-  log1.RecordDeps(state1.GetNode("out.o"), 1, deps);
+  {
+    vector<Node*> deps;
+    deps.push_back(state1.GetNode("foo.h"));
+    deps.push_back(state1.GetNode("bar.h"));
+    log1.RecordDeps(state1.GetNode("out.o"), 1, deps);
 
-  deps.clear();
-  deps.push_back(state1.GetNode("foo.h"));
-  deps.push_back(state1.GetNode("bar2.h"));
-  log1.RecordDeps(state1.GetNode("out2.o"), 2, deps);
+    deps.clear();
+    deps.push_back(state1.GetNode("foo.h"));
+    deps.push_back(state1.GetNode("bar2.h"));
+    log1.RecordDeps(state1.GetNode("out2.o"), 2, deps);
+  }
 
   log1.Close();
 
   State state2;
   DepsLog log2;
-  EXPECT_TRUE(log1.Load(kTestFilename, &state2, &err));
+  EXPECT_TRUE(log2.Load(kTestFilename, &state2, &err));
   ASSERT_EQ("", err);
-  state2.Dump();
 
-  state2.GetNode("out2.o")->Dump();
+  ASSERT_EQ(log1.nodes().size(), log2.nodes().size());
+  for (int i = 0; i < (int)log1.nodes().size(); ++i) {
+    Node* node1 = log1.nodes()[i];
+    Node* node2 = log2.nodes()[i];
+    ASSERT_EQ(i, node1->id());
+    ASSERT_EQ(node1->id(), node2->id());
+  }
+
+  // log1 has no deps entries, as it was only used for writing.
+  // Manually check the entries in log2.
+  DepsLog::Deps* deps = log2.GetDeps(state2.GetNode("out.o"));
+  ASSERT_TRUE(deps);
+  ASSERT_EQ(1, deps->mtime);
+  ASSERT_EQ(2, deps->node_count);
+  ASSERT_EQ("foo.h", deps->nodes[0]->path());
+  ASSERT_EQ("bar.h", deps->nodes[1]->path());
 }
 
 }  // anonymous namespace