model+ndn.cxx+test: Finishing implementation of ApiFace (now timeouts are working as well)
Also, adding a basic test case to test ApiFace
Refs #1005 (http://redmine.named-data.net/)
diff --git a/test/ndnSIM-api.cc b/test/ndnSIM-api.cc
new file mode 100644
index 0000000..b472850
--- /dev/null
+++ b/test/ndnSIM-api.cc
@@ -0,0 +1,162 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2013, Regents of the University of California
+ * Alexander Afanasyev
+ *
+ * GNU v3.0 license, See the LICENSE file for more information
+ *
+ * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ */
+
+#include "ndnSIM-api.h"
+#include "ns3/core-module.h"
+#include "ns3/ndnSIM-module.h"
+#include "ns3/point-to-point-module.h"
+
+#include <boost/lexical_cast.hpp>
+
+NS_LOG_COMPONENT_DEFINE ("ndn.ApiTest");
+
+namespace ns3
+{
+
+class ApiTestClient : public Application
+{
+public:
+ static TypeId
+ GetTypeId ()
+ {
+ static TypeId tid = TypeId ("ns3::ndn::test::ApiTestClient")
+ .SetParent<Application> ()
+ .AddConstructor<ApiTestClient> ()
+ ;
+
+ return tid;
+ }
+
+ ApiTestClient ()
+ : datas (0)
+ , timeouts (0)
+ {
+ }
+
+protected:
+ void
+ StartApplication ()
+ {
+ m_face = Create<ndn::ApiFace> (GetNode ());
+
+ Simulator::Schedule (Seconds (0.1), &ApiTestClient::SendPacket, this, std::string ("/1"));
+ Simulator::Schedule (Seconds (5.0), &ApiTestClient::SendPacket, this, std::string ("/2"));
+ }
+
+ void
+ StopApplication ()
+ {
+ m_face->Shutdown ();
+ m_face = 0;
+ }
+
+private:
+ void
+ GotData (Ptr<const ndn::Interest>, Ptr<const ndn::ContentObject>)
+ {
+ datas++;
+ }
+
+ void
+ GotTimeout (Ptr<const ndn::Interest>)
+ {
+ timeouts++;
+ }
+
+ void
+ SendPacket (const std::string &prefix)
+ {
+ Ptr<ndn::Interest> interest = Create<ndn::Interest> ();
+ interest->SetName (Create<ndn::Name> (prefix));
+ interest->SetInterestLifetime (Seconds (0.5));
+
+ m_face->ExpressInterest (interest,
+ MakeCallback (&ApiTestClient::GotData, this),
+ MakeCallback (&ApiTestClient::GotTimeout, this));
+ }
+
+public:
+ uint32_t datas;
+ uint32_t timeouts;
+
+private:
+ Ptr<ndn::ApiFace> m_face;
+};
+
+NS_OBJECT_ENSURE_REGISTERED (ApiTestClient);
+
+void
+ApiTest::Check0 (Ptr<Application> app)
+{
+ NS_TEST_ASSERT_MSG_EQ (DynamicCast<ApiTestClient> (app)->datas, 0, "");
+ NS_TEST_ASSERT_MSG_EQ (DynamicCast<ApiTestClient> (app)->timeouts, 0, "");
+}
+
+void
+ApiTest::Check1 (Ptr<Application> app)
+{
+ NS_TEST_ASSERT_MSG_EQ (DynamicCast<ApiTestClient> (app)->datas, 1, "");
+ NS_TEST_ASSERT_MSG_EQ (DynamicCast<ApiTestClient> (app)->timeouts, 0, "");
+}
+
+void
+ApiTest::Check2 (Ptr<Application> app)
+{
+ NS_TEST_ASSERT_MSG_EQ (DynamicCast<ApiTestClient> (app)->datas, 1, "");
+ NS_TEST_ASSERT_MSG_EQ (DynamicCast<ApiTestClient> (app)->timeouts, 1, "");
+}
+
+
+void
+ApiTest::DoRun ()
+{
+ Config::SetDefault ("ns3::PointToPointNetDevice::DataRate", StringValue ("1Mbps"));
+ Config::SetDefault ("ns3::PointToPointChannel::Delay", StringValue ("10ms"));
+ Config::SetDefault ("ns3::DropTailQueue::MaxPackets", StringValue ("20"));
+
+ // Creating nodes
+ NodeContainer nodes;
+ nodes.Create (3);
+
+ // Connecting nodes using two links
+ PointToPointHelper p2p;
+ p2p.Install (nodes.Get (0), nodes.Get (1));
+ p2p.Install (nodes.Get (1), nodes.Get (2));
+
+ // Install NDN stack on all nodes
+ ndn::StackHelper ndnHelper;
+ ndnHelper.SetDefaultRoutes (true);
+ ndnHelper.InstallAll ();
+
+ // Installing applications
+
+ // Consumer
+ ndn::AppHelper consumerHelper ("ns3::ndn::test::ApiTestClient");
+ ApplicationContainer apps = consumerHelper.Install (nodes.Get (0)); // first node
+
+ // Producer
+ ndn::AppHelper producerHelper ("ns3::ndn::Producer");
+ // Producer will reply to all requests starting with /prefix
+ producerHelper.SetPrefix ("/");
+ producerHelper.SetAttribute ("Postfix", StringValue ("/unique/postfix"));
+ producerHelper.SetAttribute ("PayloadSize", StringValue("1024"));
+ producerHelper.Install (nodes.Get (2)).Stop (Seconds (4.0)); // last node
+
+ Simulator::Schedule (Seconds (0.0001), &ApiTest::Check0, this, apps.Get (0));
+ Simulator::Schedule (Seconds (0.2000), &ApiTest::Check1, this, apps.Get (0));
+ Simulator::Schedule (Seconds (5.6100), &ApiTest::Check2, this, apps.Get (0));
+
+ Simulator::Stop (Seconds (20.0));
+
+ Simulator::Run ();
+ Simulator::Destroy ();
+}
+
+}
diff --git a/test/ndnSIM-api.h b/test/ndnSIM-api.h
new file mode 100644
index 0000000..7df0112
--- /dev/null
+++ b/test/ndnSIM-api.h
@@ -0,0 +1,42 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2013, Regents of the University of California
+ * Alexander Afanasyev
+ *
+ * GNU v3.0 license, See the LICENSE file for more information
+ *
+ * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ */
+
+#ifndef NDNSIM_TEST_API_H
+#define NDNSIM_TEST_API_H
+
+#include "ns3/test.h"
+#include "ns3/ptr.h"
+
+namespace ns3 {
+
+class Application;
+
+namespace ndn {
+}
+
+class ApiTest : public TestCase
+{
+public:
+ ApiTest ()
+ : TestCase ("API test")
+ {
+ }
+
+private:
+ virtual void DoRun ();
+
+ void Check0 (Ptr<Application> app);
+ void Check1 (Ptr<Application> app);
+ void Check2 (Ptr<Application> app);
+};
+
+}
+
+#endif // NDNSIM_TEST_API_H
diff --git a/test/ndnSIM-tests.cc b/test/ndnSIM-tests.cc
index a23dd05..face35e 100644
--- a/test/ndnSIM-tests.cc
+++ b/test/ndnSIM-tests.cc
@@ -24,6 +24,7 @@
#include "ndnSIM-serialization.h"
#include "ndnSIM-pit.h"
#include "ndnSIM-fib-entry.h"
+#include "ndnSIM-api.h"
namespace ns3
{
@@ -40,6 +41,7 @@
AddTestCase (new ContentObjectSerializationTest (), TestCase::QUICK);
AddTestCase (new FibEntryTest (), TestCase::QUICK);
AddTestCase (new PitTest (), TestCase::QUICK);
+ AddTestCase (new ApiTest (), TestCase::QUICK);
}
};