Whitespace and test reclassify merge from develop

This commit is contained in:
Allen Byrne
2018-04-10 13:06:56 -05:00
parent df83d78134
commit c8974b8a9e
9 changed files with 92 additions and 122 deletions

View File

@@ -91,8 +91,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eget_current_stack: " + err);
}
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg_default,
num_msg_default == 3);
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg_default, num_msg_default == 3);
//Save a copy of the current stack and clears the current stack
try {
@@ -102,10 +101,8 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eget_current_stack: " + err);
}
assertFalse("H5.H5Eget_current_stack: get_current_stack - "
+ stack_id, stack_id < 0);
assertFalse("H5.H5Eget_current_stack: get_current_stack - "
+ stack_id, stack_id == stack_id_default);
assertFalse("H5.H5Eget_current_stack: get_current_stack - " + stack_id, stack_id < 0);
assertFalse("H5.H5Eget_current_stack: get_current_stack - " + stack_id, stack_id == stack_id_default);
// Verify we have the correct number of messages
try {
@@ -115,8 +112,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eget_current_stack: " + err);
}
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg_default,
num_msg_default == 0);
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg_default, num_msg_default == 0);
//Verify the copy has the correct number of messages
try {
@@ -126,8 +122,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eget_current_stack: " + err);
}
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg,
num_msg == 3);
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg, num_msg == 3);
try {
H5.H5Eclose_stack(stack_id);
@@ -158,8 +153,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eget_current_stack: " + err);
}
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg_default,
num_msg_default == 3);
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg_default, num_msg_default == 3);
//Save a copy of the current stack and clears the current stack
try {
@@ -169,10 +163,8 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eget_current_stack: " + err);
}
assertFalse("H5.H5Eget_current_stack: get_current_stack - "
+ stack_id, stack_id < 0);
assertFalse("H5.H5Eget_current_stack: get_current_stack - "
+ stack_id, stack_id == HDF5Constants.H5E_DEFAULT);
assertFalse("H5.H5Eget_current_stack: get_current_stack - " + stack_id, stack_id < 0);
assertFalse("H5.H5Eget_current_stack: get_current_stack - " + stack_id, stack_id == HDF5Constants.H5E_DEFAULT);
// Verify we have the correct number of messages
try {
@@ -182,8 +174,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eget_current_stack: " + err);
}
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg_default,
num_msg_default == 0);
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg_default, num_msg_default == 0);
//Verify the copy has the correct number of messages
try {
@@ -193,8 +184,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eget_current_stack: " + err);
}
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg,
num_msg == 3);
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg, num_msg == 3);
//Generate errors on default stack
try {
@@ -212,8 +202,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eget_current_stack: " + err);
}
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg_default,
num_msg_default == 3);
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg_default, num_msg_default == 3);
//Remove one message from the current stack
try {
@@ -224,8 +213,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eget_current_stack: " + err);
}
assertTrue("H5.H5Eget_current_stack: pop #:" + num_msg_default,
num_msg_default == 2);
assertTrue("H5.H5Eget_current_stack: pop #:" + num_msg_default, num_msg_default == 2);
//Verify the copy still has the correct number of messages
try {
@@ -235,8 +223,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eget_current_stack: " + err);
}
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg,
num_msg == 3);
assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg, num_msg == 3);
}
@Test(expected = IllegalArgumentException.class)
@@ -306,8 +293,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eset_current_stack: " + err);
}
assertTrue("H5.H5Eset_current_stack: get_num #:" + num_msg,
num_msg == 3);
assertTrue("H5.H5Eset_current_stack: get_num #:" + num_msg, num_msg == 3);
//Save a copy of the current stack
try {
@@ -317,10 +303,8 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eset_current_stack: " + err);
}
assertFalse("H5.H5Eset_current_stack: get_current_stack - "
+ stack_id, stack_id < 0);
assertFalse("H5.H5Eset_current_stack: get_current_stack - "
+ stack_id, stack_id == HDF5Constants.H5E_DEFAULT);
assertFalse("H5.H5Eset_current_stack: get_current_stack - " + stack_id, stack_id < 0);
assertFalse("H5.H5Eset_current_stack: get_current_stack - " + stack_id, stack_id == HDF5Constants.H5E_DEFAULT);
//Verify the copy has the correct number of messages
try {
@@ -330,8 +314,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eset_current_stack: " + err);
}
assertTrue("H5.H5Eset_current_stack: get_num #:" + num_msg,
num_msg == 3);
assertTrue("H5.H5Eset_current_stack: get_num #:" + num_msg, num_msg == 3);
//Generate errors on default stack
try {
@@ -349,8 +332,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eget_current_stack: " + err);
}
assertTrue("H5.H5Eset_current_stack: get_num #:" + num_msg,
num_msg == 3);
assertTrue("H5.H5Eset_current_stack: get_num #:" + num_msg, num_msg == 3);
//Remove one message from the current stack
try {
@@ -361,8 +343,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eset_current_stack: " + err);
}
assertTrue("H5.H5Eset_current_stack: pop #:" + num_msg,
num_msg == 2);
assertTrue("H5.H5Eset_current_stack: pop #:" + num_msg, num_msg == 2);
//Verify the copy still has the correct number of messages
try {
@@ -372,8 +353,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eset_current_stack: " + err);
}
assertTrue("H5.H5Eset_current_stack: get_num #:" + num_msg,
num_msg == 3);
assertTrue("H5.H5Eset_current_stack: get_num #:" + num_msg, num_msg == 3);
try {
H5.H5Eset_current_stack(stack_id);
@@ -383,8 +363,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eset_current_stack: " + err);
}
assertTrue("H5.H5Eset_current_stack: get_num - " + num_msg,
num_msg == 3);
assertTrue("H5.H5Eset_current_stack: get_num - " + num_msg, num_msg == 3);
}
@Test(expected = IllegalArgumentException.class)
@@ -492,8 +471,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eclear2_with_msg: " + err);
}
assertTrue("H5.H5Eclear2_with_msg before #:" + num_msg,
num_msg == 3);
assertTrue("H5.H5Eclear2_with_msg before #:" + num_msg, num_msg == 3);
try {
H5.H5Eclear2(HDF5Constants.H5E_DEFAULT);
num_msg = H5.H5Eget_num(HDF5Constants.H5E_DEFAULT);
@@ -502,7 +480,7 @@ public class TestH5Edefault {
err.printStackTrace();
fail("H5.H5Eclear2_with_msg: " + err);
}
assertTrue("H5.H5Eclear2_with_msg after #:" + num_msg, num_msg == 0);
assertTrue("H5.H5Eclear2_with_msg after #:" + num_msg, num_msg == 0);
}
@Test(expected = IllegalArgumentException.class)