--- a/src/core/test/attribute-test-suite.cc Fri May 13 14:51:51 2011 -0400
+++ b/src/core/test/attribute-test-suite.cc Fri May 13 14:52:27 2011 -0400
@@ -61,7 +61,7 @@
static TypeId GetTypeId (void) {
static TypeId tid = TypeId ("ns3::Derived")
.SetParent<Object> ()
- ;
+ ;
return tid;
}
};
@@ -79,89 +79,89 @@
.SetParent<Object> ()
.HideFromDocumentation ()
.AddAttribute ("TestBoolName", "help text",
- BooleanValue (false),
- MakeBooleanAccessor (&AttributeObjectTest::m_boolTest),
- MakeBooleanChecker ())
+ BooleanValue (false),
+ MakeBooleanAccessor (&AttributeObjectTest::m_boolTest),
+ MakeBooleanChecker ())
.AddAttribute ("TestBoolA", "help text",
- BooleanValue (false),
- MakeBooleanAccessor (&AttributeObjectTest::DoSetTestB,
- &AttributeObjectTest::DoGetTestB),
- MakeBooleanChecker ())
+ BooleanValue (false),
+ MakeBooleanAccessor (&AttributeObjectTest::DoSetTestB,
+ &AttributeObjectTest::DoGetTestB),
+ MakeBooleanChecker ())
.AddAttribute ("TestInt16", "help text",
- IntegerValue (-2),
- MakeIntegerAccessor (&AttributeObjectTest::m_int16),
- MakeIntegerChecker<int16_t> ())
+ IntegerValue (-2),
+ MakeIntegerAccessor (&AttributeObjectTest::m_int16),
+ MakeIntegerChecker<int16_t> ())
.AddAttribute ("TestInt16WithBounds", "help text",
- IntegerValue (-2),
- MakeIntegerAccessor (&AttributeObjectTest::m_int16WithBounds),
- MakeIntegerChecker<int16_t> (-5, 10))
+ IntegerValue (-2),
+ MakeIntegerAccessor (&AttributeObjectTest::m_int16WithBounds),
+ MakeIntegerChecker<int16_t> (-5, 10))
.AddAttribute ("TestInt16SetGet", "help text",
- IntegerValue (6),
- MakeIntegerAccessor (&AttributeObjectTest::DoSetInt16,
- &AttributeObjectTest::DoGetInt16),
- MakeIntegerChecker<int16_t> ())
+ IntegerValue (6),
+ MakeIntegerAccessor (&AttributeObjectTest::DoSetInt16,
+ &AttributeObjectTest::DoGetInt16),
+ MakeIntegerChecker<int16_t> ())
.AddAttribute ("TestUint8", "help text",
- UintegerValue (1),
- MakeUintegerAccessor (&AttributeObjectTest::m_uint8),
- MakeUintegerChecker<uint8_t> ())
+ UintegerValue (1),
+ MakeUintegerAccessor (&AttributeObjectTest::m_uint8),
+ MakeUintegerChecker<uint8_t> ())
.AddAttribute ("TestEnum", "help text",
- EnumValue (TEST_A),
- MakeEnumAccessor (&AttributeObjectTest::m_enum),
- MakeEnumChecker (TEST_A, "TestA",
- TEST_B, "TestB",
- TEST_C, "TestC"))
+ EnumValue (TEST_A),
+ MakeEnumAccessor (&AttributeObjectTest::m_enum),
+ MakeEnumChecker (TEST_A, "TestA",
+ TEST_B, "TestB",
+ TEST_C, "TestC"))
.AddAttribute ("TestRandom", "help text",
- RandomVariableValue (ConstantVariable (1.0)),
- MakeRandomVariableAccessor (&AttributeObjectTest::m_random),
- MakeRandomVariableChecker ())
+ RandomVariableValue (ConstantVariable (1.0)),
+ MakeRandomVariableAccessor (&AttributeObjectTest::m_random),
+ MakeRandomVariableChecker ())
.AddAttribute ("TestFloat", "help text",
- DoubleValue (-1.1),
- MakeDoubleAccessor (&AttributeObjectTest::m_float),
- MakeDoubleChecker<float> ())
+ DoubleValue (-1.1),
+ MakeDoubleAccessor (&AttributeObjectTest::m_float),
+ MakeDoubleChecker<float> ())
.AddAttribute ("TestVector1", "help text",
- ObjectVectorValue (),
- MakeObjectVectorAccessor (&AttributeObjectTest::m_vector1),
- MakeObjectVectorChecker<Derived> ())
+ ObjectVectorValue (),
+ MakeObjectVectorAccessor (&AttributeObjectTest::m_vector1),
+ MakeObjectVectorChecker<Derived> ())
.AddAttribute ("TestVector2", "help text",
- ObjectVectorValue (),
- MakeObjectVectorAccessor (&AttributeObjectTest::DoGetVectorN,
- &AttributeObjectTest::DoGetVector),
- MakeObjectVectorChecker<Derived> ())
+ ObjectVectorValue (),
+ MakeObjectVectorAccessor (&AttributeObjectTest::DoGetVectorN,
+ &AttributeObjectTest::DoGetVector),
+ MakeObjectVectorChecker<Derived> ())
.AddAttribute ("IntegerTraceSource1", "help text",
- IntegerValue (-2),
- MakeIntegerAccessor (&AttributeObjectTest::m_intSrc1),
- MakeIntegerChecker<int8_t> ())
+ IntegerValue (-2),
+ MakeIntegerAccessor (&AttributeObjectTest::m_intSrc1),
+ MakeIntegerChecker<int8_t> ())
.AddAttribute ("IntegerTraceSource2", "help text",
- IntegerValue (-2),
- MakeIntegerAccessor (&AttributeObjectTest::DoSetIntSrc,
- &AttributeObjectTest::DoGetIntSrc),
- MakeIntegerChecker<int8_t> ())
+ IntegerValue (-2),
+ MakeIntegerAccessor (&AttributeObjectTest::DoSetIntSrc,
+ &AttributeObjectTest::DoGetIntSrc),
+ MakeIntegerChecker<int8_t> ())
.AddAttribute ("UIntegerTraceSource", "help text",
- UintegerValue (2),
- MakeUintegerAccessor (&AttributeObjectTest::m_uintSrc),
- MakeIntegerChecker<uint8_t> ())
+ UintegerValue (2),
+ MakeUintegerAccessor (&AttributeObjectTest::m_uintSrc),
+ MakeIntegerChecker<uint8_t> ())
.AddAttribute ("DoubleTraceSource", "help text",
- DoubleValue (2),
- MakeDoubleAccessor (&AttributeObjectTest::m_doubleSrc),
- MakeDoubleChecker<double> ())
+ DoubleValue (2),
+ MakeDoubleAccessor (&AttributeObjectTest::m_doubleSrc),
+ MakeDoubleChecker<double> ())
.AddAttribute ("BoolTraceSource", "help text",
BooleanValue (false),
- MakeBooleanAccessor (&AttributeObjectTest::m_boolSrc),
- MakeBooleanChecker ())
+ MakeBooleanAccessor (&AttributeObjectTest::m_boolSrc),
+ MakeBooleanChecker ())
.AddAttribute ("EnumTraceSource", "help text",
EnumValue (false),
- MakeEnumAccessor (&AttributeObjectTest::m_enumSrc),
- MakeEnumChecker (TEST_A, "TestA"))
+ MakeEnumAccessor (&AttributeObjectTest::m_enumSrc),
+ MakeEnumChecker (TEST_A, "TestA"))
.AddAttribute ("ValueClassSource", "help text",
- ValueClassTestValue (ValueClassTest ()),
- MakeValueClassTestAccessor (&AttributeObjectTest::m_valueSrc),
- MakeValueClassTestChecker ())
+ ValueClassTestValue (ValueClassTest ()),
+ MakeValueClassTestAccessor (&AttributeObjectTest::m_valueSrc),
+ MakeValueClassTestChecker ())
.AddTraceSource ("Source1", "help test",
- MakeTraceSourceAccessor (&AttributeObjectTest::m_intSrc1))
+ MakeTraceSourceAccessor (&AttributeObjectTest::m_intSrc1))
.AddTraceSource ("Source2", "help text",
- MakeTraceSourceAccessor (&AttributeObjectTest::m_cb))
+ MakeTraceSourceAccessor (&AttributeObjectTest::m_cb))
.AddTraceSource ("ValueSource", "help text",
- MakeTraceSourceAccessor (&AttributeObjectTest::m_valueSrc))
+ MakeTraceSourceAccessor (&AttributeObjectTest::m_valueSrc))
.AddAttribute ("Pointer", "help text",
PointerValue (),
MakePointerAccessor (&AttributeObjectTest::m_ptr),
@@ -170,14 +170,14 @@
CallbackValue (),
MakeCallbackAccessor (&AttributeObjectTest::m_cbValue),
MakeCallbackChecker ())
- ;
-
+ ;
+
return tid;
}
- void AddToVector1 (void) {m_vector1.push_back (CreateObject<Derived> ());}
- void AddToVector2 (void) {m_vector2.push_back (CreateObject<Derived> ());}
- void InvokeCb (double a, int b, float c) {m_cb (a,b,c);}
+ void AddToVector1 (void) { m_vector1.push_back (CreateObject<Derived> ());}
+ void AddToVector2 (void) { m_vector2.push_back (CreateObject<Derived> ());}
+ void InvokeCb (double a, int b, float c) { m_cb (a,b,c);}
void InvokeCbValue (int8_t a)
{
@@ -187,14 +187,14 @@
}
private:
- void DoSetTestB (bool v) {m_boolTestA = v;}
- bool DoGetTestB (void) const {return m_boolTestA;}
- int16_t DoGetInt16 (void) const {return m_int16SetGet;}
- void DoSetInt16 (int16_t v) {m_int16SetGet = v;}
- uint32_t DoGetVectorN (void) const {return m_vector2.size ();}
- Ptr<Derived> DoGetVector (uint32_t i) const {return m_vector2[i];}
- bool DoSetIntSrc (int8_t v) {m_intSrc2 = v; return true;}
- int8_t DoGetIntSrc (void) const {return m_intSrc2;}
+ void DoSetTestB (bool v) { m_boolTestA = v;}
+ bool DoGetTestB (void) const { return m_boolTestA;}
+ int16_t DoGetInt16 (void) const { return m_int16SetGet;}
+ void DoSetInt16 (int16_t v) { m_int16SetGet = v;}
+ uint32_t DoGetVectorN (void) const { return m_vector2.size ();}
+ Ptr<Derived> DoGetVector (uint32_t i) const { return m_vector2[i];}
+ bool DoSetIntSrc (int8_t v) { m_intSrc2 = v; return true;}
+ int8_t DoGetIntSrc (void) const { return m_intSrc2;}
bool m_boolTestA;
bool m_boolTest;
@@ -836,7 +836,7 @@
private:
virtual void DoRun (void);
- void NotifySource1 (int8_t old, int8_t n) {m_got1 = n;}
+ void NotifySource1 (int8_t old, int8_t n) { m_got1 = n;}
int64_t m_got1;
};
@@ -908,7 +908,7 @@
private:
virtual void DoRun (void);
- void NotifySource2 (double a, int b, float c) {m_got2 = a;}
+ void NotifySource2 (double a, int b, float c) { m_got2 = a;}
double m_got2;
};
@@ -982,7 +982,7 @@
private:
virtual void DoRun (void);
- void NotifySource2 (double a, int b, float c) {m_got2 = a;}
+ void NotifySource2 (double a, int b, float c) { m_got2 = a;}
double m_got2;
};
@@ -1078,7 +1078,7 @@
Callback<void,int8_t> m_cbValue;
- void NotifyCallbackValue (int8_t a) {m_gotCbValue = a;}
+ void NotifyCallbackValue (int8_t a) { m_gotCbValue = a;}
int16_t m_gotCbValue;
};
@@ -1136,7 +1136,7 @@
//
p->InvokeCbValue (3);
NS_TEST_ASSERT_MSG_EQ (m_gotCbValue, 2, "Callback Attribute set to null callback unexpectedly fired");
- }
+}
// ===========================================================================
// The Test Suite that glues all of the Test Cases together.