Skip to content

Commit 6192ea6

Browse files
committed
Migrate to JUnit 6, now only by supporting JUnit 4 tests
1 parent 5c50af3 commit 6192ea6

File tree

8 files changed

+239
-160
lines changed

8 files changed

+239
-160
lines changed

flake.lock

Lines changed: 60 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
description = "A Nix-flake-based Java development environment";
3+
4+
# GitHub URLs for the Nix inputs we're using
5+
inputs = {
6+
# Simply the greatest package repository on the planet
7+
nixpkgs.url = "github:NixOS/nixpkgs";
8+
# A set of helper functions for using flakes
9+
flake-utils.url = "github:numtide/flake-utils";
10+
};
11+
12+
outputs = { self, nixpkgs, flake-utils }:
13+
flake-utils.lib.eachDefaultSystem (system:
14+
let
15+
pkgs = import nixpkgs { inherit system; };
16+
17+
java = pkgs.jdk;
18+
19+
others = with pkgs; [ moreutils ];
20+
in {
21+
devShells = {
22+
default = pkgs.mkShell {
23+
# Packages included in the environment
24+
buildInputs = [ java ] ++ others;
25+
26+
shellHook = ''
27+
${java}/bin/java -version
28+
'';
29+
};
30+
};
31+
});
32+
}

integration-tests/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ for config in $target_dir/**/config.json; do
9999
if [ -f "$result_file" ]; then
100100
# Count accepted and failed in result
101101
accepted_result="$(jq -s 'map(select(.accepted == true)) | length' "$result_file" )"
102-
failed_result="$(jq -s 'map(select(.accepted == true)) | length' "$result_file" )"
102+
failed_result="$(jq -s 'map(select(.accepted == false)) | length' "$result_file" )"
103103

104104

105105
# First check if files are exact using diff, then check if they differ except '.description', then check they differ in accepted or failed

lib/hamcrest-core-1.3.jar

-44 KB
Binary file not shown.

lib/junit-4.13.2.jar

-376 KB
Binary file not shown.
2.74 MB
Binary file not shown.

0 commit comments

Comments
 (0)