Merge branch 'main' into btreemap

ARK-Builders · Jun 23, 2024 · fad8459 · fad8459
2 parents 4ad99c7 + 8d12782
commit fad8459
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/fs-storage/Makefile b/fs-storage/Makefile
@@ -22,7 +22,6 @@ else
 	@exit 1
 endif
 
-
 .PHONY: test-linux
 test-linux: build-rust download-test-lib java-test-linux
 

diff --git a/fs-storage/README.md b/fs-storage/README.md
@@ -56,4 +56,5 @@ LD_LIBRARY_PATH=../../target/debug && java FileStorage.java
 ## Steps to test Java Wrapper
 ```bash
 make test
-``` 
+``` 
+
diff --git a/fs-storage/tests/.gitignore b/fs-storage/tests/.gitignore
@@ -1,2 +1,2 @@
 *.jar
-*.h
+*.h
diff --git a/fs-storage/tests/FileStorage.java b/fs-storage/tests/FileStorage.java
@@ -66,7 +66,7 @@ public void erase() {
     public void merge(FileStorage other) {
         merge(this.fileStoragePtr, other.fileStoragePtr);
     }
-
+  
     public FileStorageIterator iterator() {
         long iteratorPtr = createIterator(this.fileStoragePtr);
         return new FileStorageIterator(iteratorPtr);

diff --git a/fs-storage/tests/FileStorageTest.java b/fs-storage/tests/FileStorageTest.java
@@ -113,7 +113,6 @@ public void testFileStorageMainScenario() {
         assertFalse(file.exists());
     }
 
-    // NOT WORKING
     @Test
     public void testReadData() {
         Path storagePath = tempDir.resolve("test.txt");
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,6 @@ else @@
     	@exit 1
     endif
     .PHONY: test-linux
     test-linux: build-rust download-test-lib java-test-linux
@@ Expand Down @@