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

Java std::vector std::list enhancements

Browse source 
- Add missing vector copy constructor
- Add constructor to initialize the containers. Note that Java's
  equivalent constructor for ArrayList just sets the capacity, whereas
  the wrappers behave like the C++ constructor and set the size. I've
  done this mainly because there has been a vector(size_type) constructor
  in the Java wrappers for many years, so best to keep this unchanged.
This commit is contained in:
William S Fulton 2017-06-24 14:21:34 +01:00
commit ea55c5bba0
5 changed files with 114 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

67
Examples/test-suite/java/li_std_list_runme.java
View file

@ -53,6 +53,12 @@ public class li_std_list_runme {
if (v1.size() != 0) throw new RuntimeException("v1 test (16) failed");
if (v1.remove(new Integer(456))) throw new RuntimeException("v1 test (17) failed");
if (new IntList(3).size() != 3) throw new RuntimeException("constructor initial size test failed");
for (int n : new IntList(10, 999))
if (n != 999) throw new RuntimeException("constructor initialization with value failed");
for (int n : new IntList(new IntList(10, 999)))
if (n != 999) throw new RuntimeException("copy constructor initialization with value failed");
StructList v4 = new StructList();
StructPtrList v5 = new StructPtrList();
StructConstPtrList v6 = new StructConstPtrList();
@ -61,9 +67,68 @@ public class li_std_list_runme {
v5.add(new Struct(34));
v6.add(new Struct(56));
Struct s = null;
if (v4.get(0).getNum() != 12) throw new RuntimeException("v4 test failed");
if (v5.get(0).getNum() != 34) throw new RuntimeException("v5 test failed");
if (v6.get(0).getNum() != 56) throw new RuntimeException("v6 test failed");
for (Struct s : v4) {
if (s.getNum() != 12) throw new RuntimeException("v4 loop test failed");
}
for (Struct s : v5) {
if (s.getNum() != 34) throw new RuntimeException("v5 loop test failed");
}
for (Struct s : v6) {
if (s.getNum() != 56) throw new RuntimeException("v6 loop test failed");
}
StructList v7 = li_std_list.CopyContainerStruct(new StructList());
v7.add(new Struct(1));
v7.add(new Struct(23));
v7.add(new Struct(456));
v7.add(new Struct(7890));
if (v7.size() != 4) throw new RuntimeException("v7 test (1) failed");
{
double[] a7 = {1, 23, 456, 7890};
int i7 = 0;
for (Struct s7 : v7) {
if (s7.getNum() != a7[i7]) throw new RuntimeException("v7 test (2) failed");
i7++;
}
if (i7 != a7.length) throw new RuntimeException("v7 test (3) failed");
}
if (v7.remove(2).getNum() != 456) throw new RuntimeException("v7 test (4) failed");
{
double[] a7 = {1, 23, 7890};
int i7 = 0;
for (Struct s7 : v7) {
if (s7.getNum() != a7[i7]) throw new RuntimeException("v7 test (5) failed");
i7++;
}
if (i7 != a7.length) throw new RuntimeException("v7 test (6) failed");
}
v7.add(1, new Struct(123));
{
double[] a7 = {1, 123, 23, 7890};
int i7 = 0;
for (Struct s7 : v7) {
if (s7.getNum() != a7[i7]) throw new RuntimeException("v7 test (7) failed");
i7++;
}
if (i7 != a7.length) throw new RuntimeException("v7 test (8) failed");
}
BoolList v8 = new BoolList();
if (!v8.add(true)) throw new RuntimeException("v8 test (1) failed");;
if (v8.get(0) != true) throw new RuntimeException("v8 test (2) failed");;
if (v8.set(0, false) != true) throw new RuntimeException("v8 test (3) failed");;
if (v8.set(0, false) != false) throw new RuntimeException("v8 test (4) failed");;
if (v8.size() != 1) throw new RuntimeException("v8 test (5) failed");;
java.util.ArrayList<Boolean> bl = new java.util.ArrayList<Boolean>(java.util.Arrays.asList(true, false, true, false));
BoolList bv = new BoolList(java.util.Arrays.asList(true, false, true, false));
BoolList bv2 = new BoolList(bl);
java.util.ArrayList<Boolean> bl2 = new java.util.ArrayList<Boolean>(bv);
boolean bbb1 = bv.get(0);
Boolean bbb2 = bv.get(0);
}
}