diff --git a/.gitignore b/.gitignore index d41e1ca6b..c00f2d037 100644 --- a/.gitignore +++ b/.gitignore @@ -2,13 +2,14 @@ .* # ignore all files/dirs beginning with _ _* -# EventViewer Jar -JEventViewer*.jar # except these two !.gitignore !.github/ +# EventViewer Jar +JEventViewer*.jar + # ignore any .evio, .ev, or .hipo extension files (+ other common file types) *.evio* *.ev @@ -17,6 +18,8 @@ JEventViewer*.jar *.txt *.out.* perf.data* +# Unless in test directory +!etc/test_files/* # test programs to ignore src/main/java/org/jlab/coda/jevio/dev/* diff --git a/etc/test_files/BigOut2.ev b/etc/test_files/BigOut2.ev new file mode 100644 index 000000000..f34656c26 Binary files /dev/null and b/etc/test_files/BigOut2.ev differ diff --git a/etc/test_files/compactEvioBuild.V4.ev b/etc/test_files/compactEvioBuild.V4.ev new file mode 100644 index 000000000..0f0be138d Binary files /dev/null and b/etc/test_files/compactEvioBuild.V4.ev differ diff --git a/etc/test_files/compactEvioBuild.ev b/etc/test_files/compactEvioBuild.ev new file mode 100644 index 000000000..a73c69fea Binary files /dev/null and b/etc/test_files/compactEvioBuild.ev differ diff --git a/etc/test_files/compactEvioBuild.ev.lz4 b/etc/test_files/compactEvioBuild.ev.lz4 new file mode 100644 index 000000000..fbe0ac21a Binary files /dev/null and b/etc/test_files/compactEvioBuild.ev.lz4 differ diff --git a/etc/test_files/eviodict.xml b/etc/test_files/eviodict.xml new file mode 100644 index 000000000..5989b5a3a --- /dev/null +++ b/etc/test_files/eviodict.xml @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/etc/test_files/fileTest.ev b/etc/test_files/fileTest.ev new file mode 100644 index 000000000..c41c111eb Binary files /dev/null and b/etc/test_files/fileTest.ev differ diff --git a/etc/test_files/fileTestDict.dict b/etc/test_files/fileTestDict.dict new file mode 100644 index 000000000..525824a1e --- /dev/null +++ b/etc/test_files/fileTestDict.dict @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/etc/test_files/fileTestND.ev b/etc/test_files/fileTestND.ev new file mode 100644 index 000000000..4c6867aec Binary files /dev/null and b/etc/test_files/fileTestND.ev differ diff --git a/etc/test_files/testEventsV6_javaAPI.evio b/etc/test_files/testEventsV6_javaAPI.evio new file mode 100644 index 000000000..fb2ce47d4 Binary files /dev/null and b/etc/test_files/testEventsV6_javaAPI.evio differ diff --git a/pom.xml b/pom.xml index dc609d951..4f8d9e6ce 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.jlab.coda jevio - 6.1.0 + 6.1.2 Jefferson Lab EVIO Java Library (JEVIO) Java library for EVIO (Event Input/Output) jar diff --git a/src/test/cpp/EvioTestHelper.h b/src/test/cpp/EvioTestHelper.h index 2c788b9dc..347938eae 100644 --- a/src/test/cpp/EvioTestHelper.h +++ b/src/test/cpp/EvioTestHelper.h @@ -125,7 +125,7 @@ using namespace evio; std::string baseNameV4 = "testEventsV4_cppAPI.evio"; // base name of file to be created. If split > 1, this is the base name of all files created. If split < 1, this is the name of the only file created. std::string baseNameV6 = "testEventsV6_cppAPI.evio"; // base name of file to be created. If split > 1, this is the base name of all files created. If split < 1, this is the name of the only file created. std::string baseNameHIPO = "testEventsHIPO_cppAPI.hipo"; // base name of file to be created. If split > 1, this is the base name of all files created. If split < 1, this is the name of the only file created. - std::string directory = "./"; // directory in which file is to be placed + std::string directory = "etc/test_files"; // directory in which file is to be placed private: diff --git a/src/test/java/EvioTestHelper.java b/src/test/java/EvioTestHelper.java index 26dde7a5b..6f1c5e7f3 100644 --- a/src/test/java/EvioTestHelper.java +++ b/src/test/java/EvioTestHelper.java @@ -13,7 +13,7 @@ public class EvioTestHelper { public static String baseNameV4 = "testEventsV4_javaAPI.evio"; // base name of file to be created. If split > 1, this is the base name of all files created. If split < 1, this is the name of the only file created. public static String baseNameV6 = "testEventsV6_javaAPI.evio"; // base name of file to be created. If split > 1, this is the base name of all files created. If split < 1, this is the name of the only file created. public static String baseNameHIPO = "testEventsHIPO_javaAPI.hipo"; // base name of file to be created. If split > 1, this is the base name of all files created. If split < 1, this is the name of the only file created. - public static String directory = "tmp"; // "/mnt/tmpfs" or null=relative path (or directory in which file is to be placed) + public static String directory = "etc/test_files"; // "/mnt/tmpfs" or null=relative path (or directory in which file is to be placed) final static String runType = ""; // name of run type configuration to be used in naming files private final static int runNumber = 1; // arbitrary, usually experiment-specific private final static long split = 0; // if < 1, do not split file, write to only one file of unlimited size. Else this is max size in bytes to make a file before closing it and starting writing another.