From 0eb314999d2d9c814c212d10d5f31b03b2dc7c1a Mon Sep 17 00:00:00 2001 From: unknown <> Date: Fri, 15 Mar 2024 21:11:47 -0400 Subject: [PATCH] test fix --- src/main/java/electrosphere/Main.java | 27 +++++++++++++++++++++++++-- src/test/java/LongRunTests.java | 7 ++++++- src/test/java/MediumRunTests.java | 25 +++++++++++++++++++++---- src/test/java/ShortRunTest.java | 25 +++++++++++++++++++++---- 4 files changed, 73 insertions(+), 11 deletions(-) diff --git a/src/main/java/electrosphere/Main.java b/src/main/java/electrosphere/Main.java index 3d28de6..6032ccf 100644 --- a/src/main/java/electrosphere/Main.java +++ b/src/main/java/electrosphere/Main.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; +import java.nio.ByteOrder; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -28,8 +29,8 @@ public class Main { public static void main(String args[]){ - int dim = 5; - int vdim = 5; + int dim = 1; + int vdim = 1; int i = 0; long time = 0; long lastTime = 0; @@ -52,6 +53,28 @@ public class Main { meshArray = initMeshes(dim,vdim,dim,simArray); } + FluidSim.simChunks(simArray, i, TIMESTEP); + + //src\test\resources\testdata\1by1\1steps\chunk_0_0_0_1by1Chunk1Step.data + InputStream testFileIS = Files.newInputStream(new File("./src/test/resources/testdata/1by1/1steps/chunk_0_0_0_1by1Chunk1Step.data").toPath());; + byte[] bytes; + try { + bytes = testFileIS.readAllBytes(); + ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4); + fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN); + fromDiskBuffer.put(bytes); + fromDiskBuffer.flip(); + ByteBuffer densityBytes = simArray[0][0][0].getDensityBuffer(); + while(densityBytes.hasRemaining()){ + boolean pass = fromDiskBuffer.get() == densityBytes.get(); + assert(pass); + i++; + } + } catch (IOException e) { + e.printStackTrace(); + assert(false); + } + //uncomment this to generate test data // generateTestData(); diff --git a/src/test/java/LongRunTests.java b/src/test/java/LongRunTests.java index 87b6866..c6b6edd 100644 --- a/src/test/java/LongRunTests.java +++ b/src/test/java/LongRunTests.java @@ -1,6 +1,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; +import java.nio.ByteOrder; import org.junit.Test; @@ -32,10 +33,14 @@ public class LongRunTests { byte[] bytes; try { bytes = testFileIS.readAllBytes(); + ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4); + fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN); + fromDiskBuffer.put(bytes); + fromDiskBuffer.flip(); ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); int i = 0; while(densityBytes.hasRemaining()){ - boolean pass = bytes[i] == densityBytes.get(); + boolean pass = fromDiskBuffer.get() == densityBytes.get(); assert(pass); i++; } diff --git a/src/test/java/MediumRunTests.java b/src/test/java/MediumRunTests.java index 0060819..2b0f14e 100644 --- a/src/test/java/MediumRunTests.java +++ b/src/test/java/MediumRunTests.java @@ -1,6 +1,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; +import java.nio.ByteOrder; import org.junit.Test; @@ -32,10 +33,14 @@ public class MediumRunTests { byte[] bytes; try { bytes = testFileIS.readAllBytes(); + ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4); + fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN); + fromDiskBuffer.put(bytes); + fromDiskBuffer.flip(); ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); int i = 0; while(densityBytes.hasRemaining()){ - boolean pass = bytes[i] == densityBytes.get(); + boolean pass = fromDiskBuffer.get() == densityBytes.get(); assert(pass); i++; } @@ -74,10 +79,14 @@ public class MediumRunTests { byte[] bytes; try { bytes = testFileIS.readAllBytes(); + ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4); + fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN); + fromDiskBuffer.put(bytes); + fromDiskBuffer.flip(); ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); int i = 0; while(densityBytes.hasRemaining()){ - boolean pass = bytes[i] == densityBytes.get(); + boolean pass = fromDiskBuffer.get() == densityBytes.get(); assert(pass); i++; } @@ -116,10 +125,14 @@ public class MediumRunTests { byte[] bytes; try { bytes = testFileIS.readAllBytes(); + ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4); + fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN); + fromDiskBuffer.put(bytes); + fromDiskBuffer.flip(); ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); int i = 0; while(densityBytes.hasRemaining()){ - boolean pass = bytes[i] == densityBytes.get(); + boolean pass = fromDiskBuffer.get() == densityBytes.get(); assert(pass); i++; } @@ -158,10 +171,14 @@ public class MediumRunTests { byte[] bytes; try { bytes = testFileIS.readAllBytes(); + ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4); + fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN); + fromDiskBuffer.put(bytes); + fromDiskBuffer.flip(); ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); int i = 0; while(densityBytes.hasRemaining()){ - boolean pass = bytes[i] == densityBytes.get(); + boolean pass = fromDiskBuffer.get() == densityBytes.get(); assert(pass); i++; } diff --git a/src/test/java/ShortRunTest.java b/src/test/java/ShortRunTest.java index 110058f..26146b0 100644 --- a/src/test/java/ShortRunTest.java +++ b/src/test/java/ShortRunTest.java @@ -3,6 +3,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; +import java.nio.ByteOrder; import org.junit.Test; @@ -37,10 +38,14 @@ public class ShortRunTest { byte[] bytes; try { bytes = testFileIS.readAllBytes(); + ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4); + fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN); + fromDiskBuffer.put(bytes); + fromDiskBuffer.flip(); ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); int i = 0; while(densityBytes.hasRemaining()){ - boolean pass = bytes[i] == densityBytes.get(); + boolean pass = fromDiskBuffer.get() == densityBytes.get(); assert(pass); i++; } @@ -79,10 +84,14 @@ public class ShortRunTest { byte[] bytes; try { bytes = testFileIS.readAllBytes(); + ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4); + fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN); + fromDiskBuffer.put(bytes); + fromDiskBuffer.flip(); ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); int i = 0; while(densityBytes.hasRemaining()){ - boolean pass = bytes[i] == densityBytes.get(); + boolean pass = fromDiskBuffer.get() == densityBytes.get(); assert(pass); i++; } @@ -121,10 +130,14 @@ public class ShortRunTest { byte[] bytes; try { bytes = testFileIS.readAllBytes(); + ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4); + fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN); + fromDiskBuffer.put(bytes); + fromDiskBuffer.flip(); ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); int i = 0; while(densityBytes.hasRemaining()){ - boolean pass = bytes[i] == densityBytes.get(); + boolean pass = fromDiskBuffer.get() == densityBytes.get(); assert(pass); i++; } @@ -163,10 +176,14 @@ public class ShortRunTest { byte[] bytes; try { bytes = testFileIS.readAllBytes(); + ByteBuffer fromDiskBuffer = ByteBuffer.allocate(FluidSim.DIM * FluidSim.DIM * FluidSim.DIM * 4); + fromDiskBuffer.order(ByteOrder.LITTLE_ENDIAN); + fromDiskBuffer.put(bytes); + fromDiskBuffer.flip(); ByteBuffer densityBytes = simArray[x][y][z].getDensityBuffer(); int i = 0; while(densityBytes.hasRemaining()){ - boolean pass = bytes[i] == densityBytes.get(); + boolean pass = fromDiskBuffer.get() == densityBytes.get(); assert(pass); i++; }