--- a/main/netcdf/inst/test_netcdf.m	Mon Jul 29 19:03:05 2013 +0000
+++ b/main/netcdf/inst/test_netcdf.m	Mon Jul 29 19:21:36 2013 +0000
@@ -1,7 +1,12 @@
+function test_netcdf()
+
 import_netcdf
 
+test_netcdf_constant
+
 libver = netcdf.inqLibVers();
 
+
 fname = [tempname '-octave-netcdf.nc'];
 
 ncid = netcdf.create(fname,'NC_CLOBBER');
@@ -10,24 +15,7 @@
 unlimdimIDs = netcdf.inqUnlimDims(ncid);
 assert(isempty(unlimdimIDs));
 
-names = netcdf.getConstantNames();
-assert(any(strcmp(names,'NC_WRITE')));
 
-assert(netcdf.getConstant('NC_NOWRITE') == 0)
-assert(netcdf.getConstant('NC_WRITE') == 1)
-
-assert(netcdf.getConstant('NC_64BIT_OFFSET') == ...
-       netcdf.getConstant('64BIT_OFFSET'))
-
-assert(netcdf.getConstant('NC_64BIT_OFFSET') == ...
-       netcdf.getConstant('64bit_offset'))
-
-assert(isa(netcdf.getConstant('fill_byte'),'int8'))
-assert(isa(netcdf.getConstant('fill_ubyte'),'uint8'))
-assert(isa(netcdf.getConstant('fill_float'),'single'))
-
-
-netcdf.getConstantNames();
 
 n = 10;
 m = 5;