Merge pull request #136 from JohnLCaron/testFixtures

Move testdata module into testFixtures in the core.

Author: JohnLCaron

.idea/gradle.xml

@@ -1,13 +1,26 @@
 # netchdf
-_last updated: 5/22/2025_
+_last updated: 5/24/2025_
 
 This is a rewrite in Kotlin of parts of the devcdm and netcdf-java libraries. 
 
 The intention is to create a maintainable, read-only, pure JVM library allowing full access to 
-netcdf3, netcdf4, hdf4, hdf5, hdf-eos2 and hdf-eos5 data files. 
+netcdf3, netcdf4, hdf4, hdf5, hdf-eos2, and hdf-eos5 data files. 
 
 Please contact me if you'd like to help out. Especially needed are test datasets from all the important data archives!!
 
+## Building
+
+* Download Java 21 JDK and set JAVA_HOME.
+* Download git and add to PATH.
+
+cd <your_build_dir>
+git clone https://github.com/JohnLCaron/netchdf.git
+cd netchdf
+./gradlew clean assemble
+
+Also see:
+  * [Building and Running ncdump](clibs/Readme.md)
+
 ### Why this library? 
 
 There is so much important scientific data stored in the NetCDF and HDF file formats, that those formats will 
@@ -87,7 +100,6 @@ Currently that is Gradle 8.14.
 For now, you must download and build the library yourself. Eventually we will publish it to Maven Central. 
 The IntelliJ IDE is highly recommended for all JVM development.
 
-
 ### Scope
 
 Our goal is to give read access to all the content in NetCDF, HDF5, HDF4, and HDF-EOS files.
@@ -128,16 +140,17 @@ only supported for test purposes.
 Currently we have ~1500 test files:
 
 ````
- hdf4      = 205 files
- hdf-eos2  = 267 files
- hdf5      = 113 files
- hdf-eos5  =  18 files
- netcdf3   = 664 files
- netcdf3.2 =  81 files
- netcdf3.5 =   1 files
- netcdf4   = 121 files
- ````
-
+hdf-eos2  = 267 files
+hdf-eos5  = 18 files
+hdf4      = 205 files
+hdf5      = 113 files
+netcdf3   = 664 files
+netcdf3.2 = 81 files
+netcdf3.5 = 1 files
+netcdf4   = 121 files
+
+total # files = 1470
+````
 We need to get representative samples of recent files for improved testing and code coverage.
 
 ### Data Model notes

Readme.md

@@ -0,0 +1,15 @@
+# Netchdf Command Line Interface
+5/24/2025
+
+## Building
+
+cd <your_build_dir>
+clone https://github.com/JohnLCaron/netchdf.git
+cd netchdf
+./gradlew clean assemble
+./gradlew :cli:uberJar
+
+## Running ncdump
+
+cd cli/build/libs
+java -jar netchdf-uber.jar --filename your_file

cli/Readme.md

@@ -0,0 +1,31 @@
+plugins {
+    alias(libs.plugins.kotlin.jvm)
+}
+
+dependencies {
+    api(project(":core"))
+
+    implementation(libs.kotlinx.cli)
+    implementation(libs.oshai.logging)
+    implementation(libs.logback.classic)
+}
+
+kotlin {
+    jvmToolchain(21)
+}
+
+tasks.register<Jar>("uberJar") {
+    archiveClassifier = "uber"
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    archiveBaseName.set("netchdf")
+
+    manifest {
+        attributes("Main-Class" to "com.sunya.netchdf.cli.ncdump")
+    }
+
+    from(sourceSets.main.get().output)
+    dependsOn(configurations.runtimeClasspath)
+    from({
+        configurations.runtimeClasspath.get().filter { it.name.endsWith("jar") }.map { zipTree(it) }
+    })
+}

cli/build.gradle.kts

@@ -1,17 +1,18 @@
 plugins {
     alias(libs.plugins.kotlin.jvm)
+    id ("java-test-fixtures")
 }
 
 dependencies {
     api(project(":core"))
-    implementation(project(":testdata"))
+    // implementation(project(":testdata"))
     implementation(libs.oshai.logging)
     implementation(libs.kotlinx.coroutines.core)
 
-    // testImplementation(libs.guava)
     testImplementation(kotlin("test"))
     testImplementation(libs.bundles.jvmtest)
     testImplementation(libs.kotest.property)
+    testImplementation(testFixtures(project(":core")))
 }
 
 kotlin {

…n/kotlin/com/sunya/netchdf/cli/ncdump.kt …n/kotlin/com/sunya/netchdf/cli/ncdump.kttestdata/src/main/kotlin/com/sunya/netchdf/cli/ncdump.kt renamed to cli/src/main/kotlin/com/sunya/netchdf/cli/ncdump.kt testdata/src/main/kotlin/com/sunya/netchdf/cli/ncdump.kt renamed to cli/src/main/kotlin/com/sunya/netchdf/cli/ncdump.kt

@@ -6,7 +6,7 @@
 
 import com.sunya.netchdf.netcdfClib.ffm.netcdf_h;
 import org.junit.jupiter.api.Test;
-import com.sunya.testdata.TestFilesKt;
+import com.sunya.netchdf.testdata.TestFilesKt;
 
 public class TestNetcdfClib {
 

clibs/build.gradle.kts

@@ -1,13 +1,13 @@
 package com.sunya.netchdf
 
 import com.sunya.cdm.util.Stats
-import com.sunya.testdata.NetchdfExtraFiles
+import com.sunya.netchdf.testdata.NetchdfExtraFiles
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.MethodSource
-import com.sunya.testdata.testData
+import com.sunya.netchdf.testdata.testData
 import org.junit.jupiter.api.AfterAll
 import java.util.stream.Stream
 

clibs/src/test/java/com/sunya/netchdf/netcdf4/TestNetcdfClib.java

@@ -8,7 +8,7 @@ import com.sunya.cdm.util.nearlyEquals
 import com.sunya.netchdf.hdf4Clib.Hdf4ClibFile
 import com.sunya.netchdf.hdf5Clib.Hdf5ClibFile
 import com.sunya.netchdf.netcdfClib.NClibFile
-import com.sunya.testdata.*
+import com.sunya.netchdf.testdata.*
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Disabled

clibs/src/test/kotlin/com/sunya/netchdf/NetchdfClibExtra.kt

@@ -5,13 +5,13 @@ import com.sunya.cdm.array.ArrayUByte
 import com.sunya.cdm.util.Stats
 import com.sunya.netchdf.*
 import com.sunya.netchdf.hdf4Clib.Hdf4ClibFile
-import com.sunya.testdata.H4Files
+import com.sunya.netchdf.testdata.H4Files
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.MethodSource
-import com.sunya.testdata.testData
+import com.sunya.netchdf.testdata.testData
 import org.junit.jupiter.api.Assertions
 import java.util.*
 import java.util.stream.Stream