update tests to work with STEPattribute class changes

mpictor · mpictor · commit d146a62a8418 · 2013-10-12T22:21:46.000-04:00
diff --git a/test/cpp/schema_specific/aggregate_bound_runtime.cc b/test/cpp/schema_specific/aggregate_bound_runtime.cc
@@ -81,8 +81,9 @@ int main( int argc, char * argv[] ) {
         }
         //loop over the attributes
         for( int i = 0; i < cnt; i++ ) {
-            if( ( sal[i].aDesc->NonRefType() == ARRAY_TYPE ) && ( sal[i].aDesc->AggrElemType() == sdaiINTEGER ) ) {
-                b2 = ( ( AggrTypeDescriptor * ) sal[i].aDesc->DomainType() )->Bound2Runtime( ent );
+            const AttrDescriptor * ad = sal[i].getADesc();
+            if( ( ad->NonRefType() == ARRAY_TYPE ) && ( ad->AggrElemType() == sdaiINTEGER ) ) {
+                b2 = ( ( AggrTypeDescriptor * ) ad->DomainType() )->Bound2Runtime( ent );
                 cout << "bound 2: " << b2 << " values: ";
                 instAggrCnt++;
                 if( ( ( id == 1 ) && ( b2 != 3 ) ) || ( ( id == 2 ) && ( b2 != 5 ) ) ) {
diff --git a/test/cpp/schema_specific/attribute.cc b/test/cpp/schema_specific/attribute.cc
@@ -1,8 +1,7 @@
-/** \file inverse_attr.cc
-** 1-Jul-2012
-** Test inverse attributes; uses a tiny schema similar to a subset of IFC2x3
-**
-*/
+/** \file attribute.cc
+ * 1-Jul-2012
+ * Test attribute access; uses a tiny schema similar to a subset of IFC2x3
+ */
 #include <sc_cf.h>
 extern void SchemaInit( class Registry & );
 #include "sc_version_string.h"
diff --git a/test/cpp/schema_specific/inverse_attr2.cc b/test/cpp/schema_specific/inverse_attr2.cc
@@ -53,8 +53,8 @@ bool findInverseAttrs2( InverseAItr iai, InstMgr & instList, Registry & reg ) {
                         return false;
                     }
                     STEPattribute sa = attrlist[k];
-                    if( sa.aDesc->DomainType()->Type() == SET_TYPE ) {
-                        STEPaggregate * aggr = sa.ptr.a;
+                    if( sa.getADesc()->DomainType()->Type() == SET_TYPE ) {
+                        STEPaggregate * aggr = sa.Aggregate();
                         if( !aggr || aggr->is_null() != 0 ) { //this fails - and it appears that aggr is not initialized.
                             cout << "findInverseAttrs2 FAILED" << endl;
                             return false;
