jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[D] Test case fix: IntVector holds ints, not size_t.

Browse source 
Also changed for() to foreach() for better style.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12860 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
David Nadlinger 2011-12-03 19:47:39 +00:00
commit 5e5d1e2775
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Examples/test-suite/d/li_std_vector_runme.2.d
View file

@ -22,7 +22,7 @@ void main() {
// Basic functionality tests. // Basic functionality tests.
{ {
auto vector = new IntVector(); auto vector = new IntVector();
for (size_t i = 0; i < SIZE; ++i) { foreach (int i; 0 .. SIZE) {
vector ~= i * 10; vector ~= i * 10;
} }
@ -56,7 +56,7 @@ void main() {
// To array conversion tests. // To array conversion tests.
{ {
auto dVector = new DoubleVector(); auto dVector = new DoubleVector();
for (size_t i = 0; i < SIZE; ++i) { foreach (i; 0 .. SIZE) {
dVector ~= i * 10.1f; dVector ~= i * 10.1f;
} }
@ -67,13 +67,13 @@ void main() {
auto sVector = new StructVector(); auto sVector = new StructVector();
for (size_t i = 0; i < SIZE; i++) { foreach (i; 0 .. SIZE) {
sVector ~= new Struct(i / 10.0); sVector ~= new Struct(i / 10.0);
} }
Struct[] sArray = array(sVector[]); Struct[] sArray = array(sVector[]);
for (size_t i = 0; i < SIZE; i++) { foreach (i; 0 .. SIZE) {
// Make sure that a shallow copy has been made. // Make sure that a shallow copy has been made.
void* aPtr = Struct.swigGetCPtr(sArray[i]); void* aPtr = Struct.swigGetCPtr(sArray[i]);
void* vPtr = Struct.swigGetCPtr(sVector[i]); void* vPtr = Struct.swigGetCPtr(sVector[i]);
@ -84,7 +84,7 @@ void main() {
// remove() tests. // remove() tests.
{ {
auto iVector = new IntVector(); auto iVector = new IntVector();
for (int i = 0; i < SIZE; i++) { foreach (int i; 0 .. SIZE) {
iVector ~= i; iVector ~= i;
} }
@ -108,7 +108,7 @@ void main() {
// Test the methods being wrapped. // Test the methods being wrapped.
{ {
auto iv = new IntVector(); auto iv = new IntVector();
for (int i=0; i<4; i++) { foreach (int i; 0 .. 4) {
iv ~= i; iv ~= i;
} }
@ -117,7 +117,7 @@ void main() {
RealVector rv = half(new RealVector([10.0f, 10.5f, 11.0f, 11.5f])); RealVector rv = half(new RealVector([10.0f, 10.5f, 11.0f, 11.5f]));
auto dv = new DoubleVector(); auto dv = new DoubleVector();
for (size_t i = 0; i < SIZE; i++) { foreach (i; 0 .. SIZE) {
dv ~= i / 2.0; dv ~= i / 2.0;
} }
halve_in_place(dv); halve_in_place(dv);
@ -147,13 +147,13 @@ void main() {
// Test vectors of pointers. // Test vectors of pointers.
{ {
auto vector = new StructPtrVector(); auto vector = new StructPtrVector();
for (size_t i = 0; i < SIZE; i++) { foreach (i; 0 .. SIZE) {
vector ~= new Struct(i / 10.0); vector ~= new Struct(i / 10.0);
} }
Struct[] array = array(vector[]); Struct[] array = array(vector[]);
for (size_t i = 0; i < SIZE; i++) { foreach (i; 0 .. SIZE) {
// Make sure that a shallow copy has been made. // Make sure that a shallow copy has been made.
void* aPtr = Struct.swigGetCPtr(array[i]); void* aPtr = Struct.swigGetCPtr(array[i]);
void* vPtr = Struct.swigGetCPtr(vector[i]); void* vPtr = Struct.swigGetCPtr(vector[i]);
@ -164,13 +164,13 @@ void main() {
// Test vectors of const pointers. // Test vectors of const pointers.
{ {
auto vector = new StructConstPtrVector(); auto vector = new StructConstPtrVector();
for (size_t i = 0; i < SIZE; i++) { foreach (i; 0 .. SIZE) {
vector ~= new Struct(i / 10.0); vector ~= new Struct(i / 10.0);
} }
Struct[] array = array(vector[]); Struct[] array = array(vector[]);
for (size_t i = 0; i < SIZE; i++) { foreach (i; 0 .. SIZE) {
// Make sure that a shallow copy has been made. // Make sure that a shallow copy has been made.
void* aPtr = Struct.swigGetCPtr(array[i]); void* aPtr = Struct.swigGetCPtr(array[i]);
void* vPtr = Struct.swigGetCPtr(vector[i]); void* vPtr = Struct.swigGetCPtr(vector[i]);