URI of form ev4:nt/NTType:1.0 ; narrow, narrow_unsafe, is_compatible => wrap, wrapUnsafe, isCompatible

This commit is contained in:
Marty Kraimer
2014-10-01 08:34:34 -04:00
parent 08eb138d02
commit 4ee19f4dd1
19 changed files with 230 additions and 241 deletions

View File

@ -32,7 +32,7 @@ using std::cout;
using std::endl;
using std::vector;
static bool debug = true;
static bool debug = false;
static FieldCreatePtr fieldCreate = getFieldCreate();
static PVDataCreatePtr pvDataCreate = getPVDataCreate();
@ -122,7 +122,7 @@ static void test()
testOk1(multiChannel.get() != 0);
pvStructure = multiChannel->getPVStructure();
if(debug) {cout << *pvStructure << endl;}
testOk1(NTMultiChannel::is_compatible(pvStructure)==true);
testOk1(NTMultiChannel::isCompatible(pvStructure)==true);
PVStructurePtr pvTimeStamp = multiChannel->getTimeStamp();
testOk1(pvTimeStamp.get() !=0);
PVStructurePtr pvAlarm = multiChannel->getAlarm();
@ -150,19 +150,19 @@ static void test()
}
void test_narrow()
void test_wrap()
{
testDiag("test_narrow");
testDiag("test_wrap");
NTMultiChannelPtr nullPtr = NTMultiChannel::narrow(PVStructurePtr());
testOk(nullPtr.get() == 0, "nullptr narrow");
NTMultiChannelPtr nullPtr = NTMultiChannel::wrap(PVStructurePtr());
testOk(nullPtr.get() == 0, "nullptr wrap");
nullPtr = NTMultiChannel::narrow(
nullPtr = NTMultiChannel::wrap(
getPVDataCreate()->createPVStructure(
NTField::get()->createTimeStamp()
)
);
testOk(nullPtr.get() == 0, "wrong type narrow");
testOk(nullPtr.get() == 0, "wrong type wrap");
NTMultiChannelBuilderPtr builder = NTMultiChannel::createBuilder();
@ -174,18 +174,19 @@ void test_narrow()
if (!pvStructure)
return;
NTMultiChannelPtr ptr = NTMultiChannel::narrow(pvStructure);
testOk(ptr.get() != 0, "narrow OK");
NTMultiChannelPtr ptr = NTMultiChannel::wrap(pvStructure);
testOk(ptr.get() != 0, "wrap OK");
ptr = NTMultiChannel::narrow_unsafe(pvStructure);
testOk(ptr.get() != 0, "narrow_unsafe OK");
builder = NTMultiChannel::createBuilder();
ptr = NTMultiChannel::wrapUnsafe(pvStructure);
testOk(ptr.get() != 0, "wrapUnsafe OK");
}
MAIN(testCreateRequest)
{
testPlan(25);
test();
test_narrow();
test_wrap();
return testDone();
}

View File

@ -180,19 +180,19 @@ void test_ntnameValue()
}
void test_narrow()
void test_wrap()
{
testDiag("test_narrow");
testDiag("test_wrap");
NTNameValuePtr nullPtr = NTNameValue::narrow(PVStructurePtr());
testOk(nullPtr.get() == 0, "nullptr narrow");
NTNameValuePtr nullPtr = NTNameValue::wrap(PVStructurePtr());
testOk(nullPtr.get() == 0, "nullptr wrap");
nullPtr = NTNameValue::narrow(
nullPtr = NTNameValue::wrap(
getPVDataCreate()->createPVStructure(
NTField::get()->createTimeStamp()
)
);
testOk(nullPtr.get() == 0, "wrong type narrow");
testOk(nullPtr.get() == 0, "wrong type wrap");
NTNameValueBuilderPtr builder = NTNameValue::createBuilder();
@ -205,12 +205,12 @@ void test_narrow()
if (!pvStructure)
return;
testOk1(NTNameValue::is_compatible(pvStructure)==true);
NTNameValuePtr ptr = NTNameValue::narrow(pvStructure);
testOk(ptr.get() != 0, "narrow OK");
testOk1(NTNameValue::isCompatible(pvStructure)==true);
NTNameValuePtr ptr = NTNameValue::wrap(pvStructure);
testOk(ptr.get() != 0, "wrap OK");
ptr = NTNameValue::narrow_unsafe(pvStructure);
testOk(ptr.get() != 0, "narrow_unsafe OK");
ptr = NTNameValue::wrapUnsafe(pvStructure);
testOk(ptr.get() != 0, "wrapUnsafe OK");
}
void test_extra()
@ -248,7 +248,7 @@ MAIN(testNTNameValue) {
testPlan(48);
test_builder();
test_ntnameValue();
test_narrow();
test_wrap();
test_extra();
return testDone();
}

View File

@ -76,23 +76,23 @@ void test_all()
add("extra2",fieldCreate->createScalarArray(pvString)) ->
createPVStructure();
std::cout << *pvStructure << std::endl;
testOk1(NTNDArray::is_compatible(pvStructure)==true);
testOk1(NTNDArray::isCompatible(pvStructure)==true);
}
void test_narrow()
void test_wrap()
{
testDiag("test_narrow");
testDiag("test_wrap");
NTNDArrayPtr nullPtr = NTNDArray::narrow(PVStructurePtr());
testOk(nullPtr.get() == 0, "nullptr narrow");
NTNDArrayPtr nullPtr = NTNDArray::wrap(PVStructurePtr());
testOk(nullPtr.get() == 0, "nullptr wrap");
nullPtr = NTNDArray::narrow(
nullPtr = NTNDArray::wrap(
getPVDataCreate()->createPVStructure(
NTField::get()->createTimeStamp()
)
);
testOk(nullPtr.get() == 0, "wrong type narrow");
testOk(nullPtr.get() == 0, "wrong type wrap");
NTNDArrayBuilderPtr builder = NTNDArray::createBuilder();
@ -103,13 +103,13 @@ void test_narrow()
testOk1(pvStructure.get() != 0);
if (!pvStructure)
return;
testOk1(NTNDArray::is_compatible(pvStructure)==true);
testOk1(NTNDArray::isCompatible(pvStructure)==true);
NTNDArrayPtr ptr = NTNDArray::narrow(pvStructure);
testOk(ptr.get() != 0, "narrow OK");
NTNDArrayPtr ptr = NTNDArray::wrap(pvStructure);
testOk(ptr.get() != 0, "wrap OK");
ptr = NTNDArray::narrow_unsafe(pvStructure);
testOk(ptr.get() != 0, "narrow_unsafe OK");
ptr = NTNDArray::wrapUnsafe(pvStructure);
testOk(ptr.get() != 0, "wrapUnsafe OK");
}
MAIN(testNTNDArray) {
@ -118,7 +118,7 @@ MAIN(testNTNDArray) {
test_builder(false);
test_builder(false); // called twice to test caching
test_all();
test_narrow();
test_wrap();
return testDone();
}

View File

@ -201,19 +201,19 @@ void test_ntscalarArray()
}
void test_narrow()
void test_wrap()
{
testDiag("test_narrow");
testDiag("test_wrap");
NTScalarArrayPtr nullPtr = NTScalarArray::narrow(PVStructurePtr());
testOk(nullPtr.get() == 0, "nullptr narrow");
NTScalarArrayPtr nullPtr = NTScalarArray::wrap(PVStructurePtr());
testOk(nullPtr.get() == 0, "nullptr wrap");
nullPtr = NTScalarArray::narrow(
nullPtr = NTScalarArray::wrap(
getPVDataCreate()->createPVStructure(
NTField::get()->createTimeStamp()
)
);
testOk(nullPtr.get() == 0, "wrong type narrow");
testOk(nullPtr.get() == 0, "wrong type wrap");
NTScalarArrayBuilderPtr builder = NTScalarArray::createBuilder();
@ -226,19 +226,19 @@ void test_narrow()
if (!pvStructure)
return;
testOk1(NTScalarArray::is_compatible(pvStructure)==true);
NTScalarArrayPtr ptr = NTScalarArray::narrow(pvStructure);
testOk(ptr.get() != 0, "narrow OK");
testOk1(NTScalarArray::isCompatible(pvStructure)==true);
NTScalarArrayPtr ptr = NTScalarArray::wrap(pvStructure);
testOk(ptr.get() != 0, "wrap OK");
ptr = NTScalarArray::narrow_unsafe(pvStructure);
testOk(ptr.get() != 0, "narrow_unsafe OK");
ptr = NTScalarArray::wrapUnsafe(pvStructure);
testOk(ptr.get() != 0, "wrapUnsafe OK");
}
MAIN(testNTScalarArray) {
testPlan(38);
test_builder();
test_ntscalarArray();
test_narrow();
test_wrap();
return testDone();
}

View File

@ -192,19 +192,19 @@ void test_ntscalar()
}
void test_narrow()
void test_wrap()
{
testDiag("test_narrow");
testDiag("test_wrap");
NTScalarPtr nullPtr = NTScalar::narrow(PVStructurePtr());
testOk(nullPtr.get() == 0, "nullptr narrow");
NTScalarPtr nullPtr = NTScalar::wrap(PVStructurePtr());
testOk(nullPtr.get() == 0, "nullptr wrap");
nullPtr = NTScalar::narrow(
nullPtr = NTScalar::wrap(
getPVDataCreate()->createPVStructure(
NTField::get()->createTimeStamp()
)
);
testOk(nullPtr.get() == 0, "wrong type narrow");
testOk(nullPtr.get() == 0, "wrong type wrap");
NTScalarBuilderPtr builder = NTScalar::createBuilder();
@ -217,19 +217,19 @@ void test_narrow()
if (!pvStructure)
return;
testOk1(NTScalar::is_compatible(pvStructure)==true);
NTScalarPtr ptr = NTScalar::narrow(pvStructure);
testOk(ptr.get() != 0, "narrow OK");
testOk1(NTScalar::isCompatible(pvStructure)==true);
NTScalarPtr ptr = NTScalar::wrap(pvStructure);
testOk(ptr.get() != 0, "wrap OK");
ptr = NTScalar::narrow_unsafe(pvStructure);
testOk(ptr.get() != 0, "narrow_unsafe OK");
ptr = NTScalar::wrapUnsafe(pvStructure);
testOk(ptr.get() != 0, "wrapUnsafe OK");
}
MAIN(testNTScalar) {
testPlan(35);
test_builder();
test_ntscalar();
test_narrow();
test_wrap();
return testDone();
}

View File

@ -87,7 +87,7 @@ void test_labels()
if (!pvStructure)
return;
testOk1(NTTable::is_compatible(pvStructure)==true);
testOk1(NTTable::isCompatible(pvStructure)==true);
std::cout << *pvStructure << std::endl;
PVStringArrayPtr labels = pvStructure->getSubField<PVStringArray>("labels");
@ -199,19 +199,19 @@ void test_nttable()
}
void test_narrow()
void test_wrap()
{
testDiag("test_narrow");
testDiag("test_wrap");
NTTablePtr nullPtr = NTTable::narrow(PVStructurePtr());
testOk(nullPtr.get() == 0, "nullptr narrow");
NTTablePtr nullPtr = NTTable::wrap(PVStructurePtr());
testOk(nullPtr.get() == 0, "nullptr wrap");
nullPtr = NTTable::narrow(
nullPtr = NTTable::wrap(
getPVDataCreate()->createPVStructure(
NTField::get()->createTimeStamp()
)
);
testOk(nullPtr.get() == 0, "wrong type narrow");
testOk(nullPtr.get() == 0, "wrong type wrap");
NTTableBuilderPtr builder = NTTable::createBuilder();
@ -226,11 +226,11 @@ void test_narrow()
if (!pvStructure)
return;
NTTablePtr ptr = NTTable::narrow(pvStructure);
testOk(ptr.get() != 0, "narrow OK");
NTTablePtr ptr = NTTable::wrap(pvStructure);
testOk(ptr.get() != 0, "wrap OK");
ptr = NTTable::narrow_unsafe(pvStructure);
testOk(ptr.get() != 0, "narrow_unsafe OK");
ptr = NTTable::wrapUnsafe(pvStructure);
testOk(ptr.get() != 0, "wrapUnsafe OK");
}
MAIN(testNTTable) {
@ -238,7 +238,7 @@ MAIN(testNTTable) {
test_builder();
test_labels();
test_nttable();
test_narrow();
test_wrap();
return testDone();
}