[Netcdftools-commit] SF.net SVN: netcdftools:[30] trunk/src/test/java/au/csiro/netcdf/ TestNcDefineAttributes.java

[<rit...@us...>]

Revision: 30
          http://netcdftools.svn.sourceforge.net/netcdftools/?rev=30&view=rev
Author:   ritacsiro
Date:     2010-06-24 01:17:12 +0000 (Thu, 24 Jun 2010)

Log Message:
-----------
ANDSWRON-682 - updated code based on review comment.

Modified Paths:
--------------
    trunk/src/test/java/au/csiro/netcdf/TestNcDefineAttributes.java

Modified: trunk/src/test/java/au/csiro/netcdf/TestNcDefineAttributes.java
===================================================================
--- trunk/src/test/java/au/csiro/netcdf/TestNcDefineAttributes.java	2010-06-24 00:29:08 UTC (rev 29)
+++ trunk/src/test/java/au/csiro/netcdf/TestNcDefineAttributes.java	2010-06-24 01:17:12 UTC (rev 30)
@@ -628,35 +628,46 @@
                 "-" + OUTPUT_FILE, NC_FILE_NAME,
                 "-" + ATTRIBUTES, ATTR3_NAME + "=" + ATTR3_DATA,
                 "-t", "float"};
+        NetcdfFile netcdfFile = null;
+        File ncFile = null;
 
-        File ncFile = new File(NC_FILE_NAME);
-        if (ncFile.exists())
+        try
         {
-            ncFile.delete();
+            ncFile = new File(NC_FILE_NAME);
+            if (ncFile.exists())
+            {
+                ncFile.delete();
+            }
+    
+            ncDefineAttr.execute(args);
+            assertTrue("The nc file was not created: " + NC_FILE_NAME, ncFile.exists());
+    
+            netcdfFile = NetcdfFile.open(NC_FILE_NAME);
+            Attribute attr = netcdfFile.findGlobalAttribute(ATTR3_NAME);
+            assertTrue("The Attribute was not defined: " + ATTR3_NAME, (attr != null));
+            assertEquals("The Attrbute " + ATTR3_NAME + " had a string value. ",
+                    null, attr.getStringValue());
+            assertEquals("The Attrbute had the wrong data: " + ATTR3_NAME,
+                    Float.parseFloat(ATTR3_DATA), (Float)attr.getNumericValue(), 0.01f);
+            
+            netcdfFile.close();
+            
+            // now delete the attribute
+            args[4] = ATTR3_NAME+"="+"null";
+            ncDefineAttr.execute(args);  
+            netcdfFile = NetcdfFile.open(NC_FILE_NAME);
+            
+            attr = netcdfFile.findGlobalAttribute(ATTR3_NAME);
+            assertTrue("The Attribute was not deleted: " + ATTR3_NAME, (attr == null));
         }
-
-        ncDefineAttr.execute(args);
-        assertTrue("The nc file was not created: " + NC_FILE_NAME, ncFile.exists());
-
-        NetcdfFile netcdfFile = NetcdfFile.open(NC_FILE_NAME);
-        Attribute attr = netcdfFile.findGlobalAttribute(ATTR3_NAME);
-        assertTrue("The Attribute was not defined: " + ATTR3_NAME, (attr != null));
-        assertEquals("The Attrbute " + ATTR3_NAME + " had a string value. ",
-                null, attr.getStringValue());
-        assertEquals("The Attrbute had the wrong data: " + ATTR3_NAME,
-                Float.parseFloat(ATTR3_DATA), (Float)attr.getNumericValue(), 0.01f);
-        
-        netcdfFile.close();
-        
-        // now delete the attribute
-        args[4] = ATTR3_NAME+"="+"null";
-        ncDefineAttr.execute(args);  
-        netcdfFile = NetcdfFile.open(NC_FILE_NAME);
-        
-        attr = netcdfFile.findGlobalAttribute(ATTR3_NAME);
-        assertTrue("The Attribute was not deleted: " + ATTR3_NAME, (attr == null));
-        netcdfFile.close();
-        ncFile.delete();
+        finally
+        {
+            if(netcdfFile != null && ncFile != null)
+            {
+                netcdfFile.close();
+                ncFile.delete();
+            }
+        }
     }
     
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.