Skip to content

Commit

Permalink
Fixed contributor list.
Browse files Browse the repository at this point in the history
Eric was listed as the author but not in contributor list. Fixed that.

Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>
  • Loading branch information
Jay Jay Billings committed Dec 9, 2015
1 parent cf37361 commit d7cb538
Show file tree
Hide file tree
Showing 14 changed files with 393 additions and 354 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*
* Contributors:
* Initial API and implementation and/or initial documentation - Jay Jay Billings,
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
* Jordan H. Deyton, Dasha Gorin, Eric J. Lingerfelt, Alexander J. McCaskey,
* Taylor Patterson, Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
package org.eclipse.ice.client.widgets.reactoreditor.test;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*
* Contributors:
* Initial API and implementation and/or initial documentation - Jay Jay Billings,
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
* Jordan H. Deyton, Dasha Gorin, Eric J. Lingerfelt, Alexander J. McCaskey,
* Taylor Patterson, Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
package org.eclipse.ice.io.hdf.test;

Expand All @@ -20,17 +20,17 @@

import java.io.File;

import ncsa.hdf.object.h5.H5File;
import ncsa.hdf.object.h5.H5Group;

import org.eclipse.ice.io.hdf.HdfFileFactory;
import org.junit.Test;

import ncsa.hdf.object.h5.H5File;
import ncsa.hdf.object.h5.H5Group;

/**
* <p>
* This class tests the HdfFileFactory class.
* </p>
*
*
* @author Eric J. Lingerfelt
*/
public class HdfFileFactoryTester {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*
* Contributors:
* Initial API and implementation and/or initial documentation - Jay Jay Billings,
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
* Jordan H. Deyton, Dasha Gorin, Eric J. Lingerfelt, Alexander J. McCaskey,
* Taylor Patterson, Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
package org.eclipse.ice.io.hdf.test;

Expand All @@ -23,6 +23,12 @@
import java.net.URI;
import java.util.ArrayList;

import org.eclipse.ice.io.hdf.HdfFileFactory;
import org.eclipse.ice.io.hdf.HdfReaderFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
import ncsa.hdf.object.Attribute;
import ncsa.hdf.object.Dataset;
Expand All @@ -32,15 +38,9 @@
import ncsa.hdf.object.h5.H5File;
import ncsa.hdf.object.h5.H5Group;

import org.eclipse.ice.io.hdf.HdfFileFactory;
import org.eclipse.ice.io.hdf.HdfReaderFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

/**
* This class tests the HdfReaderFactory class.
*
*
* @author Eric J. Lingerfelt
*/
public class HdfReaderFactoryTester {
Expand Down Expand Up @@ -252,7 +252,8 @@ public void checkGetters() {

// Try to grab the group as a dataset - should throw a class cast
// exception
assertNull(HdfReaderFactory.getDataset(parentH5Group, subGroupName));
assertNull(
HdfReaderFactory.getDataset(parentH5Group, subGroupName));

// Try to grab the dataset as a group - should throw a class cast
// exception
Expand Down Expand Up @@ -302,25 +303,26 @@ public void checkReaders() {
// Check nullary and invalid values for Integer read
assertNull(HdfReaderFactory.readIntegerAttribute(parentH5Group,
integerName));
assertNull(HdfReaderFactory.readIntegerAttribute(null, integerName));
assertNull(HdfReaderFactory.readIntegerAttribute(parentH5Group,
null));
assertNull(
HdfReaderFactory.readIntegerAttribute(null, integerName));
assertNull(
HdfReaderFactory.readIntegerAttribute(parentH5Group, null));
assertNull(HdfReaderFactory.readIntegerAttribute(null, null));

// Check nullary and invalid values for Double read
assertNull(HdfReaderFactory.readDoubleAttribute(parentH5Group,
doubleName));
assertNull(HdfReaderFactory.readDoubleAttribute(null, doubleName));
assertNull(HdfReaderFactory
.readDoubleAttribute(parentH5Group, null));
assertNull(
HdfReaderFactory.readDoubleAttribute(parentH5Group, null));
assertNull(HdfReaderFactory.readDoubleAttribute(null, null));

// Check nullary and invalid values for String read
assertNull(HdfReaderFactory.readStringAttribute(parentH5Group,
stringName));
assertNull(HdfReaderFactory.readStringAttribute(null, stringName));
assertNull(HdfReaderFactory
.readStringAttribute(parentH5Group, null));
assertNull(
HdfReaderFactory.readStringAttribute(parentH5Group, null));
assertNull(HdfReaderFactory.readStringAttribute(null, null));

// Add a Integer, a Double, and a String to the parentGroup
Expand Down Expand Up @@ -385,26 +387,27 @@ public void checkReaders() {
.getRootNode()).getUserObject();

// Now, time to read those values!
assertEquals(
intValue,
HdfReaderFactory.readIntegerAttribute(parentH5Group,
integerName).intValue());
assertEquals(
doubleValue,
HdfReaderFactory.readDoubleAttribute(parentH5Group,
doubleName).doubleValue(), 0.0);
assertEquals(stringValue, HdfReaderFactory.readStringAttribute(
parentH5Group, stringName));
assertEquals(intValue,
HdfReaderFactory
.readIntegerAttribute(parentH5Group, integerName)
.intValue());
assertEquals(doubleValue,
HdfReaderFactory
.readDoubleAttribute(parentH5Group, doubleName)
.doubleValue(),
0.0);
assertEquals(stringValue, HdfReaderFactory
.readStringAttribute(parentH5Group, stringName));

// Checking for child groups.
assertNotNull(HdfReaderFactory.getChildH5Groups(parentH5Group));
assertEquals(0, HdfReaderFactory.getChildH5Groups(parentH5Group)
.size());
assertEquals(0,
HdfReaderFactory.getChildH5Groups(parentH5Group).size());

// Check for child objects.
assertNotNull(HdfReaderFactory.getChildH5Members(parentH5Group));
assertEquals(0, HdfReaderFactory.getChildH5Members(parentH5Group)
.size());
assertEquals(0,
HdfReaderFactory.getChildH5Members(parentH5Group).size());

// Lets add something to the group
H5Group h5Group = (H5Group) h5File.createGroup(childGroupName,
Expand Down Expand Up @@ -436,23 +439,20 @@ public void checkReaders() {

// Check for children now. There should only be one child group.
assertNotNull(HdfReaderFactory.getChildH5Groups(parentH5Group));
assertEquals(1, HdfReaderFactory.getChildH5Groups(parentH5Group)
.size());
assertEquals(childGroupName,
HdfReaderFactory.getChildH5Groups(parentH5Group).get(0)
.getName());
assertEquals(1,
HdfReaderFactory.getChildH5Groups(parentH5Group).size());
assertEquals(childGroupName, HdfReaderFactory
.getChildH5Groups(parentH5Group).get(0).getName());

// Check for child objects. There should be two (a group and a
// dataset).
assertNotNull(HdfReaderFactory.getChildH5Members(parentH5Group));
assertEquals(2, HdfReaderFactory.getChildH5Members(parentH5Group)
.size());
assertEquals(childGroupName,
HdfReaderFactory.getChildH5Members(parentH5Group).get(1)
.getName());
assertEquals(datasetName,
HdfReaderFactory.getChildH5Members(parentH5Group).get(0)
.getName());
assertEquals(2,
HdfReaderFactory.getChildH5Members(parentH5Group).size());
assertEquals(childGroupName, HdfReaderFactory
.getChildH5Members(parentH5Group).get(1).getName());
assertEquals(datasetName, HdfReaderFactory
.getChildH5Members(parentH5Group).get(0).getName());

} catch (Exception e) {
// Fail out of the test, not supposed to happen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*
* Contributors:
* Initial API and implementation and/or initial documentation - Jay Jay Billings,
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
* Jordan H. Deyton, Dasha Gorin, Eric J. Lingerfelt, Alexander J. McCaskey,
* Taylor Patterson, Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
package org.eclipse.ice.io.hdf.test;

Expand All @@ -22,6 +22,12 @@
import java.io.File;
import java.net.URI;

import org.eclipse.ice.io.hdf.HdfFileFactory;
import org.eclipse.ice.io.hdf.HdfWriterFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
import ncsa.hdf.object.Attribute;
import ncsa.hdf.object.Dataset;
Expand All @@ -31,15 +37,9 @@
import ncsa.hdf.object.h5.H5File;
import ncsa.hdf.object.h5.H5Group;

import org.eclipse.ice.io.hdf.HdfFileFactory;
import org.eclipse.ice.io.hdf.HdfWriterFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

/**
* This class tests the HdfWriterFactory class.
*
*
* @author Eric J. Lingerfelt
*/
public class HdfWriterFactoryTester {
Expand Down Expand Up @@ -235,20 +235,20 @@ public void checkWriters() {
.getRootNode()).getUserObject();

// Create a good Reactor group
H5Group reactorGroup = HdfWriterFactory.createH5Group(h5File,
"Reactor", rootH5Group);
H5Group reactorGroup = HdfWriterFactory.createH5Group(h5File, "Reactor",
rootH5Group);
assertNotNull(reactorGroup);

// Write some double attributes with bad arguments
flag = HdfWriterFactory.writeDoubleAttribute(null, null, null, number);
assertFalse(flag);

flag = HdfWriterFactory
.writeDoubleAttribute(h5File, null, null, number);
flag = HdfWriterFactory.writeDoubleAttribute(h5File, null, null,
number);
assertFalse(flag);

flag = HdfWriterFactory.writeDoubleAttribute(h5File, reactorGroup,
null, number);
flag = HdfWriterFactory.writeDoubleAttribute(h5File, reactorGroup, null,
number);
assertFalse(flag);

// Write a double attribute with good arguments
Expand Down Expand Up @@ -315,8 +315,8 @@ public void checkWriters() {
flag = HdfWriterFactory.writeStringAttribute(h5File, null, null, null);
assertFalse(flag);

flag = HdfWriterFactory.writeStringAttribute(h5File, reactorGroup,
null, null);
flag = HdfWriterFactory.writeStringAttribute(h5File, reactorGroup, null,
null);
assertFalse(flag);

flag = HdfWriterFactory.writeStringAttribute(h5File, reactorGroup, "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@
*
* Contributors:
* Initial API and implementation and/or initial documentation - Jay Jay Billings,
* Jordan H. Deyton, Dasha Gorin, Alexander J. McCaskey, Taylor Patterson,
* Claire Saunders, Matthew Wang, Anna Wojtowicz
* Jordan H. Deyton, Dasha Gorin, Eric J. Lingerfelt, Alexander J. McCaskey,
* Taylor Patterson, Claire Saunders, Matthew Wang, Anna Wojtowicz
*******************************************************************************/
package org.eclipse.ice.io.hdf;

import java.io.File;
import java.net.URI;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import ncsa.hdf.hdf5lib.exceptions.HDF5Exception;
import ncsa.hdf.object.FileFormat;
import ncsa.hdf.object.h5.H5File;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* <p>
* The HDFFileFactory class contains static methods used to create, open, and
Expand Down Expand Up @@ -49,7 +49,8 @@ public class HdfFileFactory {
* <p>
* The URI of the H5File to create and open.
* </p>
* @return <p>
* @return
* <p>
* An H5File that has been created and opened for read/write
* operations.
* </p>
Expand Down Expand Up @@ -145,7 +146,8 @@ public static void closeH5File(H5File h5File) {
* <p>
* The URI of the H5File to open.
* </p>
* @return <p>
* @return
* <p>
* An H5File that has been opened for read/write operations.
* </p>
*/
Expand Down
Loading

0 comments on commit d7cb538

Please sign in to comment.