Merge pull request #1015 in HDFFV/hdf5 from ~BYRN/hdf5_adb:merge_func_enter_vol to merge_func_enter_vol

* commit '8c9661ce4d42090fb12c26bedc01af9ecc10b8e2':
  Update java error stack tests

1 files changed, 16 insertions, 16 deletions

diff --git a/java/test/TestH5Edefault.java b/java/test/TestH5Edefault.java
index 835ccba..79f75c8 100644
--- a/java/test/TestH5Edefault.java
+++ b/java/test/TestH5Edefault.java
@@ -92,7 +92,7 @@ public class TestH5Edefault {
             fail("H5.H5Eget_current_stack: " + err);
         }
         assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg_default,
-                num_msg_default == 3);
+                num_msg_default == 4);
 
         //Save a copy of the current stack and clears the current stack
         try {
@@ -127,7 +127,7 @@ public class TestH5Edefault {
             fail("H5.H5Eget_current_stack: " + err);
         }
         assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg,
-                num_msg == 3);
+                num_msg == 4);
 
         try {
             H5.H5Eclose_stack(stack_id);
@@ -159,7 +159,7 @@ public class TestH5Edefault {
             fail("H5.H5Eget_current_stack: " + err);
         }
         assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg_default,
-                num_msg_default == 3);
+                num_msg_default == 4);
 
         //Save a copy of the current stack and clears the current stack
         try {
@@ -194,7 +194,7 @@ public class TestH5Edefault {
             fail("H5.H5Eget_current_stack: " + err);
         }
         assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg,
-                num_msg == 3);
+                num_msg == 4);
 
         //Generate errors on default stack
         try {
@@ -213,7 +213,7 @@ public class TestH5Edefault {
             fail("H5.H5Eget_current_stack: " + err);
         }
         assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg_default,
-                num_msg_default == 3);
+                num_msg_default == 4);
 
         //Remove one message from the current stack
         try {
@@ -225,7 +225,7 @@ public class TestH5Edefault {
             fail("H5.H5Eget_current_stack: " + err);
         }
         assertTrue("H5.H5Eget_current_stack: pop #:" + num_msg_default,
-                num_msg_default == 2);
+                num_msg_default == 3);
 
         //Verify the copy still has the correct number of messages
         try {
@@ -236,7 +236,7 @@ public class TestH5Edefault {
             fail("H5.H5Eget_current_stack: " + err);
         }
         assertTrue("H5.H5Eget_current_stack: get_num #:" + num_msg,
-                num_msg == 3);
+                num_msg == 4);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -307,7 +307,7 @@ public class TestH5Edefault {
             fail("H5.H5Eset_current_stack: " + err);
         }
         assertTrue("H5.H5Eset_current_stack: get_num #:" + num_msg,
-                    num_msg == 3);
+                    num_msg == 4);
 
         //Save a copy of the current stack
         try {
@@ -331,7 +331,7 @@ public class TestH5Edefault {
             fail("H5.H5Eset_current_stack: " + err);
         }
         assertTrue("H5.H5Eset_current_stack: get_num #:" + num_msg,
-                    num_msg == 3);
+                    num_msg == 4);
 
         //Generate errors on default stack
         try {
@@ -350,7 +350,7 @@ public class TestH5Edefault {
             fail("H5.H5Eget_current_stack: " + err);
         }
         assertTrue("H5.H5Eset_current_stack: get_num #:" + num_msg,
-                num_msg == 3);
+                num_msg == 4);
 
         //Remove one message from the current stack
         try {
@@ -362,7 +362,7 @@ public class TestH5Edefault {
             fail("H5.H5Eset_current_stack: " + err);
         }
         assertTrue("H5.H5Eset_current_stack: pop #:" + num_msg,
-                    num_msg == 2);
+                    num_msg == 3);
 
         //Verify the copy still has the correct number of messages
         try {
@@ -373,7 +373,7 @@ public class TestH5Edefault {
             fail("H5.H5Eset_current_stack: " + err);
         }
         assertTrue("H5.H5Eset_current_stack: get_num #:" + num_msg,
-                    num_msg == 3);
+                    num_msg == 4);
 
         try {
             H5.H5Eset_current_stack(stack_id);
@@ -384,7 +384,7 @@ public class TestH5Edefault {
             fail("H5.H5Eset_current_stack: " + err);
         }
         assertTrue("H5.H5Eset_current_stack: get_num - " + num_msg,
-                    num_msg == 3);
+                    num_msg == 4);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -407,7 +407,7 @@ public class TestH5Edefault {
             err.printStackTrace();
             fail("H5.H5Epop: " + err);
         }
-        assertTrue("H5.H5Epop before #:" + num_msg, num_msg == 3);
+        assertTrue("H5.H5Epop before #:" + num_msg, num_msg == 4);
         try {
             H5.H5Epop(HDF5Constants.H5E_DEFAULT, 1);
             num_msg = H5.H5Eget_num(HDF5Constants.H5E_DEFAULT);
@@ -416,7 +416,7 @@ public class TestH5Edefault {
             err.printStackTrace();
             fail("H5.H5Epop: " + err);
         }
-        assertTrue("H5.H5Epop after #:" + num_msg, num_msg == 2);
+        assertTrue("H5.H5Epop after #:" + num_msg, num_msg == 3);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -493,7 +493,7 @@ public class TestH5Edefault {
             fail("H5.H5Eclear2_with_msg: " + err);
         }
         assertTrue("H5.H5Eclear2_with_msg before #:" + num_msg,
-                    num_msg == 3);
+                    num_msg == 4);
         try {
             H5.H5Eclear2(HDF5Constants.H5E_DEFAULT);
             num_msg = H5.H5Eget_num(HDF5Constants.H5E_DEFAULT);