v1.1 updates

cyclus · Sep 16, 2014 · 8b0eb27 · 8b0eb27
1 parent f7bd457
commit 8b0eb27
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/src/stub_facility.h b/src/stub_facility.h
@@ -1,5 +1,5 @@
-#ifndef CYCSTUB_SRC_STUB_FACILITY_H_
-#define CYCSTUB_SRC_STUB_FACILITY_H_
+#ifndef CYCLUS_STUBS_STUB_FACILITY_H_
+#define CYCLUS_STUBS_STUB_FACILITY_H_
 
 #include <string>
 
@@ -58,9 +58,9 @@ class StubFacility : public cyclus::Facility  {
   /// @param time the time of the tock
   virtual void Tock();
 
-  // and away we go!
+  // And away we go!
 };
 
 }  // namespace stubs
 
-#endif  // CYCSTUB_SRC_STUB_FACILITY_H_
+#endif  // CYCLUS_STUBS_STUB_FACILITY_H_
diff --git a/src/stub_facility_tests.cc b/src/stub_facility_tests.cc
@@ -55,7 +55,7 @@ cyclus::Agent* StubFacilityConstructor(cyclus::Context* ctx) {
   return new StubFacility(ctx);
 }
 
-// required to get functionality in cyclus agent unit tests library
+// Required to get functionality in cyclus agent unit tests library
 #ifndef CYCLUS_AGENT_TESTS_CONNECTED
 int ConnectAgentTests();
 static int cyclus_agent_tests_connected = ConnectAgentTests();

diff --git a/src/stub_inst.h b/src/stub_inst.h
@@ -1,5 +1,5 @@
-#ifndef CYCLSTUB_SRC_STUB_INST_H_
-#define CYCLSTUB_SRC_STUB_INST_H_
+#ifndef CYCLUS_STUBS_STUB_INST_H_
+#define CYCLUS_STUBS_STUB_INST_H_
 
 #include <string>
 
@@ -34,9 +34,9 @@ class StubInst : public cyclus::Institution {
  public:
   /// Constructor for StubInst Class
   /// @param ctx the cyclus context for access to simulation-wide parameters
-  explicit StubInst(cyclus::Context* ctx);
+  explicit  StubInst(cyclus::Context* ctx);
 
-  /// every agent should be destructable
+  /// Every agent should be destructable
   virtual ~StubInst();
 
   /// The Prime Directive
@@ -51,12 +51,12 @@ class StubInst : public cyclus::Institution {
                               "skeleton for the design of new " \
                               "institution agents."}
 
-  /// every agent should be able to print a verbose description
+  /// Every agent should be able to print a verbose description
   virtual std::string str();
 
-  // and away we go!
+  // And away we go!
 };
 
 }  // namespace stubs
 
-#endif  // CYCLSTUB_SRC_STUB_INST_H_
+#endif  // CYCLUS_STUBS_STUB_INST_H_
diff --git a/src/stub_inst_tests.cc b/src/stub_inst_tests.cc
@@ -48,7 +48,7 @@ TEST_F(StubInstTest, Tick) {
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 TEST_F(StubInstTest, Tock) {
   int time = 1;
-  EXPECT_NO_THROW(src_inst_->Tick());
+  EXPECT_NO_THROW(src_inst_->Tock());
   // Test StubInst specific behaviors of the handleTock function here
 }
 
@@ -57,7 +57,7 @@ cyclus::Agent* StubInstitutionConstructor(cyclus::Context* ctx) {
   return new StubInst(ctx);
 }
 
-// required to get functionality in cyclus agent unit tests library
+// Required to get functionality in cyclus agent unit tests library
 #ifndef CYCLUS_AGENT_TESTS_CONNECTED
 int ConnectAgentTests();
 static int cyclus_agent_tests_connected = ConnectAgentTests();

diff --git a/src/stub_region.h b/src/stub_region.h
@@ -1,5 +1,5 @@
-#ifndef CYCSTUB_SRC_STUB_REGION_H_
-#define CYCSTUB_SRC_STUB_REGION_H_
+#ifndef CYCLUS_STUBS_STUB_REGION_H_
+#define CYCLUS_STUBS_STUB_REGION_H_
 
 #include <string>
 
@@ -36,7 +36,7 @@ class StubRegion : public cyclus::Region {
   /// @param ctx the cyclus context for access to simulation-wide parameters
   explicit StubRegion(cyclus::Context* ctx);
 
-  /// every agent should be destructable
+  /// Every agent should be destructable
   virtual ~StubRegion();
 
   /// The Prime Directive
@@ -53,9 +53,9 @@ class StubRegion : public cyclus::Region {
   /// A verbose printer for the StubRegion
   virtual std::string str();
 
-  // and away we go!
+  // And away we go!
 };
 
 }  // namespace stubs
 
-#endif  // CYCSTUB_SRC_STUB_REGION_H_
+#endif  // CYCLUS_STUBS_STUB_REGION_H_
diff --git a/src/stub_region_tests.cc b/src/stub_region_tests.cc
@@ -2,8 +2,8 @@
 
 #include "stub_region.h"
 
-#include "region_tests.h"
 #include "agent_tests.h"
+#include "region_tests.h"
 
 using stubs::StubRegion;
 
@@ -53,7 +53,7 @@ cyclus::Agent* StubRegionConstructor(cyclus::Context* ctx) {
   return new StubRegion(ctx);
 }
 
-// required to get functionality in cyclus agent unit tests library
+// Required to get functionality in cyclus agent unit tests library
 #ifndef CYCLUS_AGENT_TESTS_CONNECTED
 int ConnectAgentTests();
 static int cyclus_agent_tests_connected = ConnectAgentTests();