Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#1878] Updating SystemTestUtil::assertJson to compare Json objects instead of line-by-line analysis #2087

Merged
merged 3 commits into from
Feb 6, 2024
Merged

[#1878] Updating SystemTestUtil::assertJson to compare Json objects instead of line-by-line analysis #2087

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94d215e
Implement JSON object checks
georgetayqy Jan 21, 2024
f98c571
Fix checkstyle mistakes
georgetayqy Jan 21, 2024
55d3e1f
Merge branch 'master' into enhancement-compare-json-objects
gok99 Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/systemtest/java/reposense/util/SystemTestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import org.junit.jupiter.api.Assertions;

import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;

Expand Down Expand Up @@ -63,10 +64,16 @@ public static void assertSummaryJson(Path expectedSummaryJsonPath, Path actualSu
*/
public static void assertJson(Path expectedJsonPath, Path actualJsonPath) {
Assertions.assertTrue(Files.exists(actualJsonPath));
try {
Assertions.assertTrue(TestUtil.compareFileContents(expectedJsonPath, actualJsonPath));
} catch (Exception e) {
Assertions.fail(e.getMessage());

try (FileReader fileReaderExpected = new FileReader(expectedJsonPath.toFile());
FileReader fileReaderActual = new FileReader(actualJsonPath.toFile())) {

JsonElement jsonExpected = JsonParser.parseReader(fileReaderExpected);
JsonElement jsonActual = JsonParser.parseReader(fileReaderActual);

Assertions.assertEquals(jsonExpected, jsonActual);
} catch (IOException ex) {
Assertions.fail(ex.getMessage());
}
}
}
Loading