From 5b1abedc8f53dbd50f99177dae52902a332d03ea Mon Sep 17 00:00:00 2001 From: Robert-96 Date: Sat, 15 Oct 2022 02:54:05 +0300 Subject: [PATCH 01/14] Add exit codes to the check command --- .../main/java/org/graphwalker/cli/CLI.java | 38 +++++++++++-------- .../java/org/graphwalker/cli/CLITestRoot.java | 22 ++++++++--- .../java/org/graphwalker/cli/CheckTest.java | 6 ++- .../org/graphwalker/cli/ConvertFilesTest.java | 9 +++-- .../graphwalker/cli/CorrectModelsTest.java | 12 +++++- .../org/graphwalker/cli/IOErrorsTest.java | 11 +++--- .../java/org/graphwalker/cli/MethodsTest.java | 5 ++- .../org/graphwalker/cli/PrintHelpTest.java | 1 + .../org/graphwalker/cli/PrintVersionTest.java | 5 ++- .../org/graphwalker/cli/RequirementsTest.java | 5 ++- .../java/org/graphwalker/cli/SourceTest.java | 6 ++- pom.xml | 2 +- 12 files changed, 80 insertions(+), 42 deletions(-) diff --git a/graphwalker-cli/src/main/java/org/graphwalker/cli/CLI.java b/graphwalker-cli/src/main/java/org/graphwalker/cli/CLI.java index 82ea91404..ab4fc06a7 100644 --- a/graphwalker-cli/src/main/java/org/graphwalker/cli/CLI.java +++ b/graphwalker-cli/src/main/java/org/graphwalker/cli/CLI.java @@ -101,19 +101,20 @@ enum Command { public static void main(String[] args) { CLI cli = new CLI(); try { - cli.run(args); + int status = cli.run(args); + System.exit(status); } catch (Exception e) { // We should have caught all exceptions up until here, but there // might have been problems with the command parser for instance... System.err.println(e + System.lineSeparator()); - logger.error("An error occurred when running command: " + StringUtils.join(args, " "), e); + logger.error("An unexpected error occurred when running command: " + StringUtils.join(args, " "), e); } } /** * Parses the command line. */ - private void run(String[] args) { + public int run(String[] args) { Options options = new Options(); JCommander jc = new JCommander(options); jc.setProgramName("graphwalker"); @@ -145,12 +146,12 @@ private void run(String[] args) { if (options.help) { jc.usage(); - return; + return 0; } else if (options.version) { System.out.println(printVersionInformation()); - return; + return 0; } else if (jc.getParsedCommand() == null) { - throw new MissingCommandException("Missing a command. Add '--help'"); + throw new MissingCommandException("Missing a command. Use the '--help' option to list all available commands."); } // Parse for commands @@ -174,19 +175,24 @@ private void run(String[] args) { runCommandSource(); } else if (jc.getParsedCommand().equalsIgnoreCase("check")) { command = Command.CHECK; - runCommandCheck(); + return runCommandCheck(); } } catch (UnsupportedFileFormat | MissingCommandException e) { System.err.println(e.getMessage() + System.lineSeparator()); + return 1; } catch (ParameterException e) { System.err.println("An error occurred when running command: " + StringUtils.join(args, " ")); System.err.println(e.getMessage() + System.lineSeparator()); jc.usage(); + return 1; } catch (Exception e) { + logger.error("An error occurred when running command: " + StringUtils.join(args, " "), e); System.err.println("An error occurred when running command: " + StringUtils.join(args, " ")); System.err.println(e.getMessage() + System.lineSeparator()); - logger.error("An error occurred when running command: " + StringUtils.join(args, " "), e); + return 2; } + + return 0; } private void setLogLevel(Options options) { @@ -210,7 +216,7 @@ private void setLogLevel(Options options) { } } - private void runCommandCheck() throws Exception, UnsupportedFileFormat { + private int runCommandCheck() throws Exception, UnsupportedFileFormat { List contexts = getContextsWithPathGenerators(check.model.iterator()); if (check.blocked) { org.graphwalker.io.common.Util.filterBlockedElements(contexts); @@ -221,8 +227,10 @@ private void runCommandCheck() throws Exception, UnsupportedFileFormat { for (String issue : issues) { System.out.println(issue); } + return 1; } else { System.out.println("No issues found with the model(s)."); + return 0; } } @@ -252,7 +260,7 @@ private void runCommandMethods() throws Exception, UnsupportedFileFormat { for (Context context : contexts) { for (Vertex.RuntimeVertex vertex : context.getModel().getVertices()) { - if (null != vertex.getName()) { + if (vertex.getName() != null) { names.add(vertex.getName()); } } @@ -296,6 +304,7 @@ private void runCommandOnline() throws Exception, UnsupportedFileFormat { + online.port + "/graphwalker/getNext"); System.out.println("Press Control+C to end..."); + try { server.start(); Thread.currentThread().join(); @@ -308,7 +317,7 @@ private void runCommandOnline() throws Exception, UnsupportedFileFormat { server.stop(); } } else { - throw new ParameterException("--service expected either WEBSOCKET or RESTFUL"); + throw new ParameterException("--service expected either WEBSOCKET or RESTFUL."); } } @@ -447,9 +456,9 @@ public List getContextsWithPathGenerators(Iterator itr) throws Exceptio contexts = factory.create(Paths.get(modelFileName)); } catch (DslException e) { System.err.println("When parsing model: '" + modelFileName + "' " + e.getMessage() + System.lineSeparator()); - throw new Exception("Model syntax error"); + throw new Exception("Model syntax error."); } - // TODO fix all occurences of get(0) is not safe + // TODO fix all occurrences of get(0) is not safe contexts.get(0).setPathGenerator(GeneratorFactory.parse((String) itr.next())); if (triggerOnce && @@ -501,8 +510,7 @@ private List getContexts(Iterator itr) throws Exception, UnsupportedFil try { contexts = factory.create(Paths.get(modelFileName)); } catch (DslException e) { - System.err.println("When parsing model: '" + modelFileName + "' " + e.getMessage() + System.lineSeparator()); - throw new Exception("Model syntax error"); + throw new Exception("The following error occurred when parsing: '" + modelFileName + "' " + e.getMessage()); } executionContexts.addAll(contexts); } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CLITestRoot.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CLITestRoot.java index 8a9d6dee3..3761cdae8 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CLITestRoot.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CLITestRoot.java @@ -12,10 +12,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -49,17 +49,23 @@ protected Result runCommand(String args[]) { System.setOut(outStream); System.setErr(errStream); + int status = -1; + try { - CLI.main(args); + CLI cli = new CLI(); + status = cli.run(args); } finally { System.setOut(oldOutStream); System.setErr(oldErrStream); String outMsg = stdOutput.toString(); String errMsg = errOutput.toString(); + logger.info("stdout: " + outMsg); logger.info("stderr: " + errMsg); - return new Result(outMsg, errMsg); + logger.info("status: " + status); + + return new Result(outMsg, errMsg, status); } } @@ -82,10 +88,12 @@ public class Result { private final String output; private final String error; + private final int status; - public Result(String output, String error) { + public Result(String output, String error, int status) { this.output = output; this.error = error; + this.status = status; } public String getOutput() { @@ -95,5 +103,9 @@ public String getOutput() { public String getError() { return error; } + + public int getStatus() { + return status; + } } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java index e815a6fb4..658647def 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java @@ -10,10 +10,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -41,6 +41,7 @@ public class CheckTest extends CLITestRoot { public void check() throws IOException { String args[] = {"check", "-m", "graphml/online/ShoppingCart.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("No issues found with the model(s).")); } @@ -49,6 +50,7 @@ public void check() throws IOException { public void checkWithBlocked() throws IOException { String args[] = {"check", "-m", "graphml/online/ShoppingCart.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("No issues found with the model(s).")); } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java index 0c9c92ab7..b0e4f8c8a 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java @@ -10,10 +10,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -46,8 +46,9 @@ public class ConvertFilesTest extends CLITestRoot { public void convertGraphmlToJava() throws IOException { String args[] = {"convert", "--input", "graphml/UC01_GW2.graphml", "--format", "java"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); - //TODO:Fix test -// Assert.assertTrue(tempFile.length() > 0); + // TODO: Fix test + // Assert.assertTrue(tempFile.length() > 0); } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java index f8ee1a7bb..626d186e3 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java @@ -10,10 +10,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -67,6 +67,7 @@ public class CorrectModelsTest extends CLITestRoot { public void simplestModel() { String args[] = {"offline", "-m", "graphml/CorrectModels/simplestModel.graphml", "random(vertex_coverage(100))"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + "{\"currentElementName\":\"v1\"}" + System.lineSeparator())); @@ -79,6 +80,7 @@ public void simplestModel() { public void shortestAllPathsVertexCoverage() { String args[] = {"offline", "-m", "graphml/CorrectModels/shortestAllPathsVertexCoverage.graphml", "shortest_all_paths(vertex_coverage(100))"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + "{\"currentElementName\":\"v1\"}" + System.lineSeparator() + @@ -99,6 +101,7 @@ public void shortestAllPathsVertexCoverage() { public void loginNoErrors() { String args[] = {"offline", "-o", "-m", "graphml/Login.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); } @@ -109,6 +112,7 @@ public void loginNoErrors() { public void noStartVertex() { String args[] = {"offline", "-e", "v1", "-m", "graphml/CorrectModels/modelWithNoStartVertex.graphml", "a_star(reached_edge(e4))"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"v1\"}" + System.lineSeparator() + "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + @@ -123,6 +127,7 @@ public void noStartVertex() { public void dontUseBlocked() { String args[] = {"offline", "-b", "false", "-m", "graphml/CorrectModels/blockedVertex.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + "{\"currentElementName\":\"v1\"}" + System.lineSeparator() + @@ -137,6 +142,7 @@ public void dontUseBlocked() { public void useBlocked() { String args[] = {"offline", "-m", "graphml/CorrectModels/blockedVertex.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + "{\"currentElementName\":\"v1\"}" + System.lineSeparator())); @@ -149,6 +155,7 @@ public void useBlocked() { public void dontUseBlockedJson() { String args[] = {"offline", "-b", "false", "-g", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), hasItems("{\"currentElementName\":\"e1\"}", @@ -175,6 +182,7 @@ public void dontUseBlockedJson() { public void useBlockedJson() { String args[] = {"offline", "-g", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), hasItems("{\"currentElementName\":\"e1\"}", diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java index f0d29ba03..79093d944 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java @@ -12,10 +12,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -41,9 +41,10 @@ public class IOErrorsTest extends CLITestRoot { public void nonExistentFile() { String args[] = {"offline", "-m", "sdsdtkdsjhsl.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); - Assert.assertThat(result.getError(), is("An error occurred when running command: " + - "offline -m sdsdtkdsjhsl.graphml random(edge_coverage(100))" + - System.lineSeparator() + "Could not read the file." + System.lineSeparator() + System.lineSeparator())); + Assert.assertThat(result.getStatus(), is(2)); Assert.assertThat(result.getOutput(), is("")); + Assert.assertThat(result.getError(), is("An error occurred when running command: " + + "offline -m sdsdtkdsjhsl.graphml random(edge_coverage(100))" + System.lineSeparator() + + "Could not read the file." + System.lineSeparator() + System.lineSeparator())); } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java index ac083726f..3df97f226 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java @@ -10,10 +10,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -65,6 +65,7 @@ public void methodsDontUseBlockedFeature() throws IOException { public void methodsUseBlockedFeature() throws IOException { String args[] = {"methods", "-m", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(Arrays.asList(result.getOutput().split("\\s+")), containsInAnyOrder("e1", diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java index 07c03f3fa..a1a9c54fc 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java @@ -41,6 +41,7 @@ public class PrintHelpTest extends CLITestRoot { public void help() throws IOException { String args[] = {"--help"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("Usage: graphwalker [options] [command] [command options]")); } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java index c687ca366..dfaac14d0 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java @@ -10,10 +10,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -41,6 +41,7 @@ public class PrintVersionTest extends CLITestRoot { public void version() throws IOException { String args[] = {"--version"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("org.graphwalker version: ")); } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java index 86e40645d..e762ed71c 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java @@ -10,10 +10,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -43,6 +43,7 @@ public class RequirementsTest extends CLITestRoot { public void requirements() throws IOException { String args[] = {"requirements", "-m", "graphml/online/ShoppingCart.graphml"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); List array = Arrays.asList(result.getOutput().split("\n")); diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java index 1939123c2..387ee2bda 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java @@ -10,10 +10,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -40,6 +40,7 @@ public class SourceTest extends CLITestRoot { public void generatePerl() throws IOException { String args[] = {"source", "--input", "json/example.json", "template/perl.template"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertTrue(result.getOutput().length() > 1200 && result.getOutput().length() < 1300); } @@ -48,6 +49,7 @@ public void generatePerl() throws IOException { public void generatePython() throws IOException { String args[] = {"source", "--input", "json/example.json", "template/python.template"}; Result result = runCommand(args); + Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertTrue(result.getOutput().length() > 950 && result.getOutput().length() < 1150); } diff --git a/pom.xml b/pom.xml index d32f1a8a8..22ee4d2c1 100644 --- a/pom.xml +++ b/pom.xml @@ -433,7 +433,7 @@ org.jacoco jacoco-maven-plugin - 0.8.7 + 0.8.8 From 40216e506b1b10bffb5030ab81377ea0622c391b Mon Sep 17 00:00:00 2001 From: Kristian Karl Date: Fri, 14 Oct 2022 15:20:15 +0200 Subject: [PATCH 02/14] Use update maven used in maven wrapper --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index a9f1ef87b..5d43cd338 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar From 32cbb8ca52ae411703da6d0a4f57a526957d873c Mon Sep 17 00:00:00 2001 From: Robert-96 Date: Mon, 21 Nov 2022 14:22:01 +0200 Subject: [PATCH 03/14] Fix conflicts --- .../java/org/graphwalker/cli/CheckTest.java | 12 +- .../org/graphwalker/cli/ConvertFilesTest.java | 8 +- .../graphwalker/cli/CorrectModelsTest.java | 43 ++++++- .../org/graphwalker/cli/IOErrorsTest.java | 9 +- .../graphwalker/cli/IncorrectModelsTest.java | 22 ++-- .../java/org/graphwalker/cli/MethodsTest.java | 11 +- .../org/graphwalker/cli/PrintHelpTest.java | 7 +- .../org/graphwalker/cli/PrintVersionTest.java | 7 +- .../org/graphwalker/cli/RequirementsTest.java | 8 +- .../java/org/graphwalker/cli/SourceTest.java | 13 ++- .../graphwalker/core/algorithm/AStarTest.java | 2 +- .../core/algorithm/DepthFirstSearchTest.java | 2 +- .../core/algorithm/EulerianTest.java | 2 +- .../core/algorithm/FloydWarshallTest.java | 2 +- .../condition/AlternativeConditionTest.java | 4 +- .../core/condition/CombinedConditionTest.java | 2 +- .../condition/DependencyEdgeCoverageTest.java | 4 +- .../core/condition/EdgeCoverageTest.java | 4 +- .../core/condition/LengthTest.java | 4 +- .../graphwalker/core/condition/NeverTest.java | 4 +- .../PredefinedPathStopConditionTest.java | 4 +- .../core/condition/ReachedEdgeTest.java | 4 +- .../condition/ReachedSharedStateTest.java | 2 +- .../core/condition/ReachedVertexTest.java | 4 +- .../condition/RequirementCoverageTest.java | 1 + .../core/condition/TimeDurationTest.java | 4 +- .../core/condition/VertexCoverageTest.java | 4 +- .../graphwalker/core/event/ObserverTest.java | 1 + .../graphwalker/core/example/ExampleTest.java | 2 +- .../core/generator/CombinedPathTest.java | 2 +- .../machine/FailedEdgeRequirementTest.java | 2 +- .../core/machine/LoginModelTest.java | 2 +- .../core/machine/ReplayMachineTest.java | 2 +- .../core/machine/SimpleMachineTest.java | 1 + .../core/model/ClassificationTest.java | 4 +- .../core/model/ClassificationTreeTest.java | 4 +- .../org/graphwalker/core/model/EdgeTest.java | 1 + .../org/graphwalker/core/model/ModelTest.java | 1 + .../core/model/RequirementTest.java | 4 +- .../graphwalker/core/model/VertexTest.java | 1 + .../graphwalker/core/model/VisitorTest.java | 4 +- .../core/statistics/ExecutionTest.java | 2 +- .../core/statistics/ProfileTest.java | 2 +- .../core/statistics/ProfilerTest.java | 2 + .../graphwalker/dsl/GeneratorFactoryTest.java | 7 +- .../java/org/graphwalker/dsl/GrammarTest.java | 4 +- .../java/org/graphwalker/yed/GrammarTest.java | 6 +- .../org/graphwalker/io/common/UtilTest.java | 2 +- .../factory/ConvertionContextFactoryTest.java | 2 +- .../io/factory/dot/DotContextFactoryTest.java | 4 +- .../io/label/yed/YEdLabelTest.java | 2 +- .../io/xmlbeans/yed/XMLBeansTest.java | 2 +- .../java/annotation/AnnotationTest.java | 17 +-- .../graphwalker/java/report/ReportTest.java | 2 +- .../graphwalker/java/source/GenerateTest.java | 72 ++++++------ .../java/source/SourceFileTest.java | 2 +- .../java/test/ConfigurationTest.java | 15 +-- .../org/graphwalker/java/test/ResultTest.java | 110 +++++++++--------- .../org/graphwalker/java/test/SimpleTest.java | 2 +- .../java/test/TestExecutorTest.java | 27 ++--- .../modelchecker/ContextCheckerTest.java | 20 ++-- .../modelchecker/ContextsCheckerTest.java | 4 +- .../modelchecker/EdgeCheckerTest.java | 20 ++-- .../modelchecker/ElementCheckerTest.java | 12 +- .../modelchecker/ModelCheckerTest.java | 16 +-- .../modelchecker/VertexCheckerTest.java | 16 +-- .../org/graphwalker/restful/RestTest.java | 57 ++++----- .../websocket/WebSocketServerTest.java | 18 +-- 68 files changed, 402 insertions(+), 267 deletions(-) diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java index 658647def..eded5f24d 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java @@ -26,11 +26,11 @@ package org.graphwalker.cli; -import org.junit.Assert; import org.junit.Test; import java.io.IOException; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.core.Is.is; @@ -41,17 +41,27 @@ public class CheckTest extends CLITestRoot { public void check() throws IOException { String args[] = {"check", "-m", "graphml/online/ShoppingCart.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("No issues found with the model(s).")); +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), containsString("No issues found with the model(s).")); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } @Test public void checkWithBlocked() throws IOException { String args[] = {"check", "-m", "graphml/online/ShoppingCart.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("No issues found with the model(s).")); +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), containsString("No issues found with the model(s).")); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java index b0e4f8c8a..9d1d2ade1 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java @@ -26,11 +26,11 @@ package org.graphwalker.cli; -import org.junit.Assert; import org.junit.Test; import java.io.IOException; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; @@ -46,9 +46,15 @@ public class ConvertFilesTest extends CLITestRoot { public void convertGraphmlToJava() throws IOException { String args[] = {"convert", "--input", "graphml/UC01_GW2.graphml", "--format", "java"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); // TODO: Fix test // Assert.assertTrue(tempFile.length() > 0); +======= + assertThat(result.getError(), is("")); + //TODO:Fix test +// Assert.assertTrue(tempFile.length() > 0); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java index 626d186e3..bbf062a98 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java @@ -48,11 +48,11 @@ package org.graphwalker.cli; -import org.junit.Assert; import org.junit.Test; import java.util.Arrays; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.not; import static org.hamcrest.core.Is.is; @@ -67,9 +67,14 @@ public class CorrectModelsTest extends CLITestRoot { public void simplestModel() { String args[] = {"offline", "-m", "graphml/CorrectModels/simplestModel.graphml", "random(vertex_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +>>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"v1\"}" + System.lineSeparator())); } @@ -80,9 +85,14 @@ public void simplestModel() { public void shortestAllPathsVertexCoverage() { String args[] = {"offline", "-m", "graphml/CorrectModels/shortestAllPathsVertexCoverage.graphml", "shortest_all_paths(vertex_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +>>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"v1\"}" + System.lineSeparator() + "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + "{\"currentElementName\":\"v2\"}" + System.lineSeparator() + @@ -101,8 +111,12 @@ public void shortestAllPathsVertexCoverage() { public void loginNoErrors() { String args[] = {"offline", "-o", "-m", "graphml/Login.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); +======= + assertThat(result.getError(), is("")); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } /** @@ -112,9 +126,14 @@ public void loginNoErrors() { public void noStartVertex() { String args[] = {"offline", "-e", "v1", "-m", "graphml/CorrectModels/modelWithNoStartVertex.graphml", "a_star(reached_edge(e4))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"v1\"}" + System.lineSeparator() + +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), is("{\"currentElementName\":\"v1\"}" + System.lineSeparator() + +>>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + "{\"currentElementName\":\"v2\"}" + System.lineSeparator() + "{\"currentElementName\":\"e4\"}" + System.lineSeparator())); @@ -127,9 +146,14 @@ public void noStartVertex() { public void dontUseBlocked() { String args[] = {"offline", "-b", "false", "-m", "graphml/CorrectModels/blockedVertex.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +>>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"v1\"}" + System.lineSeparator() + "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + "{\"currentElementName\":\"v2\"}" + System.lineSeparator())); @@ -142,9 +166,14 @@ public void dontUseBlocked() { public void useBlocked() { String args[] = {"offline", "-m", "graphml/CorrectModels/blockedVertex.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +>>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"v1\"}" + System.lineSeparator())); } @@ -155,9 +184,14 @@ public void useBlocked() { public void dontUseBlockedJson() { String args[] = {"offline", "-b", "false", "-g", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), +======= + assertThat(result.getError(), is("")); + assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), +>>>>>>> 3036b2c4 (Replace deprecated assertThat) hasItems("{\"currentElementName\":\"e1\"}", "{\"currentElementName\":\"e2\"}", "{\"currentElementName\":\"e3\"}", @@ -182,9 +216,14 @@ public void dontUseBlockedJson() { public void useBlockedJson() { String args[] = {"offline", "-g", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), +======= + assertThat(result.getError(), is("")); + assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), +>>>>>>> 3036b2c4 (Replace deprecated assertThat) hasItems("{\"currentElementName\":\"e1\"}", "{\"currentElementName\":\"e2\"}", "{\"currentElementName\":\"e3\"}", @@ -197,7 +236,7 @@ public void useBlockedJson() { "{\"currentElementName\":\"v3\"}", "{\"currentElementName\":\"v4\"}")); - Assert.assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), + assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), not(hasItems("{\"currentElementName\":\"e5\"}", "{\"currentElementName\":\"e6\"}", "{\"currentElementName\":\"v5\"}"))); diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java index 79093d944..618f3d5e0 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java @@ -26,9 +26,9 @@ * #L% */ -import org.junit.Assert; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; @@ -41,10 +41,17 @@ public class IOErrorsTest extends CLITestRoot { public void nonExistentFile() { String args[] = {"offline", "-m", "sdsdtkdsjhsl.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(2)); Assert.assertThat(result.getOutput(), is("")); Assert.assertThat(result.getError(), is("An error occurred when running command: " + "offline -m sdsdtkdsjhsl.graphml random(edge_coverage(100))" + System.lineSeparator() + "Could not read the file." + System.lineSeparator() + System.lineSeparator())); +======= + assertThat(result.getError(), is("An error occurred when running command: " + + "offline -m sdsdtkdsjhsl.graphml random(edge_coverage(100))" + + System.lineSeparator() + "Could not read the file." + System.lineSeparator() + System.lineSeparator())); + assertThat(result.getOutput(), is("")); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java index 17897836f..f9a43ea57 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java @@ -26,9 +26,9 @@ * #L% */ -import org.junit.Assert; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; @@ -41,14 +41,14 @@ public class IncorrectModelsTest extends CLITestRoot { public void wrongVertexSyntax() { String args[] = {"offline", "-m", "graphml/IncorrectModels/wrongVertexSyntax.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); - Assert.assertThat(result.getError(), + assertThat(result.getError(), is("When parsing model: 'graphml/IncorrectModels/wrongVertexSyntax.graphml' The string '1' did not conform to GraphWalker syntax rules." + System.lineSeparator() + System.lineSeparator() + "An error occurred when running command: offline -m graphml/IncorrectModels/wrongVertexSyntax.graphml random(edge_coverage(100))" + System.lineSeparator() + "Model syntax error" + System.lineSeparator() + System.lineSeparator())); - Assert.assertThat(result.getOutput(), is("")); + assertThat(result.getOutput(), is("")); } /** @@ -58,10 +58,10 @@ public void wrongVertexSyntax() { public void onlyOneVertex() { String args[] = {"offline", "-m", "graphml/IncorrectModels/singleVertex.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); - Assert.assertThat(result.getError(), is("An error occurred when running command: " + + assertThat(result.getError(), is("An error occurred when running command: " + "offline -m graphml/IncorrectModels/singleVertex.graphml random(edge_coverage(100))" + System.lineSeparator() + "No start context found" + System.lineSeparator() + System.lineSeparator())); - Assert.assertThat(result.getOutput(), is("")); + assertThat(result.getOutput(), is("")); } /** @@ -71,10 +71,10 @@ public void onlyOneVertex() { public void singleStartVertex() { String args[] = {"offline", "-m", "graphml/IncorrectModels/singleStartVertex.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); - Assert.assertThat(result.getError(), is("An error occurred when running command: " + + assertThat(result.getError(), is("An error occurred when running command: " + "offline -m graphml/IncorrectModels/singleStartVertex.graphml random(edge_coverage(100))" + System.lineSeparator() + "No start context found" + System.lineSeparator() + System.lineSeparator())); - Assert.assertThat(result.getOutput(), is("")); + assertThat(result.getOutput(), is("")); } /** @@ -84,14 +84,14 @@ public void singleStartVertex() { public void badEdgeName() { String args[] = {"offline", "-m", "graphml/IncorrectModels/badEdgeName.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); - Assert.assertThat(result.getError(), + assertThat(result.getError(), is("When parsing model: 'graphml/IncorrectModels/badEdgeName.graphml' The string '1_badName' did not conform to GraphWalker syntax rules." + System.lineSeparator() + System.lineSeparator() + "An error occurred when running command: offline -m graphml/IncorrectModels/badEdgeName.graphml random(edge_coverage(100))" + System.lineSeparator() + "Model syntax error" + System.lineSeparator() + System.lineSeparator())); - Assert.assertThat(result.getOutput(), is("")); + assertThat(result.getOutput(), is("")); } /** @@ -101,13 +101,13 @@ public void badEdgeName() { public void badVertexName() { String args[] = {"offline", "-m", "graphml/IncorrectModels/badVertexName.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); - Assert.assertThat(result.getError(), + assertThat(result.getError(), is("When parsing model: 'graphml/IncorrectModels/badVertexName.graphml' The string '1_badName' did not conform to GraphWalker syntax rules." + System.lineSeparator() + System.lineSeparator() + "An error occurred when running command: offline -m graphml/IncorrectModels/badVertexName.graphml random(edge_coverage(100))" + System.lineSeparator() + "Model syntax error" + System.lineSeparator() + System.lineSeparator())); - Assert.assertThat(result.getOutput(), is("")); + assertThat(result.getOutput(), is("")); } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java index 3df97f226..9147942f8 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java @@ -26,12 +26,12 @@ package org.graphwalker.cli; -import org.junit.Assert; import org.junit.Test; import java.io.IOException; import java.util.Arrays; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.core.Is.is; @@ -42,8 +42,8 @@ public class MethodsTest extends CLITestRoot { public void methodsDontUseBlockedFeature() throws IOException { String args[] = {"methods", "-b", "false", "-m", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); - Assert.assertThat(result.getError(), is("")); - Assert.assertThat(Arrays.asList(result.getOutput().split("\\s+")), + assertThat(result.getError(), is("")); + assertThat(Arrays.asList(result.getOutput().split("\\s+")), containsInAnyOrder("e1", "e2", "e3", @@ -65,9 +65,14 @@ public void methodsDontUseBlockedFeature() throws IOException { public void methodsUseBlockedFeature() throws IOException { String args[] = {"methods", "-m", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(Arrays.asList(result.getOutput().split("\\s+")), +======= + assertThat(result.getError(), is("")); + assertThat(Arrays.asList(result.getOutput().split("\\s+")), +>>>>>>> 3036b2c4 (Replace deprecated assertThat) containsInAnyOrder("e1", "e2", "e3", diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java index a1a9c54fc..824143236 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java @@ -26,12 +26,12 @@ package org.graphwalker.cli; -import org.junit.Assert; import org.junit.Test; import java.io.IOException; import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; @@ -41,8 +41,13 @@ public class PrintHelpTest extends CLITestRoot { public void help() throws IOException { String args[] = {"--help"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("Usage: graphwalker [options] [command] [command options]")); +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), containsString("Usage: graphwalker [options] [command] [command options]")); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java index dfaac14d0..347d9132e 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java @@ -26,12 +26,12 @@ package org.graphwalker.cli; -import org.junit.Assert; import org.junit.Test; import java.io.IOException; import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; @@ -41,8 +41,13 @@ public class PrintVersionTest extends CLITestRoot { public void version() throws IOException { String args[] = {"--version"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("org.graphwalker version: ")); +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), containsString("org.graphwalker version: ")); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java index e762ed71c..32449fed9 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java @@ -26,13 +26,13 @@ package org.graphwalker.cli; -import org.junit.Assert; import org.junit.Test; import java.io.IOException; import java.util.Arrays; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.core.Is.is; @@ -43,14 +43,18 @@ public class RequirementsTest extends CLITestRoot { public void requirements() throws IOException { String args[] = {"requirements", "-m", "graphml/online/ShoppingCart.graphml"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); +======= + assertThat(result.getError(), is("")); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) List array = Arrays.asList(result.getOutput().split("\n")); for (int i = 0; i < array.size(); i++) { array.set(i, array.get(i).trim()); } - Assert.assertThat(array, + assertThat(array, containsInAnyOrder("UC01 2.2.1", "UC01 2.2.2", "UC01 2.2.3", diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java index 387ee2bda..386f2994a 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java @@ -26,12 +26,13 @@ package org.graphwalker.cli; -import org.junit.Assert; import org.junit.Test; import java.io.IOException; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertTrue; public class SourceTest extends CLITestRoot { @@ -40,17 +41,27 @@ public class SourceTest extends CLITestRoot { public void generatePerl() throws IOException { String args[] = {"source", "--input", "json/example.json", "template/perl.template"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertTrue(result.getOutput().length() > 1200 && result.getOutput().length() < 1300); +======= + assertThat(result.getError(), is("")); + assertTrue(result.getOutput().length() > 1200 && result.getOutput().length() < 1300); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } @Test public void generatePython() throws IOException { String args[] = {"source", "--input", "json/example.json", "template/python.template"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertTrue(result.getOutput().length() > 950 && result.getOutput().length() < 1150); +======= + assertThat(result.getError(), is("")); + assertTrue(result.getOutput().length() > 950 && result.getOutput().length() < 1150); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/AStarTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/AStarTest.java index 49c7355c9..aa6f71660 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/AStarTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/AStarTest.java @@ -30,9 +30,9 @@ import org.graphwalker.core.model.*; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/DepthFirstSearchTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/DepthFirstSearchTest.java index 41a3ad879..86d404ce1 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/DepthFirstSearchTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/DepthFirstSearchTest.java @@ -32,8 +32,8 @@ import org.graphwalker.core.model.Vertex; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/EulerianTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/EulerianTest.java index a2e9bcffc..39bfc30a0 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/EulerianTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/EulerianTest.java @@ -32,8 +32,8 @@ import org.graphwalker.core.model.Vertex; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/FloydWarshallTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/FloydWarshallTest.java index 08276e4df..f7e36671c 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/FloydWarshallTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/algorithm/FloydWarshallTest.java @@ -32,8 +32,8 @@ import org.graphwalker.core.model.Vertex; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/AlternativeConditionTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/AlternativeConditionTest.java index 56208da19..061b7dfda 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/AlternativeConditionTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/AlternativeConditionTest.java @@ -36,8 +36,10 @@ import org.graphwalker.core.model.Vertex; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/CombinedConditionTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/CombinedConditionTest.java index bbaffc364..4137b01bf 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/CombinedConditionTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/CombinedConditionTest.java @@ -28,9 +28,9 @@ import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/DependencyEdgeCoverageTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/DependencyEdgeCoverageTest.java index d5eee1e92..71d2f490c 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/DependencyEdgeCoverageTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/DependencyEdgeCoverageTest.java @@ -35,8 +35,10 @@ import org.graphwalker.core.statistics.SimpleProfiler; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * @author Miroslav Janeski diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/EdgeCoverageTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/EdgeCoverageTest.java index e819f38b0..88ef0361f 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/EdgeCoverageTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/EdgeCoverageTest.java @@ -35,8 +35,10 @@ import org.graphwalker.core.statistics.SimpleProfiler; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/LengthTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/LengthTest.java index 67354813d..3f51fdd3f 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/LengthTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/LengthTest.java @@ -34,8 +34,10 @@ import org.graphwalker.core.statistics.SimpleProfiler; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/NeverTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/NeverTest.java index 948182b33..d9acfc6de 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/NeverTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/NeverTest.java @@ -28,8 +28,10 @@ import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/PredefinedPathStopConditionTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/PredefinedPathStopConditionTest.java index f876fa777..332805ba7 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/PredefinedPathStopConditionTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/PredefinedPathStopConditionTest.java @@ -9,8 +9,10 @@ import java.util.Arrays; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class PredefinedPathStopConditionTest { diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedEdgeTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedEdgeTest.java index 2002443df..624287e31 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedEdgeTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedEdgeTest.java @@ -34,8 +34,10 @@ import org.graphwalker.core.model.Vertex; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedSharedStateTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedSharedStateTest.java index d7894fbbf..6144730a9 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedSharedStateTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedSharedStateTest.java @@ -39,8 +39,8 @@ import java.util.List; import java.util.stream.Collectors; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedVertexTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedVertexTest.java index bdfd8cfd2..0c9d99630 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedVertexTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/ReachedVertexTest.java @@ -34,8 +34,10 @@ import org.graphwalker.core.model.Vertex; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/RequirementCoverageTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/RequirementCoverageTest.java index 889f2d474..10923c69f 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/RequirementCoverageTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/RequirementCoverageTest.java @@ -34,6 +34,7 @@ import org.graphwalker.core.model.Vertex; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.Assert.*; diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/TimeDurationTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/TimeDurationTest.java index 318b18867..09cdc55df 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/TimeDurationTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/TimeDurationTest.java @@ -38,8 +38,10 @@ import java.util.concurrent.TimeUnit; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/condition/VertexCoverageTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/condition/VertexCoverageTest.java index fd54bc5d7..d164a3972 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/condition/VertexCoverageTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/condition/VertexCoverageTest.java @@ -35,8 +35,10 @@ import org.graphwalker.core.statistics.SimpleProfiler; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/event/ObserverTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/event/ObserverTest.java index faba676eb..4d3dae980 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/event/ObserverTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/event/ObserverTest.java @@ -40,6 +40,7 @@ import static org.graphwalker.core.event.EventType.AFTER_ELEMENT; import static org.graphwalker.core.event.EventType.BEFORE_ELEMENT; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.Assert.*; diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/example/ExampleTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/example/ExampleTest.java index 3de6c08b7..1eb0ba5b0 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/example/ExampleTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/example/ExampleTest.java @@ -32,8 +32,8 @@ import org.graphwalker.core.model.*; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; /** diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/generator/CombinedPathTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/generator/CombinedPathTest.java index 6573ff950..e3da0404f 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/generator/CombinedPathTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/generator/CombinedPathTest.java @@ -42,9 +42,9 @@ import java.util.List; import java.util.stream.Collectors; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/machine/FailedEdgeRequirementTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/machine/FailedEdgeRequirementTest.java index 382a0c55d..8e6661543 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/machine/FailedEdgeRequirementTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/machine/FailedEdgeRequirementTest.java @@ -35,8 +35,8 @@ import org.graphwalker.core.model.Vertex; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/machine/LoginModelTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/machine/LoginModelTest.java index a9ebfaf40..36205e00e 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/machine/LoginModelTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/machine/LoginModelTest.java @@ -39,9 +39,9 @@ import java.util.List; import java.util.stream.Collectors; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertThat; /** * This is a programatic implementaion of the loginModel: diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/machine/ReplayMachineTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/machine/ReplayMachineTest.java index 8234fd43d..e179627f4 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/machine/ReplayMachineTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/machine/ReplayMachineTest.java @@ -35,8 +35,8 @@ import java.util.List; import java.util.stream.Collectors; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/machine/SimpleMachineTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/machine/SimpleMachineTest.java index 7d86a933a..439451a71 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/machine/SimpleMachineTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/machine/SimpleMachineTest.java @@ -38,6 +38,7 @@ import java.util.stream.Collectors; import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.Assert.*; diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTest.java index 5443fb5cd..d89fecd3c 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTest.java @@ -29,8 +29,10 @@ import org.junit.Test; import static org.graphwalker.core.model.Classification.RuntimeClassification; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTreeTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTreeTest.java index 11785c0fa..ce822386b 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTreeTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/ClassificationTreeTest.java @@ -29,8 +29,10 @@ import org.junit.Test; import static org.graphwalker.core.model.ClassificationTree.RuntimeClassificationTree; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/EdgeTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/EdgeTest.java index 9a18820e6..1822d53f6 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/model/EdgeTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/EdgeTest.java @@ -30,6 +30,7 @@ import java.util.Arrays; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNot.not; import static org.junit.Assert.*; diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/ModelTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/ModelTest.java index ef6d9d67e..3f3b0a0a9 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/model/ModelTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/ModelTest.java @@ -34,6 +34,7 @@ import java.util.Random; import java.util.concurrent.TimeUnit; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNot.not; import static org.hamcrest.core.IsNull.notNullValue; diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/RequirementTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/RequirementTest.java index cf4c45a0d..0d33344be 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/model/RequirementTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/RequirementTest.java @@ -33,8 +33,10 @@ import org.graphwalker.core.machine.*; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/VertexTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/VertexTest.java index f97201f30..27d92113b 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/model/VertexTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/VertexTest.java @@ -30,6 +30,7 @@ import java.util.Arrays; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNot.not; import static org.junit.Assert.*; diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/model/VisitorTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/model/VisitorTest.java index 8c97ec1dc..ce08974f6 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/model/VisitorTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/model/VisitorTest.java @@ -34,8 +34,10 @@ import static org.graphwalker.core.model.Edge.RuntimeEdge; import static org.graphwalker.core.model.Model.RuntimeModel; import static org.graphwalker.core.model.Vertex.RuntimeVertex; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ExecutionTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ExecutionTest.java index bc54c0717..0905656d1 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ExecutionTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ExecutionTest.java @@ -34,9 +34,9 @@ import java.util.concurrent.TimeUnit; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; /** * @author Nils Olsson diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ProfileTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ProfileTest.java index 1725b6ebd..37a38adb5 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ProfileTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ProfileTest.java @@ -35,8 +35,8 @@ import java.util.Collections; import java.util.concurrent.TimeUnit; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; public class ProfileTest { diff --git a/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ProfilerTest.java b/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ProfilerTest.java index cd8891934..eb898aced 100644 --- a/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ProfilerTest.java +++ b/graphwalker-core/src/test/java/org/graphwalker/core/statistics/ProfilerTest.java @@ -40,10 +40,12 @@ import java.util.Arrays; import java.util.HashSet; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.core.Is.is; import static org.junit.Assert.*; + /** * @author Nils Olsson */ diff --git a/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GeneratorFactoryTest.java b/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GeneratorFactoryTest.java index 7e9275602..bb63fb971 100644 --- a/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GeneratorFactoryTest.java +++ b/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GeneratorFactoryTest.java @@ -32,7 +32,6 @@ import org.graphwalker.dsl.antlr.generator.GeneratorFactory; import org.graphwalker.dsl.antlr.generator.GeneratorFactoryException; import org.graphwalker.generator.PluginGenerator; -import org.junit.Assert; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -312,8 +311,8 @@ public void predefinedPath_predefinedPathStopCondition() { @Test public void plugin_generator() { PathGenerator generator = GeneratorFactory.parse("pluginGenerator(edge_coverage(100))"); - Assert.assertThat(generator, instanceOf(PluginGenerator.class)); - Assert.assertThat(generator.getStopCondition(), instanceOf(EdgeCoverage.class)); - Assert.assertThat(((EdgeCoverage) generator.getStopCondition()).getPercent(), is(100)); + assertThat(generator, instanceOf(PluginGenerator.class)); + assertThat(generator.getStopCondition(), instanceOf(EdgeCoverage.class)); + assertThat(((EdgeCoverage) generator.getStopCondition()).getPercent(), is(100)); } } diff --git a/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GrammarTest.java b/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GrammarTest.java index 424451ba8..7af806f34 100644 --- a/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GrammarTest.java +++ b/graphwalker-dsl/src/test/java/org/graphwalker/dsl/GrammarTest.java @@ -31,12 +31,12 @@ import org.antlr.v4.runtime.CommonTokenStream; import org.graphwalker.dsl.generator.GeneratorParser; import org.graphwalker.dsl.generator.LogicalLexer; -import org.junit.Assert; import org.junit.Test; import java.util.Arrays; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; /** @@ -73,7 +73,7 @@ public void testCLI() { CommonTokenStream tokens = new CommonTokenStream(lexer); GeneratorParser parser = new GeneratorParser(tokens); GeneratorParser.ParseContext context = parser.parse(); - Assert.assertThat("Could not parse: " + generator, parser.getNumberOfSyntaxErrors(), is(0)); + assertThat("Could not parse: " + generator, parser.getNumberOfSyntaxErrors(), is(0)); } } } diff --git a/graphwalker-dsl/src/test/java/org/graphwalker/yed/GrammarTest.java b/graphwalker-dsl/src/test/java/org/graphwalker/yed/GrammarTest.java index 23a1dfafa..f6074913a 100644 --- a/graphwalker-dsl/src/test/java/org/graphwalker/yed/GrammarTest.java +++ b/graphwalker-dsl/src/test/java/org/graphwalker/yed/GrammarTest.java @@ -32,12 +32,12 @@ import org.graphwalker.dsl.yed.YEdEdgeParser; import org.graphwalker.dsl.yed.YEdLabelLexer; import org.graphwalker.dsl.yed.YEdVertexParser; -import org.junit.Assert; import org.junit.Test; import java.util.Arrays; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; /** @@ -126,7 +126,7 @@ public void testVertexParser() { CommonTokenStream tokens = new CommonTokenStream(lexer); YEdVertexParser parser = new YEdVertexParser(tokens); parser.parse(); - Assert.assertThat("Could not parse: " + vertex, parser.getNumberOfSyntaxErrors(), is(0)); + assertThat("Could not parse: " + vertex, parser.getNumberOfSyntaxErrors(), is(0)); } } @@ -138,7 +138,7 @@ public void testEdgeParser() { CommonTokenStream tokens = new CommonTokenStream(lexer); YEdEdgeParser parser = new YEdEdgeParser(tokens); parser.parse(); - Assert.assertThat("Could not parse: " + edge, parser.getNumberOfSyntaxErrors(), is(0)); + assertThat("Could not parse: " + edge, parser.getNumberOfSyntaxErrors(), is(0)); } } } diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/common/UtilTest.java b/graphwalker-io/src/test/java/org/graphwalker/io/common/UtilTest.java index 527f63180..ac2fb0e1e 100644 --- a/graphwalker-io/src/test/java/org/graphwalker/io/common/UtilTest.java +++ b/graphwalker-io/src/test/java/org/graphwalker/io/common/UtilTest.java @@ -35,9 +35,9 @@ import java.nio.file.Paths; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; /** * Created by krikar on 2015-11-04. diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/factory/ConvertionContextFactoryTest.java b/graphwalker-io/src/test/java/org/graphwalker/io/factory/ConvertionContextFactoryTest.java index e63c46330..1f70112d4 100644 --- a/graphwalker-io/src/test/java/org/graphwalker/io/factory/ConvertionContextFactoryTest.java +++ b/graphwalker-io/src/test/java/org/graphwalker/io/factory/ConvertionContextFactoryTest.java @@ -43,9 +43,9 @@ import java.nio.file.Paths; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; /** * @author Kristian Karl diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/factory/dot/DotContextFactoryTest.java b/graphwalker-io/src/test/java/org/graphwalker/io/factory/dot/DotContextFactoryTest.java index 52a5f5ec7..eb4309f0c 100644 --- a/graphwalker-io/src/test/java/org/graphwalker/io/factory/dot/DotContextFactoryTest.java +++ b/graphwalker-io/src/test/java/org/graphwalker/io/factory/dot/DotContextFactoryTest.java @@ -34,8 +34,10 @@ import java.nio.file.Paths; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; /** * @author Kristian Karl diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/label/yed/YEdLabelTest.java b/graphwalker-io/src/test/java/org/graphwalker/io/label/yed/YEdLabelTest.java index 8f9abbb90..3f3d87549 100644 --- a/graphwalker-io/src/test/java/org/graphwalker/io/label/yed/YEdLabelTest.java +++ b/graphwalker-io/src/test/java/org/graphwalker/io/label/yed/YEdLabelTest.java @@ -37,9 +37,9 @@ import java.util.Arrays; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; /** * @author Nils Olsson diff --git a/graphwalker-io/src/test/java/org/graphwalker/io/xmlbeans/yed/XMLBeansTest.java b/graphwalker-io/src/test/java/org/graphwalker/io/xmlbeans/yed/XMLBeansTest.java index 07c7b04df..d0bcd5d61 100644 --- a/graphwalker-io/src/test/java/org/graphwalker/io/xmlbeans/yed/XMLBeansTest.java +++ b/graphwalker-io/src/test/java/org/graphwalker/io/xmlbeans/yed/XMLBeansTest.java @@ -32,8 +32,8 @@ import java.io.IOException; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; /** * @author Nils Olsson diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/annotation/AnnotationTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/annotation/AnnotationTest.java index a5c37f74c..95ea3398f 100644 --- a/graphwalker-java/src/test/java/org/graphwalker/java/annotation/AnnotationTest.java +++ b/graphwalker-java/src/test/java/org/graphwalker/java/annotation/AnnotationTest.java @@ -34,6 +34,7 @@ import java.util.Set; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; /** @@ -44,26 +45,26 @@ public class AnnotationTest { @Test public void getAnnotationsTest() { Set annotations = AnnotationUtils.getAnnotations(MyTest.class, GraphWalker.class); - Assert.assertThat(annotations.size(), is(1)); + assertThat(annotations.size(), is(1)); Assert.assertTrue(annotations.toArray()[0] instanceof GraphWalker); GraphWalker annotation = (GraphWalker) annotations.toArray()[0]; - Assert.assertThat(annotation.start(), is("vertex1")); - Assert.assertThat(annotation.groups(), is(new String[]{"MyTests"})); + assertThat(annotation.start(), is("vertex1")); + assertThat(annotation.groups(), is(new String[]{"MyTests"})); Assert.assertTrue(RandomPath.class.isAssignableFrom(annotation.pathGenerator())); Assert.assertTrue(VertexCoverage.class.isAssignableFrom(annotation.stopCondition())); - Assert.assertThat(annotation.stopConditionValue(), is("100")); - Assert.assertThat(AnnotationUtils.getAnnotations(MyTest.class, Vertex.class).size(), is(0)); + assertThat(annotation.stopConditionValue(), is("100")); + assertThat(AnnotationUtils.getAnnotations(MyTest.class, Vertex.class).size(), is(0)); } @Test public void executeTest() { MyTest myTest = new MyTest(); AnnotationUtils.execute(BeforeExecution.class, myTest); - Assert.assertThat(myTest.getCount(), is(1)); + assertThat(myTest.getCount(), is(1)); AnnotationUtils.execute(AfterExecution.class, myTest); - Assert.assertThat(myTest.getCount(), is(2)); + assertThat(myTest.getCount(), is(2)); AnnotationUtils.execute(BeforeElement.class, myTest); - Assert.assertThat(myTest.getCount(), is(3)); + assertThat(myTest.getCount(), is(3)); } @Test diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/report/ReportTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/report/ReportTest.java index 16fa3c539..643a55906 100644 --- a/graphwalker-java/src/test/java/org/graphwalker/java/report/ReportTest.java +++ b/graphwalker-java/src/test/java/org/graphwalker/java/report/ReportTest.java @@ -43,7 +43,7 @@ import java.util.Date; import java.util.List; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import static org.xmlunit.matchers.HasXPathMatcher.hasXPath; /** diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/source/GenerateTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/source/GenerateTest.java index 21fff1ee9..884aa2c0f 100644 --- a/graphwalker-java/src/test/java/org/graphwalker/java/source/GenerateTest.java +++ b/graphwalker-java/src/test/java/org/graphwalker/java/source/GenerateTest.java @@ -28,7 +28,6 @@ import org.graphwalker.io.common.ResourceUtils; import org.json.JSONObject; -import org.junit.Assert; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -46,6 +45,7 @@ import static org.graphwalker.java.utils.OccurrencesOfString.occurrencesOfString; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.stringContainsInOrder; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; @@ -61,32 +61,32 @@ public class GenerateTest { @Test public void generate() throws IOException { List sources = new CodeGenerator().generate("/org/graphwalker/java/annotation/MyModel.graphml"); - Assert.assertThat(sources.size(), is(1)); - Assert.assertThat(sources.get(0), containsString("package org.graphwalker.java.annotation;")); - Assert.assertThat(sources.get(0), containsString("edge12")); - Assert.assertThat(sources.get(0), containsString("vertex2")); - Assert.assertThat(sources.get(0), not(containsString("SHARED"))); + assertThat(sources.size(), is(1)); + assertThat(sources.get(0), containsString("package org.graphwalker.java.annotation;")); + assertThat(sources.get(0), containsString("edge12")); + assertThat(sources.get(0), containsString("vertex2")); + assertThat(sources.get(0), not(containsString("SHARED"))); } @Test public void generatePathWithSpace() throws IOException { List sources = new CodeGenerator().generate("/org/graphwalker/java/path with space/MyModel.graphml"); - Assert.assertThat(sources.size(), is(1)); - Assert.assertThat(sources.get(0), containsString("edge12")); - Assert.assertThat(sources.get(0), containsString("vertex2")); - Assert.assertThat(sources.get(0), not(containsString("SHARED"))); - Assert.assertThat(sources.get(0), containsString("package org.graphwalker.java.path_with_space;")); + assertThat(sources.size(), is(1)); + assertThat(sources.get(0), containsString("edge12")); + assertThat(sources.get(0), containsString("vertex2")); + assertThat(sources.get(0), not(containsString("SHARED"))); + assertThat(sources.get(0), containsString("package org.graphwalker.java.path_with_space;")); } @Test public void generateMultiModelFile() throws IOException { List sources = new CodeGenerator().generate("/org/graphwalker/java/test/PetClinic.json"); - Assert.assertThat(sources.size(), is(5)); + assertThat(sources.size(), is(5)); - Assert.assertThat(sources.get(0), containsString("public interface FindOwners {")); - Assert.assertThat(sources.get(0), occurrencesOfString("@Vertex()", 3)); - Assert.assertThat(sources.get(0), occurrencesOfString("@Edge()", 3)); - Assert.assertThat(sources.get(0), stringContainsInOrder(Arrays.asList( + assertThat(sources.get(0), containsString("public interface FindOwners {")); + assertThat(sources.get(0), occurrencesOfString("@Vertex()", 3)); + assertThat(sources.get(0), occurrencesOfString("@Edge()", 3)); + assertThat(sources.get(0), stringContainsInOrder(Arrays.asList( "void e_AddOwner();", "void v_FindOwners();", "void e_Search();", @@ -94,10 +94,10 @@ public void generateMultiModelFile() throws IOException { "void v_NewOwner();" ))); - Assert.assertThat(sources.get(1), containsString("public interface NewOwner {")); - Assert.assertThat(sources.get(1), occurrencesOfString("@Vertex()", 3)); - Assert.assertThat(sources.get(1), occurrencesOfString("@Edge()", 2)); - Assert.assertThat(sources.get(1), stringContainsInOrder(Arrays.asList( + assertThat(sources.get(1), containsString("public interface NewOwner {")); + assertThat(sources.get(1), occurrencesOfString("@Vertex()", 3)); + assertThat(sources.get(1), occurrencesOfString("@Edge()", 2)); + assertThat(sources.get(1), stringContainsInOrder(Arrays.asList( "void v_OwnerInformation();", "void e_CorrectData();", "void e_IncorrectData();", @@ -105,10 +105,10 @@ public void generateMultiModelFile() throws IOException { "void v_NewOwner();" ))); - Assert.assertThat(sources.get(2), containsString("public interface OwnerInformation {")); - Assert.assertThat(sources.get(2), occurrencesOfString("@Vertex()", 5)); - Assert.assertThat(sources.get(2), occurrencesOfString("@Edge()", 9)); - Assert.assertThat(sources.get(2), stringContainsInOrder(Arrays.asList( + assertThat(sources.get(2), containsString("public interface OwnerInformation {")); + assertThat(sources.get(2), occurrencesOfString("@Vertex()", 5)); + assertThat(sources.get(2), occurrencesOfString("@Edge()", 9)); + assertThat(sources.get(2), stringContainsInOrder(Arrays.asList( "void v_OwnerInformation();", "void e_UpdatePet();", "void v_FindOwners();", @@ -125,10 +125,10 @@ public void generateMultiModelFile() throws IOException { "void e_VisitAddedFailed();" ))); - Assert.assertThat(sources.get(3), containsString("public interface PetClinic {")); - Assert.assertThat(sources.get(3), occurrencesOfString("@Vertex()", 3)); - Assert.assertThat(sources.get(3), occurrencesOfString("@Edge()", 4)); - Assert.assertThat(sources.get(3), stringContainsInOrder(Arrays.asList( + assertThat(sources.get(3), containsString("public interface PetClinic {")); + assertThat(sources.get(3), occurrencesOfString("@Vertex()", 3)); + assertThat(sources.get(3), occurrencesOfString("@Edge()", 4)); + assertThat(sources.get(3), stringContainsInOrder(Arrays.asList( "void v_FindOwners();", "void e_HomePage();", "void e_StartBrowser();", @@ -137,10 +137,10 @@ public void generateMultiModelFile() throws IOException { "void v_HomePage();" ))); - Assert.assertThat(sources.get(4), containsString("public interface Veterinarians {")); - Assert.assertThat(sources.get(4), occurrencesOfString("@Vertex()", 2)); - Assert.assertThat(sources.get(4), occurrencesOfString("@Edge()", 1)); - Assert.assertThat(sources.get(4), stringContainsInOrder(Arrays.asList( + assertThat(sources.get(4), containsString("public interface Veterinarians {")); + assertThat(sources.get(4), occurrencesOfString("@Vertex()", 2)); + assertThat(sources.get(4), occurrencesOfString("@Edge()", 1)); + assertThat(sources.get(4), stringContainsInOrder(Arrays.asList( "void e_Search();", "void v_SearchResult();", "void v_Veterinarians();" @@ -181,10 +181,10 @@ public void generateAndWriteFromGraphml() throws IOException { JSONAssert.assertEquals(expected, data, false); File sourceFile = new File(tmpFolder + "/org/graphwalker/java/graphml/MyModel.java"); - Assert.assertThat(sourceFile.exists(), is(true)); + assertThat(sourceFile.exists(), is(true)); String content = readFile(sourceFile.toPath(), StandardCharsets.UTF_8); - Assert.assertThat(content, equalTo( + assertThat(content, equalTo( "// Generated by GraphWalker (http://www.graphwalker.org)\n" + "package org.graphwalker.java.graphml;\n" + "\n" + @@ -235,9 +235,9 @@ public void incorrectGraphml() throws IOException { JSONAssert.assertEquals(expected, data, false); File sourceDir = new File(tmpFolder + "/org"); - Assert.assertThat(sourceDir.exists(), is(false)); + assertThat(sourceDir.exists(), is(false)); File sourceFile = new File(tmpFolder + "/org/graphwalker/java/graphml/MyModel.java"); - Assert.assertThat(sourceFile.exists(), is(false)); + assertThat(sourceFile.exists(), is(false)); } } diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/source/SourceFileTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/source/SourceFileTest.java index aaa2e3f6f..0116f978c 100644 --- a/graphwalker-java/src/test/java/org/graphwalker/java/source/SourceFileTest.java +++ b/graphwalker-java/src/test/java/org/graphwalker/java/source/SourceFileTest.java @@ -5,8 +5,8 @@ import java.io.IOException; import java.nio.file.Paths; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; public class SourceFileTest { diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/test/ConfigurationTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/test/ConfigurationTest.java index 6f782dc37..62bc6aecf 100644 --- a/graphwalker-java/src/test/java/org/graphwalker/java/test/ConfigurationTest.java +++ b/graphwalker-java/src/test/java/org/graphwalker/java/test/ConfigurationTest.java @@ -26,10 +26,11 @@ * #L% */ -import org.junit.Assert; import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertNotNull; /** * @author Nils Olsson @@ -40,18 +41,18 @@ public class ConfigurationTest { public void configurationTest() { Configuration configuration = new Configuration(); configuration.addExclude("exclude"); - Assert.assertThat(configuration.getExcludes().size(), is(1)); + assertThat(configuration.getExcludes().size(), is(1)); configuration.addInclude("include"); - Assert.assertThat(configuration.getIncludes().size(), is(1)); + assertThat(configuration.getIncludes().size(), is(1)); configuration.addGroup("group"); - Assert.assertThat(configuration.getGroups().size(), is(1)); + assertThat(configuration.getGroups().size(), is(1)); } @Test public void minimalConfigurationTest() { Configuration configuration = new Configuration(); - Assert.assertNotNull(configuration.getExcludes()); - Assert.assertNotNull(configuration.getIncludes()); - Assert.assertNotNull(configuration.getGroups()); + assertNotNull(configuration.getExcludes()); + assertNotNull(configuration.getIncludes()); + assertNotNull(configuration.getGroups()); } } diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/test/ResultTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/test/ResultTest.java index a34b907ec..a2231ea27 100644 --- a/graphwalker-java/src/test/java/org/graphwalker/java/test/ResultTest.java +++ b/graphwalker-java/src/test/java/org/graphwalker/java/test/ResultTest.java @@ -30,7 +30,6 @@ import org.graphwalker.io.factory.json.JsonContextFactory; import org.hamcrest.core.StringStartsWith; import org.json.JSONObject; -import org.junit.Assert; import org.junit.Test; import java.io.IOException; @@ -40,6 +39,7 @@ import java.util.Collections; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; @@ -57,20 +57,20 @@ public void petClinic() throws IOException { Executor executor = new TestExecutor(contexts); JSONObject results = executor.execute(true).getResults(); - Assert.assertThat("totalNumberOfModels", results.getInt("totalNumberOfModels"), is(5)); - Assert.assertThat("totalCompletedNumberOfModels", results.getInt("totalCompletedNumberOfModels"), is(5)); - Assert.assertThat("totalIncompleteNumberOfModels", results.getInt("totalIncompleteNumberOfModels"), is(0)); - Assert.assertThat("totalFailedNumberOfModels", results.getInt("totalFailedNumberOfModels"), is(0)); - Assert.assertThat("totalNotExecutedNumberOfModels", results.getInt("totalNotExecutedNumberOfModels"), is(0)); - - Assert.assertThat("vertexCoverage", results.getInt("vertexCoverage"), is(100)); - Assert.assertThat("totalNumberOfEdges", results.getInt("totalNumberOfEdges"), is(25)); - Assert.assertThat("totalNumberOfVisitedVertices", results.getInt("totalNumberOfVisitedVertices"), is(16)); - Assert.assertThat("totalNumberOfUnvisitedVertices", results.getInt("totalNumberOfUnvisitedVertices"), is(0)); - Assert.assertThat("totalNumberOfVisitedEdges", results.getInt("totalNumberOfVisitedEdges"), is(25)); - Assert.assertThat("edgeCoverage", results.getInt("edgeCoverage"), is(100)); - Assert.assertThat("totalNumberOfVertices", results.getInt("totalNumberOfVertices"), is(16)); - Assert.assertThat("totalNumberOfUnvisitedEdges", results.getInt("totalNumberOfUnvisitedEdges"), is(0)); + assertThat("totalNumberOfModels", results.getInt("totalNumberOfModels"), is(5)); + assertThat("totalCompletedNumberOfModels", results.getInt("totalCompletedNumberOfModels"), is(5)); + assertThat("totalIncompleteNumberOfModels", results.getInt("totalIncompleteNumberOfModels"), is(0)); + assertThat("totalFailedNumberOfModels", results.getInt("totalFailedNumberOfModels"), is(0)); + assertThat("totalNotExecutedNumberOfModels", results.getInt("totalNotExecutedNumberOfModels"), is(0)); + + assertThat("vertexCoverage", results.getInt("vertexCoverage"), is(100)); + assertThat("totalNumberOfEdges", results.getInt("totalNumberOfEdges"), is(25)); + assertThat("totalNumberOfVisitedVertices", results.getInt("totalNumberOfVisitedVertices"), is(16)); + assertThat("totalNumberOfUnvisitedVertices", results.getInt("totalNumberOfUnvisitedVertices"), is(0)); + assertThat("totalNumberOfVisitedEdges", results.getInt("totalNumberOfVisitedEdges"), is(25)); + assertThat("edgeCoverage", results.getInt("edgeCoverage"), is(100)); + assertThat("totalNumberOfVertices", results.getInt("totalNumberOfVertices"), is(16)); + assertThat("totalNumberOfUnvisitedEdges", results.getInt("totalNumberOfUnvisitedEdges"), is(0)); } /** @@ -82,36 +82,36 @@ public void login() throws IOException { Executor executor = new TestExecutor(contexts); JSONObject results = executor.execute(true).getResults(); - Assert.assertThat("totalNumberOfModels", results.getInt("totalNumberOfModels"), is(1)); - Assert.assertThat("totalCompletedNumberOfModels", results.getInt("totalCompletedNumberOfModels"), is(1)); - Assert.assertThat("totalIncompleteNumberOfModels", results.getInt("totalIncompleteNumberOfModels"), is(0)); - Assert.assertThat("totalFailedNumberOfModels", results.getInt("totalFailedNumberOfModels"), is(0)); - Assert.assertThat("totalNotExecutedNumberOfModels", results.getInt("totalNotExecutedNumberOfModels"), is(0)); - - Assert.assertThat("vertexCoverage", results.getInt("vertexCoverage"), is(100)); - Assert.assertThat("totalNumberOfEdges", results.getInt("totalNumberOfEdges"), is(9)); - Assert.assertThat("totalNumberOfVisitedVertices", results.getInt("totalNumberOfVisitedVertices"), is(3)); - Assert.assertThat("totalNumberOfUnvisitedVertices", results.getInt("totalNumberOfUnvisitedVertices"), is(0)); - Assert.assertThat("totalNumberOfVisitedEdges", results.getInt("totalNumberOfVisitedEdges"), is(9)); - Assert.assertThat("edgeCoverage", results.getInt("edgeCoverage"), is(100)); - Assert.assertThat("totalNumberOfVertices", results.getInt("totalNumberOfVertices"), is(3)); - Assert.assertThat("totalNumberOfUnvisitedEdges", results.getInt("totalNumberOfUnvisitedEdges"), is(0)); + assertThat("totalNumberOfModels", results.getInt("totalNumberOfModels"), is(1)); + assertThat("totalCompletedNumberOfModels", results.getInt("totalCompletedNumberOfModels"), is(1)); + assertThat("totalIncompleteNumberOfModels", results.getInt("totalIncompleteNumberOfModels"), is(0)); + assertThat("totalFailedNumberOfModels", results.getInt("totalFailedNumberOfModels"), is(0)); + assertThat("totalNotExecutedNumberOfModels", results.getInt("totalNotExecutedNumberOfModels"), is(0)); + + assertThat("vertexCoverage", results.getInt("vertexCoverage"), is(100)); + assertThat("totalNumberOfEdges", results.getInt("totalNumberOfEdges"), is(9)); + assertThat("totalNumberOfVisitedVertices", results.getInt("totalNumberOfVisitedVertices"), is(3)); + assertThat("totalNumberOfUnvisitedVertices", results.getInt("totalNumberOfUnvisitedVertices"), is(0)); + assertThat("totalNumberOfVisitedEdges", results.getInt("totalNumberOfVisitedEdges"), is(9)); + assertThat("edgeCoverage", results.getInt("edgeCoverage"), is(100)); + assertThat("totalNumberOfVertices", results.getInt("totalNumberOfVertices"), is(3)); + assertThat("totalNumberOfUnvisitedEdges", results.getInt("totalNumberOfUnvisitedEdges"), is(0)); // The requirement part - Assert.assertThat("totalNumberOfRequirement", results.getInt("totalNumberOfRequirement"), is(3)); - Assert.assertThat("totalNumberOfUncoveredRequirement", results.getInt("totalNumberOfUncoveredRequirement"), is(0)); - Assert.assertThat("totalNumberOfPassedRequirement", results.getInt("totalNumberOfPassedRequirement"), is(3)); + assertThat("totalNumberOfRequirement", results.getInt("totalNumberOfRequirement"), is(3)); + assertThat("totalNumberOfUncoveredRequirement", results.getInt("totalNumberOfUncoveredRequirement"), is(0)); + assertThat("totalNumberOfPassedRequirement", results.getInt("totalNumberOfPassedRequirement"), is(3)); - Assert.assertThat("requirementsPassed", results.getJSONArray("requirementsPassed").length(), is(3)); + assertThat("requirementsPassed", results.getJSONArray("requirementsPassed").length(), is(3)); List requirements = new ArrayList<>(); for (int index = 0; index < results.getJSONArray("requirementsPassed").length(); index++) { requirements.add(results.getJSONArray("requirementsPassed").getJSONObject(index).getString("requirementKey")); } List expectedRequirements = Arrays.asList("Req 1", "Req 2", "Req 3"); Collections.sort(requirements); - Assert.assertThat("requirementsPassed list", requirements.toArray(), is(expectedRequirements.toArray())); + assertThat("requirementsPassed list", requirements.toArray(), is(expectedRequirements.toArray())); - Assert.assertThat("requirementsFailed", results.getJSONArray("requirementsFailed").length(), is(0)); + assertThat("requirementsFailed", results.getJSONArray("requirementsFailed").length(), is(0)); } /** @@ -123,43 +123,43 @@ public void dualPathModel() throws IOException { Executor executor = new TestExecutor(contexts); JSONObject results = executor.execute(true).getResults(); - Assert.assertThat("totalNumberOfModels", results.getInt("totalNumberOfModels"), is(1)); - Assert.assertThat("totalCompletedNumberOfModels", results.getInt("totalCompletedNumberOfModels"), is(0)); - Assert.assertThat("totalIncompleteNumberOfModels", results.getInt("totalIncompleteNumberOfModels"), is(0)); - Assert.assertThat("totalFailedNumberOfModels", results.getInt("totalFailedNumberOfModels"), is(1)); - Assert.assertThat("totalNotExecutedNumberOfModels", results.getInt("totalNotExecutedNumberOfModels"), is(0)); - - Assert.assertThat("vertexCoverage", results.getInt("vertexCoverage"), is(75)); - Assert.assertThat("totalNumberOfEdges", results.getInt("totalNumberOfEdges"), is(5)); - Assert.assertThat("totalNumberOfVisitedVertices", results.getInt("totalNumberOfVisitedVertices"), is(3)); - Assert.assertThat("totalNumberOfUnvisitedVertices", results.getInt("totalNumberOfUnvisitedVertices"), is(1)); - Assert.assertThat("totalNumberOfVisitedEdges", results.getInt("totalNumberOfVisitedEdges"), is(3)); - Assert.assertThat("edgeCoverage", results.getInt("edgeCoverage"), is(60)); - Assert.assertThat("totalNumberOfVertices", results.getInt("totalNumberOfVertices"), is(4)); - Assert.assertThat("totalNumberOfUnvisitedEdges", results.getInt("totalNumberOfUnvisitedEdges"), is(2)); + assertThat("totalNumberOfModels", results.getInt("totalNumberOfModels"), is(1)); + assertThat("totalCompletedNumberOfModels", results.getInt("totalCompletedNumberOfModels"), is(0)); + assertThat("totalIncompleteNumberOfModels", results.getInt("totalIncompleteNumberOfModels"), is(0)); + assertThat("totalFailedNumberOfModels", results.getInt("totalFailedNumberOfModels"), is(1)); + assertThat("totalNotExecutedNumberOfModels", results.getInt("totalNotExecutedNumberOfModels"), is(0)); + + assertThat("vertexCoverage", results.getInt("vertexCoverage"), is(75)); + assertThat("totalNumberOfEdges", results.getInt("totalNumberOfEdges"), is(5)); + assertThat("totalNumberOfVisitedVertices", results.getInt("totalNumberOfVisitedVertices"), is(3)); + assertThat("totalNumberOfUnvisitedVertices", results.getInt("totalNumberOfUnvisitedVertices"), is(1)); + assertThat("totalNumberOfVisitedEdges", results.getInt("totalNumberOfVisitedEdges"), is(3)); + assertThat("edgeCoverage", results.getInt("edgeCoverage"), is(60)); + assertThat("totalNumberOfVertices", results.getInt("totalNumberOfVertices"), is(4)); + assertThat("totalNumberOfUnvisitedEdges", results.getInt("totalNumberOfUnvisitedEdges"), is(2)); // Verify the list of unvisited vertices - Assert.assertThat("verticesNotVisited", results.getJSONArray("verticesNotVisited").length(), is(1)); + assertThat("verticesNotVisited", results.getJSONArray("verticesNotVisited").length(), is(1)); List unvisitedVertices = new ArrayList<>(); for (int index = 0; index < results.getJSONArray("verticesNotVisited").length(); index++) { unvisitedVertices.add(results.getJSONArray("verticesNotVisited").getJSONObject(index).getString("vertexName")); unvisitedVertices.add(results.getJSONArray("verticesNotVisited").getJSONObject(index).getString("vertexId")); } List expectedUnvisitedVertices = Arrays.asList("v3", "n3"); - Assert.assertThat("verticesNotVisited list", unvisitedVertices.toArray(), is(expectedUnvisitedVertices.toArray())); + assertThat("verticesNotVisited list", unvisitedVertices.toArray(), is(expectedUnvisitedVertices.toArray())); // Verify the list of unvisited edges - Assert.assertThat("edgesNotVisited", results.getJSONArray("edgesNotVisited").length(), is(2)); + assertThat("edgesNotVisited", results.getJSONArray("edgesNotVisited").length(), is(2)); List unvisitedEdges = new ArrayList<>(); for (int index = 0; index < results.getJSONArray("edgesNotVisited").length(); index++) { unvisitedEdges.add(results.getJSONArray("edgesNotVisited").getJSONObject(index).getString("edgeName")); unvisitedEdges.add(results.getJSONArray("edgesNotVisited").getJSONObject(index).getString("edgeId")); } List expectedUnvisitedEdges = Arrays.asList("e3", "e2", "e5", "e4"); - Assert.assertThat("edgesNotVisited list", unvisitedEdges.toArray(), is(expectedUnvisitedEdges.toArray())); + assertThat("edgesNotVisited list", unvisitedEdges.toArray(), is(expectedUnvisitedEdges.toArray())); - Assert.assertThat("failures", results.getJSONArray("failures").length(), is(1)); - Assert.assertThat("failure text", results.getJSONArray("failures").getJSONObject(0).getString("failure"), + assertThat("failures", results.getJSONArray("failures").length(), is(1)); + assertThat("failure text", results.getJSONArray("failures").getJSONObject(0).getString("failure"), new StringStartsWith("org.graphwalker.core.generator.NoPathFoundException: Could not find a valid path from element: v2")); } } diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/test/SimpleTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/test/SimpleTest.java index 3535db85b..27120c767 100644 --- a/graphwalker-java/src/test/java/org/graphwalker/java/test/SimpleTest.java +++ b/graphwalker-java/src/test/java/org/graphwalker/java/test/SimpleTest.java @@ -43,8 +43,8 @@ import java.util.Arrays; import java.util.Deque; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; /** * @author Nils Olsson diff --git a/graphwalker-java/src/test/java/org/graphwalker/java/test/TestExecutorTest.java b/graphwalker-java/src/test/java/org/graphwalker/java/test/TestExecutorTest.java index 0c58a5388..ea0f7e196 100644 --- a/graphwalker-java/src/test/java/org/graphwalker/java/test/TestExecutorTest.java +++ b/graphwalker-java/src/test/java/org/graphwalker/java/test/TestExecutorTest.java @@ -49,6 +49,7 @@ import java.util.Arrays; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; /** @@ -158,18 +159,18 @@ public void isolation() throws MalformedURLException { MachineConfiguration mc = reflector.getMachineConfiguration(); Result result = reflector.execute(); JSONObject results = result.getResults(); - Assert.assertThat(result.getErrors().size(), is(0)); - Assert.assertThat(results.getInt("totalFailedNumberOfModels"), is(0)); - Assert.assertThat(results.getInt("totalNotExecutedNumberOfModels"), is(0)); - Assert.assertThat(results.getInt("totalNumberOfUnvisitedVertices"), is(0)); - Assert.assertThat(results.getInt("totalNumberOfModels"), is(1)); - Assert.assertThat(results.getInt("totalCompletedNumberOfModels"), is(1)); - Assert.assertThat(results.getInt("totalNumberOfVisitedEdges"), is(1)); - Assert.assertThat(results.getInt("totalIncompleteNumberOfModels"), is(0)); - Assert.assertThat(results.getInt("totalNumberOfVisitedVertices"), is(2)); - Assert.assertThat(results.getInt("edgeCoverage"), is(100)); - Assert.assertThat(results.getInt("vertexCoverage"), is(100)); - Assert.assertThat(results.getInt("totalNumberOfUnvisitedEdges"), is(0)); + assertThat(result.getErrors().size(), is(0)); + assertThat(results.getInt("totalFailedNumberOfModels"), is(0)); + assertThat(results.getInt("totalNotExecutedNumberOfModels"), is(0)); + assertThat(results.getInt("totalNumberOfUnvisitedVertices"), is(0)); + assertThat(results.getInt("totalNumberOfModels"), is(1)); + assertThat(results.getInt("totalCompletedNumberOfModels"), is(1)); + assertThat(results.getInt("totalNumberOfVisitedEdges"), is(1)); + assertThat(results.getInt("totalIncompleteNumberOfModels"), is(0)); + assertThat(results.getInt("totalNumberOfVisitedVertices"), is(2)); + assertThat(results.getInt("edgeCoverage"), is(100)); + assertThat(results.getInt("vertexCoverage"), is(100)); + assertThat(results.getInt("totalNumberOfUnvisitedEdges"), is(0)); } @GraphWalker(start = "throwException") @@ -249,7 +250,7 @@ public void multilpeContexts() throws IOException { contexts.get(3), contexts.get(4) ); - Assert.assertThat(executor.getMachine().getContexts().size(), is(5)); + assertThat(executor.getMachine().getContexts().size(), is(5)); } @Test diff --git a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextCheckerTest.java b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextCheckerTest.java index 7c4b86d1b..292ed1550 100644 --- a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextCheckerTest.java +++ b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextCheckerTest.java @@ -7,11 +7,11 @@ import org.graphwalker.core.model.Model; import org.graphwalker.core.model.Vertex; import org.graphwalker.io.factory.json.JsonContext; -import org.junit.Assert; import org.junit.Test; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; /** @@ -23,14 +23,14 @@ public class ContextCheckerTest { public void testDefault() { Context context = new JsonContext(); List issues = ContextChecker.hasIssues(context); - Assert.assertThat(issues.size(), is(1)); - Assert.assertThat(issues.get(0), is("No model found in context")); + assertThat(issues.size(), is(1)); + assertThat(issues.get(0), is("No model found in context")); Model model = new Model(); context.setModel(model.build()); issues = ContextChecker.hasIssues(context); - Assert.assertThat(issues.size(), is(1)); - Assert.assertThat(issues.get(0), is("The model has neither a start element or a defined shared state.")); + assertThat(issues.size(), is(1)); + assertThat(issues.get(0), is("The model has neither a start element or a defined shared state.")); Vertex v1 = new Vertex().setName("v1").setId("v1"); Vertex v2 = new Vertex().setName("v2").setId("v2"); @@ -38,7 +38,7 @@ public void testDefault() { context.setNextElement(v1); context.setModel(model.build()); issues = ContextChecker.hasIssues(context); - Assert.assertThat(issues.size(), is(0)); + assertThat(issues.size(), is(0)); } @Test @@ -59,8 +59,8 @@ public void testRandomGeneratorFullEdgeCoverageNonStronglyConnectedGraph() { context.setNextElement(context.getModel().findElements("e0").get(0)); List issues = ContextChecker.hasIssues(context); - Assert.assertThat(issues.size(), is(1)); - Assert.assertThat(issues.get(0), is("The model has multiple cul-de-sacs, and is requested to run using a random " + + assertThat(issues.size(), is(1)); + assertThat(issues.get(0), is("The model has multiple cul-de-sacs, and is requested to run using a random " + "path generator and 100% edge coverage. That will not work.")); model.addEdge(new Edge().setSourceVertex(v4).setTargetVertex(v2).setName("e4").setId("e4")); @@ -69,8 +69,8 @@ public void testRandomGeneratorFullEdgeCoverageNonStronglyConnectedGraph() { context.setNextElement(context.getModel().findElements("e0").get(0)); issues = ContextChecker.hasIssues(context); - Assert.assertThat(issues.size(), is(1)); - Assert.assertThat(issues.get(0), is("The model has one cul-de-sacs, and is requested to run using a random " + + assertThat(issues.size(), is(1)); + assertThat(issues.get(0), is("The model has one cul-de-sacs, and is requested to run using a random " + "path generator and 100% edge coverage. That might not work.")); } } diff --git a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextsCheckerTest.java b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextsCheckerTest.java index 0ec2c9759..2906b5bc9 100644 --- a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextsCheckerTest.java +++ b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ContextsCheckerTest.java @@ -2,13 +2,13 @@ import org.graphwalker.core.machine.Context; import org.graphwalker.io.factory.json.JsonContextFactory; -import org.junit.Assert; import org.junit.Test; import java.io.IOException; import java.nio.file.Paths; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; /** @@ -20,6 +20,6 @@ public class ContextsCheckerTest { public void testDefault() throws IOException { List contexts = new JsonContextFactory().create(Paths.get("json/petClinic.json")); List issues = ContextsChecker.hasIssues(contexts); - Assert.assertThat(issues.size(), is(0)); + assertThat(issues.size(), is(0)); } } diff --git a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/EdgeCheckerTest.java b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/EdgeCheckerTest.java index b368ea248..84ad3541f 100644 --- a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/EdgeCheckerTest.java +++ b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/EdgeCheckerTest.java @@ -2,11 +2,11 @@ import org.graphwalker.core.model.Edge; import org.graphwalker.core.model.Vertex; -import org.junit.Assert; import org.junit.Test; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; /** @@ -17,22 +17,22 @@ public class EdgeCheckerTest { @Test public void testDefault() { List issues = EdgeChecker.hasIssues(new Edge().build()); - Assert.assertThat(issues.size(), is(1)); - Assert.assertThat(issues.get(0), is("Edge must have a target vertex.")); + assertThat(issues.size(), is(1)); + assertThat(issues.get(0), is("Edge must have a target vertex.")); issues = EdgeChecker.hasIssues(new Edge().setTargetVertex(new Vertex()).build()); - Assert.assertThat(issues.size(), is(0)); + assertThat(issues.size(), is(0)); } @Test public void testName() { Edge edge = new Edge().setTargetVertex(new Vertex()); List issues = EdgeChecker.hasIssues(edge.setName("").build()); - Assert.assertThat(issues.size(), is(0)); + assertThat(issues.size(), is(0)); issues = EdgeChecker.hasIssues(edge.setName("spaces in name").build()); - Assert.assertThat(issues.size(), is(1)); - Assert.assertThat(issues.get(0), is("Name of edge cannot have any white spaces.")); + assertThat(issues.size(), is(1)); + assertThat(issues.get(0), is("Name of edge cannot have any white spaces.")); } @Test @@ -40,11 +40,11 @@ public void testWeight() { Edge edge = new Edge().setTargetVertex(new Vertex()); edge.setWeight(-1.); List issues = EdgeChecker.hasIssues(edge.setName("").build()); - Assert.assertThat(issues.size(), is(1)); - Assert.assertThat(issues.get(0), is("The weight must be a value between 0 and 1.")); + assertThat(issues.size(), is(1)); + assertThat(issues.get(0), is("The weight must be a value between 0 and 1.")); edge.setWeight(.5); issues = EdgeChecker.hasIssues(edge.setName("").build()); - Assert.assertThat(issues.size(), is(0)); + assertThat(issues.size(), is(0)); } } diff --git a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ElementCheckerTest.java b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ElementCheckerTest.java index 56781c654..84aa29df2 100644 --- a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ElementCheckerTest.java +++ b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ElementCheckerTest.java @@ -4,11 +4,11 @@ import org.graphwalker.core.model.Edge; import org.graphwalker.core.model.Requirement; import org.graphwalker.core.model.Vertex; -import org.junit.Assert; import org.junit.Test; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; /** @@ -19,22 +19,22 @@ public class ElementCheckerTest { @Test public void testDefault() { List issues = ElementChecker.hasIssues(new Vertex().build()); - Assert.assertThat(issues.size(), is(0)); + assertThat(issues.size(), is(0)); } @Test public void testRequirement() { Vertex vertex = new Vertex().addRequirement(new Requirement("")); List issues = ElementChecker.hasIssues(vertex.build()); - Assert.assertThat(issues.size(), is(1)); - Assert.assertThat(issues.get(0), is("Requirement cannot be an empty string")); + assertThat(issues.size(), is(1)); + assertThat(issues.get(0), is("Requirement cannot be an empty string")); } @Test public void testActions() { Edge edge = new Edge().addAction(new Action("")); List issues = ElementChecker.hasIssues(edge.build()); - Assert.assertThat(issues.size(), is(1)); - Assert.assertThat(issues.get(0), is("Script statement cannot be an empty string")); + assertThat(issues.size(), is(1)); + assertThat(issues.get(0), is("Script statement cannot be an empty string")); } } diff --git a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ModelCheckerTest.java b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ModelCheckerTest.java index 0c6f71e2e..efd5a7915 100644 --- a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ModelCheckerTest.java +++ b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/ModelCheckerTest.java @@ -3,12 +3,12 @@ import org.graphwalker.core.model.Edge; import org.graphwalker.core.model.Model; import org.graphwalker.core.model.Vertex; -import org.junit.Assert; import org.junit.Test; import java.util.List; import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; /** @@ -19,7 +19,7 @@ public class ModelCheckerTest { @Test public void testDefault() { List issues = ModelChecker.hasIssues(new Model().build()); - Assert.assertThat(issues.size(), is(0)); + assertThat(issues.size(), is(0)); } @Test @@ -27,8 +27,8 @@ public void testInvalidElement() { Model model = new Model(); model.addVertex(new Vertex()); List issues = ModelChecker.hasIssues(model.build()); - Assert.assertThat(issues.size(), is(1)); - Assert.assertThat(issues.get(0), is("Name of vertex cannot be null")); + assertThat(issues.size(), is(1)); + assertThat(issues.get(0), is("Name of vertex cannot be null")); } @Test @@ -37,8 +37,8 @@ public void testNotUniqueElementIds() { model.addVertex(new Vertex().setId("NOTUNIQUEID").setName("SomeName")); model.addVertex(new Vertex().setId("NOTUNIQUEID").setName("SomeOtherName")); List issues = ModelChecker.hasIssues(model.build()); - Assert.assertThat(issues.size(), is(1)); - Assert.assertThat(issues.get(0), is("Id of the vertex is not unique: NOTUNIQUEID")); + assertThat(issues.size(), is(1)); + assertThat(issues.get(0), is("Id of the vertex is not unique: NOTUNIQUEID")); } @Test @@ -47,7 +47,7 @@ public void testUnnamedSelfLoop() { Vertex vertex = new Vertex().setName("SomeName").setId("SomeId"); model.addVertex(vertex).addEdge(new Edge().setSourceVertex(vertex).setTargetVertex(vertex)); List issues = ModelChecker.hasIssues(model.build()); - Assert.assertThat(issues.size(), is(1)); - Assert.assertThat(issues.get(0), containsString(", have a unnamed self loop edge.")); + assertThat(issues.size(), is(1)); + assertThat(issues.get(0), containsString(", have a unnamed self loop edge.")); } } diff --git a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/VertexCheckerTest.java b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/VertexCheckerTest.java index 1cbb66f10..4eb1a0686 100644 --- a/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/VertexCheckerTest.java +++ b/graphwalker-model-checker/src/test/java/org/graphwalker/modelchecker/VertexCheckerTest.java @@ -1,11 +1,11 @@ package org.graphwalker.modelchecker; import org.graphwalker.core.model.Vertex; -import org.junit.Assert; import org.junit.Test; import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; /** @@ -16,22 +16,22 @@ public class VertexCheckerTest { @Test public void testDefault() { List issues = VertexChecker.hasIssues(new Vertex().build()); - Assert.assertThat(issues.size(), is(1)); - Assert.assertThat(issues.get(0), is("Name of vertex cannot be null")); + assertThat(issues.size(), is(1)); + assertThat(issues.get(0), is("Name of vertex cannot be null")); issues = VertexChecker.hasIssues(new Vertex().setName("name").build()); - Assert.assertThat(issues.size(), is(0)); + assertThat(issues.size(), is(0)); } @Test public void testName() { Vertex vertex = new Vertex(); List issues = VertexChecker.hasIssues(vertex.setName("").build()); - Assert.assertThat(issues.size(), is(1)); - Assert.assertThat(issues.get(0), is("Name of vertex cannot be an empty string")); + assertThat(issues.size(), is(1)); + assertThat(issues.get(0), is("Name of vertex cannot be an empty string")); issues = VertexChecker.hasIssues(vertex.setName("spaces in name").build()); - Assert.assertThat(issues.size(), is(1)); - Assert.assertThat(issues.get(0), is("Name of vertex cannot have any white spaces.")); + assertThat(issues.size(), is(1)); + assertThat(issues.get(0), is("Name of vertex cannot have any white spaces.")); } } diff --git a/graphwalker-restful/src/test/java/org/graphwalker/restful/RestTest.java b/graphwalker-restful/src/test/java/org/graphwalker/restful/RestTest.java index 37f1f3a35..2e074c717 100644 --- a/graphwalker-restful/src/test/java/org/graphwalker/restful/RestTest.java +++ b/graphwalker-restful/src/test/java/org/graphwalker/restful/RestTest.java @@ -44,7 +44,6 @@ import org.graphwalker.java.test.TestExecutionException; import org.graphwalker.java.test.TestExecutor; import org.json.JSONObject; -import org.junit.Assert; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; import org.slf4j.Logger; @@ -52,7 +51,9 @@ import java.io.IOException; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; +import static org.junit.Assert.*; /** * Created by krikar on 10/10/14. @@ -94,7 +95,7 @@ public void testRun() throws IOException { for (String error : e.getResult().getErrors()) { System.err.println(error); } - Assert.fail("Did not expect any errors"); + fail("Did not expect any errors"); } } } @@ -103,7 +104,7 @@ private CloseableHttpResponse httpExecute(HttpRequestBase request) { try { return HttpClientBuilder.create().build().execute(request); } catch (IOException e) { - Assert.fail(e.getMessage()); + fail(e.getMessage()); } return null; } @@ -120,8 +121,8 @@ public void e_SetData() { @Override public void v_EmptyMachine() { - Assert.assertNull(rest.getContexts()); - Assert.assertNull(rest.getMachine()); + assertNull(rest.getContexts()); + assertNull(rest.getMachine()); } @Override @@ -141,15 +142,15 @@ public void e_Restart() { @Override public void v_RestRunning() { - Assert.assertThat(response.getStatusLine().getStatusCode(), is(200)); + assertThat(response.getStatusLine().getStatusCode(), is(200)); String body = getResonseBody(); logger.debug(body); - Assert.assertThat(body, is("{\"result\":\"ok\"}")); - Assert.assertNotNull(rest.getContexts()); - Assert.assertNotNull(rest.getMachine()); + assertThat(body, is("{\"result\":\"ok\"}")); + assertNotNull(rest.getContexts()); + assertNotNull(rest.getMachine()); response = httpExecute(new HttpGet("http://localhost:9191/graphwalker/getStatistics")); - Assert.assertThat(response.getStatusLine().getStatusCode(), is(200)); + assertThat(response.getStatusLine().getStatusCode(), is(200)); body = getResonseBody(); logger.debug(body); JSONObject responseJSON = new JSONObject(body); @@ -180,29 +181,29 @@ public void e_HasNext() { @Override public void v_GetData() { - Assert.assertThat(response.getStatusLine().getStatusCode(), is(200)); + assertThat(response.getStatusLine().getStatusCode(), is(200)); String body = getResonseBody(); logger.debug(body); JSONObject responseJSON = new JSONObject(body); JSONAssert.assertEquals("Result should be ok", "{result:\"ok\"}", responseJSON, false); JSONAssert.assertEquals("Wrong value of num_of_books", "{data:{num_of_books:\"0\"}}", responseJSON, false); JSONAssert.assertEquals("Wrong value of MAX_BOOKS", "{data:{MAX_BOOKS:\"5\"}}", responseJSON, false); - Assert.assertNotNull(rest.getContexts()); - Assert.assertNotNull(rest.getMachine()); + assertNotNull(rest.getContexts()); + assertNotNull(rest.getMachine()); } private String getResonseBody() { try { return new BasicResponseHandler().handleResponse(response); } catch (IOException e) { - Assert.fail(e.getMessage()); + fail(e.getMessage()); } return null; } @Override public void v_GetNext() { - Assert.assertThat(response.getStatusLine().getStatusCode(), is(200)); + assertThat(response.getStatusLine().getStatusCode(), is(200)); String body = getResonseBody(); logger.debug(body); JSONObject responseJSON = new JSONObject(body); @@ -216,13 +217,13 @@ public void v_GetNext() { //JSONAssert.assertEquals("Wrong data", "{data:[{num_of_books:\"0\"},{MAX_BOOKS:\"5\"}]}", responseJSON, new ArraySizeComparator(JSONCompareMode.LENIENT)); JSONAssert.assertEquals("Wrong number of unvisited elements", "{numberOfUnvisitedElements:18}", responseJSON, false); - Assert.assertNotNull(rest.getContexts()); - Assert.assertNotNull(rest.getMachine()); + assertNotNull(rest.getContexts()); + assertNotNull(rest.getMachine()); } @Override public void v_GetStatistics() { - Assert.assertThat(response.getStatusLine().getStatusCode(), is(200)); + assertThat(response.getStatusLine().getStatusCode(), is(200)); String body = getResonseBody(); logger.debug(body); JSONObject responseJSON = new JSONObject(body); @@ -235,27 +236,27 @@ public void v_GetStatistics() { JSONAssert.assertEquals("Wrong number of unvisited vertices", "{totalNumberOfUnvisitedVertices:7}", responseJSON, false); JSONAssert.assertEquals("Wrong number of vertex coverage", "{vertexCoverage:0}", responseJSON, false); JSONAssert.assertEquals("Wrong number of unvisited edges", "{totalNumberOfUnvisitedEdges:11}", responseJSON, false); - Assert.assertNotNull(rest.getContexts()); - Assert.assertNotNull(rest.getMachine()); + assertNotNull(rest.getContexts()); + assertNotNull(rest.getMachine()); } @Override public void v_HasNext() { - Assert.assertThat(response.getStatusLine().getStatusCode(), is(200)); + assertThat(response.getStatusLine().getStatusCode(), is(200)); String body = getResonseBody(); logger.debug(body); - Assert.assertThat(body, is("{\"result\":\"ok\",\"hasNext\":\"true\"}")); - Assert.assertNotNull(rest.getContexts()); - Assert.assertNotNull(rest.getMachine()); + assertThat(body, is("{\"result\":\"ok\",\"hasNext\":\"true\"}")); + assertNotNull(rest.getContexts()); + assertNotNull(rest.getMachine()); } @Override public void v_SetData() { - Assert.assertThat(response.getStatusLine().getStatusCode(), is(200)); + assertThat(response.getStatusLine().getStatusCode(), is(200)); String body = getResonseBody(); logger.debug(body); - Assert.assertThat(body, is("{\"result\":\"ok\"}")); - Assert.assertNotNull(rest.getContexts()); - Assert.assertNotNull(rest.getMachine()); + assertThat(body, is("{\"result\":\"ok\"}")); + assertNotNull(rest.getContexts()); + assertNotNull(rest.getMachine()); } } diff --git a/graphwalker-websocket/src/test/java/org/graphwalker/websocket/WebSocketServerTest.java b/graphwalker-websocket/src/test/java/org/graphwalker/websocket/WebSocketServerTest.java index 896761409..63f35b532 100644 --- a/graphwalker-websocket/src/test/java/org/graphwalker/websocket/WebSocketServerTest.java +++ b/graphwalker-websocket/src/test/java/org/graphwalker/websocket/WebSocketServerTest.java @@ -34,7 +34,6 @@ import org.graphwalker.java.test.TestExecutor; import org.java_websocket.WebSocket; import org.json.JSONObject; -import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +41,10 @@ import java.io.IOException; import java.nio.file.Paths; +import static com.ibm.icu.impl.Assert.fail; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.*; /** * Created by krikar on 10/10/14. @@ -74,7 +76,7 @@ public void testRun() throws IOException { for (String error : e.getResult().getErrors()) { System.err.println(error); } - Assert.fail("Did not expect any errors"); + fail("Did not expect any errors"); } } } @@ -93,7 +95,7 @@ public void e_Connect() { @Override public void v_MachineRunning() { WebSocket socket = server.getSockets().iterator().next(); - Assert.assertNotNull(server.getMachines().get(socket)); + assertNotNull(server.getMachines().get(socket)); } @Override @@ -103,18 +105,18 @@ public void e_HasNext() { @Override public void v_EmptyMachine() { - Assert.assertThat("Before we connected, we should have no connections", numberOfConnections, is(0)); - Assert.assertThat("We should now haw 1 connection", server.getSockets().size(), is(1)); - Assert.assertThat(server.getMachines().size(), is(1)); + assertThat("Before we connected, we should have no connections", numberOfConnections, is(0)); + assertThat("We should now haw 1 connection", server.getSockets().size(), is(1)); + assertThat(server.getMachines().size(), is(1)); WebSocket socket = server.getSockets().iterator().next(); - Assert.assertNull(server.getMachines().get(socket)); + assertNull(server.getMachines().get(socket)); } @Override public void e_GetData() { String response = client.getData(); JSONObject jsonObject = new JSONObject(response); - Assert.assertEquals(expectedValue, jsonObject.getInt("value")); + assertEquals(expectedValue, jsonObject.getInt("value")); } @Override From 1c07c2c0963abdbd7d98eabc4cdb144cd7e7a9fe Mon Sep 17 00:00:00 2001 From: Robert-96 Date: Mon, 21 Nov 2022 14:24:00 +0200 Subject: [PATCH 04/14] Fix conflicts --- .../java/org/graphwalker/cli/CheckTest.java | 10 ------- .../org/graphwalker/cli/ConvertFilesTest.java | 6 ---- .../graphwalker/cli/CorrectModelsTest.java | 29 ------------------- .../org/graphwalker/cli/IOErrorsTest.java | 7 ----- .../java/org/graphwalker/cli/MethodsTest.java | 5 ---- .../org/graphwalker/cli/PrintHelpTest.java | 5 ---- .../org/graphwalker/cli/PrintVersionTest.java | 5 ---- .../org/graphwalker/cli/RequirementsTest.java | 4 --- .../java/org/graphwalker/cli/SourceTest.java | 10 ------- 9 files changed, 81 deletions(-) diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java index eded5f24d..b1615e15e 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java @@ -41,27 +41,17 @@ public class CheckTest extends CLITestRoot { public void check() throws IOException { String args[] = {"check", "-m", "graphml/online/ShoppingCart.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("No issues found with the model(s).")); -======= - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), containsString("No issues found with the model(s).")); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } @Test public void checkWithBlocked() throws IOException { String args[] = {"check", "-m", "graphml/online/ShoppingCart.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("No issues found with the model(s).")); -======= - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), containsString("No issues found with the model(s).")); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java index 9d1d2ade1..8510dac64 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java @@ -46,15 +46,9 @@ public class ConvertFilesTest extends CLITestRoot { public void convertGraphmlToJava() throws IOException { String args[] = {"convert", "--input", "graphml/UC01_GW2.graphml", "--format", "java"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); // TODO: Fix test // Assert.assertTrue(tempFile.length() > 0); -======= - assertThat(result.getError(), is("")); - //TODO:Fix test -// Assert.assertTrue(tempFile.length() > 0); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java index bbf062a98..b95b3326e 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java @@ -67,14 +67,9 @@ public class CorrectModelsTest extends CLITestRoot { public void simplestModel() { String args[] = {"offline", "-m", "graphml/CorrectModels/simplestModel.graphml", "random(vertex_coverage(100))"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + -======= - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + ->>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"v1\"}" + System.lineSeparator())); } @@ -85,14 +80,9 @@ public void simplestModel() { public void shortestAllPathsVertexCoverage() { String args[] = {"offline", "-m", "graphml/CorrectModels/shortestAllPathsVertexCoverage.graphml", "shortest_all_paths(vertex_coverage(100))"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + -======= - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + ->>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"v1\"}" + System.lineSeparator() + "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + "{\"currentElementName\":\"v2\"}" + System.lineSeparator() + @@ -111,12 +101,8 @@ public void shortestAllPathsVertexCoverage() { public void loginNoErrors() { String args[] = {"offline", "-o", "-m", "graphml/Login.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); -======= - assertThat(result.getError(), is("")); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } /** @@ -166,14 +152,9 @@ public void dontUseBlocked() { public void useBlocked() { String args[] = {"offline", "-m", "graphml/CorrectModels/blockedVertex.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + -======= - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + ->>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"v1\"}" + System.lineSeparator())); } @@ -184,14 +165,9 @@ public void useBlocked() { public void dontUseBlockedJson() { String args[] = {"offline", "-b", "false", "-g", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), -======= - assertThat(result.getError(), is("")); - assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), ->>>>>>> 3036b2c4 (Replace deprecated assertThat) hasItems("{\"currentElementName\":\"e1\"}", "{\"currentElementName\":\"e2\"}", "{\"currentElementName\":\"e3\"}", @@ -216,14 +192,9 @@ public void dontUseBlockedJson() { public void useBlockedJson() { String args[] = {"offline", "-g", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), -======= - assertThat(result.getError(), is("")); - assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), ->>>>>>> 3036b2c4 (Replace deprecated assertThat) hasItems("{\"currentElementName\":\"e1\"}", "{\"currentElementName\":\"e2\"}", "{\"currentElementName\":\"e3\"}", diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java index 618f3d5e0..14d58d825 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java @@ -41,17 +41,10 @@ public class IOErrorsTest extends CLITestRoot { public void nonExistentFile() { String args[] = {"offline", "-m", "sdsdtkdsjhsl.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(2)); Assert.assertThat(result.getOutput(), is("")); Assert.assertThat(result.getError(), is("An error occurred when running command: " + "offline -m sdsdtkdsjhsl.graphml random(edge_coverage(100))" + System.lineSeparator() + "Could not read the file." + System.lineSeparator() + System.lineSeparator())); -======= - assertThat(result.getError(), is("An error occurred when running command: " + - "offline -m sdsdtkdsjhsl.graphml random(edge_coverage(100))" + - System.lineSeparator() + "Could not read the file." + System.lineSeparator() + System.lineSeparator())); - assertThat(result.getOutput(), is("")); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java index 9147942f8..236a61800 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java @@ -65,14 +65,9 @@ public void methodsDontUseBlockedFeature() throws IOException { public void methodsUseBlockedFeature() throws IOException { String args[] = {"methods", "-m", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(Arrays.asList(result.getOutput().split("\\s+")), -======= - assertThat(result.getError(), is("")); - assertThat(Arrays.asList(result.getOutput().split("\\s+")), ->>>>>>> 3036b2c4 (Replace deprecated assertThat) containsInAnyOrder("e1", "e2", "e3", diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java index 824143236..4d1b31bd1 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java @@ -41,13 +41,8 @@ public class PrintHelpTest extends CLITestRoot { public void help() throws IOException { String args[] = {"--help"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("Usage: graphwalker [options] [command] [command options]")); -======= - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), containsString("Usage: graphwalker [options] [command] [command options]")); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java index 347d9132e..4a0f060f8 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java @@ -41,13 +41,8 @@ public class PrintVersionTest extends CLITestRoot { public void version() throws IOException { String args[] = {"--version"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("org.graphwalker version: ")); -======= - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), containsString("org.graphwalker version: ")); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java index 32449fed9..42f239f66 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java @@ -43,12 +43,8 @@ public class RequirementsTest extends CLITestRoot { public void requirements() throws IOException { String args[] = {"requirements", "-m", "graphml/online/ShoppingCart.graphml"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); -======= - assertThat(result.getError(), is("")); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) List array = Arrays.asList(result.getOutput().split("\n")); for (int i = 0; i < array.size(); i++) { diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java index 386f2994a..49809f55f 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java @@ -41,27 +41,17 @@ public class SourceTest extends CLITestRoot { public void generatePerl() throws IOException { String args[] = {"source", "--input", "json/example.json", "template/perl.template"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertTrue(result.getOutput().length() > 1200 && result.getOutput().length() < 1300); -======= - assertThat(result.getError(), is("")); - assertTrue(result.getOutput().length() > 1200 && result.getOutput().length() < 1300); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } @Test public void generatePython() throws IOException { String args[] = {"source", "--input", "json/example.json", "template/python.template"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertTrue(result.getOutput().length() > 950 && result.getOutput().length() < 1150); -======= - assertThat(result.getError(), is("")); - assertTrue(result.getOutput().length() > 950 && result.getOutput().length() < 1150); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } } From 100b205c76f5e434de139b98472e167d0a294e86 Mon Sep 17 00:00:00 2001 From: Robert-96 Date: Wed, 19 Oct 2022 18:03:06 +0300 Subject: [PATCH 05/14] Update error messages --- .../src/main/java/org/graphwalker/cli/CLI.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/graphwalker-cli/src/main/java/org/graphwalker/cli/CLI.java b/graphwalker-cli/src/main/java/org/graphwalker/cli/CLI.java index ab4fc06a7..7afd2e4f6 100644 --- a/graphwalker-cli/src/main/java/org/graphwalker/cli/CLI.java +++ b/graphwalker-cli/src/main/java/org/graphwalker/cli/CLI.java @@ -329,8 +329,7 @@ private void runCommandConvert() throws Exception, UnsupportedFileFormat { try { contexts = inputFactory.create(Paths.get(inputFileName)); } catch (DslException e) { - System.err.println("When parsing model: '" + inputFileName + "' " + e.getMessage() + System.lineSeparator()); - throw new Exception("Model syntax error"); + throw new Exception("The following syntax error occurred when parsing: '" + inputFileName + "': " + e.getMessage() + System.lineSeparator()); } if (convert.blocked) { @@ -355,8 +354,7 @@ private void runCommandSource() throws Exception, UnsupportedFileFormat { throw new RuntimeException("No valid models found in: " + modelFileName); } } catch (DslException e) { - System.err.println("When parsing model: '" + modelFileName + "' " + e.getMessage() + System.lineSeparator()); - throw new Exception("Model syntax error"); + throw new Exception("The following syntax error occurred when parsing: '" + modelFileName + "': " + e.getMessage() + System.lineSeparator()); } if (source.blocked) { @@ -455,9 +453,9 @@ public List getContextsWithPathGenerators(Iterator itr) throws Exceptio try { contexts = factory.create(Paths.get(modelFileName)); } catch (DslException e) { - System.err.println("When parsing model: '" + modelFileName + "' " + e.getMessage() + System.lineSeparator()); - throw new Exception("Model syntax error."); + throw new Exception("The following error occurred when parsing: '" + modelFileName + "'." + System.lineSeparator() + e.getMessage() + System.lineSeparator()); } + // TODO fix all occurrences of get(0) is not safe contexts.get(0).setPathGenerator(GeneratorFactory.parse((String) itr.next())); @@ -473,9 +471,9 @@ public List getContextsWithPathGenerators(Iterator itr) throws Exceptio } if (elements == null) { - throw new ParameterException("--start-element Did not find matching element in the model: " + modelFileName); + throw new ParameterException("--start-element Did not find matching element in the model: '" + modelFileName + "'."); } else if (elements.size() > 1) { - throw new ParameterException("--start-element There are more than one matching element in the model: " + modelFileName); + throw new ParameterException("--start-element There are more than one matching element in the model: '" + modelFileName + "'."); } contexts.get(0).setNextElement(elements.get(0)); } From c21ea6c9c8daeea4ffe045b725e47141567e4721 Mon Sep 17 00:00:00 2001 From: Robert-96 Date: Mon, 21 Nov 2022 14:31:59 +0200 Subject: [PATCH 06/14] Fix conflicts --- .../src/test/java/org/graphwalker/cli/CheckTest.java | 10 ++++++++++ .../java/org/graphwalker/cli/ConvertFilesTest.java | 6 ++++++ .../java/org/graphwalker/cli/CorrectModelsTest.java | 11 ----------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java index b1615e15e..eded5f24d 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java @@ -41,17 +41,27 @@ public class CheckTest extends CLITestRoot { public void check() throws IOException { String args[] = {"check", "-m", "graphml/online/ShoppingCart.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("No issues found with the model(s).")); +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), containsString("No issues found with the model(s).")); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } @Test public void checkWithBlocked() throws IOException { String args[] = {"check", "-m", "graphml/online/ShoppingCart.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("No issues found with the model(s).")); +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), containsString("No issues found with the model(s).")); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java index 8510dac64..9d1d2ade1 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java @@ -46,9 +46,15 @@ public class ConvertFilesTest extends CLITestRoot { public void convertGraphmlToJava() throws IOException { String args[] = {"convert", "--input", "graphml/UC01_GW2.graphml", "--format", "java"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); // TODO: Fix test // Assert.assertTrue(tempFile.length() > 0); +======= + assertThat(result.getError(), is("")); + //TODO:Fix test +// Assert.assertTrue(tempFile.length() > 0); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java index b95b3326e..89b150e7a 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java @@ -112,14 +112,8 @@ public void loginNoErrors() { public void noStartVertex() { String args[] = {"offline", "-e", "v1", "-m", "graphml/CorrectModels/modelWithNoStartVertex.graphml", "a_star(reached_edge(e4))"}; Result result = runCommand(args); -<<<<<<< HEAD - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); - Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"v1\"}" + System.lineSeparator() + -======= assertThat(result.getError(), is("")); assertThat(result.getOutput(), is("{\"currentElementName\":\"v1\"}" + System.lineSeparator() + ->>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + "{\"currentElementName\":\"v2\"}" + System.lineSeparator() + "{\"currentElementName\":\"e4\"}" + System.lineSeparator())); @@ -132,14 +126,9 @@ public void noStartVertex() { public void dontUseBlocked() { String args[] = {"offline", "-b", "false", "-m", "graphml/CorrectModels/blockedVertex.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + -======= - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + ->>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"v1\"}" + System.lineSeparator() + "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + "{\"currentElementName\":\"v2\"}" + System.lineSeparator())); From c6891b5c3423d668a6695ea418b62541fb71e92b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 19:02:54 +0000 Subject: [PATCH 07/14] Bump loader-utils from 1.4.0 to 1.4.1 in /graphwalker-studio Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.1/CHANGELOG.md) - [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.1) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] --- graphwalker-studio/package-lock.json | 120 +++++++++++---------------- 1 file changed, 48 insertions(+), 72 deletions(-) diff --git a/graphwalker-studio/package-lock.json b/graphwalker-studio/package-lock.json index 970db6045..e994c5034 100644 --- a/graphwalker-studio/package-lock.json +++ b/graphwalker-studio/package-lock.json @@ -50,7 +50,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", - "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.1.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -74,7 +73,6 @@ "version": "7.19.4", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.4.tgz", "integrity": "sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw==", - "dev": true, "engines": { "node": ">=6.9.0" } @@ -83,7 +81,6 @@ "version": "7.19.3", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz", "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==", - "dev": true, "dependencies": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", @@ -163,7 +160,6 @@ "version": "7.19.3", "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz", "integrity": "sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==", - "dev": true, "dependencies": { "@babel/compat-data": "^7.19.3", "@babel/helper-validator-option": "^7.18.6", @@ -301,7 +297,6 @@ "version": "7.19.0", "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz", "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==", - "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-module-imports": "^7.18.6", @@ -374,7 +369,6 @@ "version": "7.19.4", "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz", "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==", - "dev": true, "dependencies": { "@babel/types": "^7.19.4" }, @@ -425,7 +419,6 @@ "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==", - "dev": true, "engines": { "node": ">=6.9.0" } @@ -449,7 +442,6 @@ "version": "7.19.4", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.4.tgz", "integrity": "sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==", - "dev": true, "dependencies": { "@babel/template": "^7.18.10", "@babel/traverse": "^7.19.4", @@ -1964,7 +1956,6 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", - "dev": true, "dependencies": { "@jridgewell/set-array": "^1.0.0", "@jridgewell/sourcemap-codec": "^1.4.10" @@ -2876,7 +2867,6 @@ "version": "4.21.4", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", - "dev": true, "funding": [ { "type": "opencollective", @@ -3674,8 +3664,7 @@ "node_modules/electron-to-chromium": { "version": "1.4.282", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.282.tgz", - "integrity": "sha512-Dki0WhHNh/br/Xi1vAkueU5mtIc9XLHcMKB6tNfQKk+kPG0TEUjRh5QEMAUbRp30/rYNMFD1zKKvbVzwq/4wmg==", - "dev": true + "integrity": "sha512-Dki0WhHNh/br/Xi1vAkueU5mtIc9XLHcMKB6tNfQKk+kPG0TEUjRh5QEMAUbRp30/rYNMFD1zKKvbVzwq/4wmg==" }, "node_modules/emojis-list": { "version": "3.0.0", @@ -3808,7 +3797,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, "engines": { "node": ">=6" } @@ -4346,7 +4334,6 @@ "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true, "engines": { "node": ">=6.9.0" } @@ -5452,7 +5439,6 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", - "dev": true, "bin": { "json5": "lib/cli.js" }, @@ -5520,9 +5506,9 @@ } }, "node_modules/loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", + "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", "dev": true, "dependencies": { "big.js": "^5.2.2", @@ -5838,8 +5824,7 @@ "node_modules/node-releases": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", - "dev": true + "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==" }, "node_modules/nopt": { "version": "3.0.6", @@ -6310,8 +6295,7 @@ "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" }, "node_modules/picomatch": { "version": "2.3.1", @@ -6708,9 +6692,9 @@ } }, "node_modules/react-svg-loader/node_modules/loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz", + "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", "dev": true, "dependencies": { "big.js": "^5.2.2", @@ -7061,7 +7045,6 @@ "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, "bin": { "semver": "bin/semver.js" } @@ -7804,7 +7787,6 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", - "dev": true, "funding": [ { "type": "opencollective", @@ -8432,7 +8414,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", - "dev": true, "requires": { "@jridgewell/gen-mapping": "^0.1.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -8449,14 +8430,12 @@ "@babel/compat-data": { "version": "7.19.4", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.4.tgz", - "integrity": "sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw==", - "dev": true + "integrity": "sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw==" }, "@babel/core": { "version": "7.19.3", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz", "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==", - "dev": true, "requires": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", @@ -8519,7 +8498,6 @@ "version": "7.19.3", "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz", "integrity": "sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==", - "dev": true, "requires": { "@babel/compat-data": "^7.19.3", "@babel/helper-validator-option": "^7.18.6", @@ -8618,7 +8596,6 @@ "version": "7.19.0", "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz", "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==", - "dev": true, "requires": { "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-module-imports": "^7.18.6", @@ -8673,7 +8650,6 @@ "version": "7.19.4", "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz", "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==", - "dev": true, "requires": { "@babel/types": "^7.19.4" } @@ -8708,8 +8684,7 @@ "@babel/helper-validator-option": { "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", - "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==", - "dev": true + "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==" }, "@babel/helper-wrap-function": { "version": "7.19.0", @@ -8727,7 +8702,6 @@ "version": "7.19.4", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.4.tgz", "integrity": "sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==", - "dev": true, "requires": { "@babel/template": "^7.18.10", "@babel/traverse": "^7.19.4", @@ -9752,7 +9726,8 @@ "@emotion/use-insertion-effect-with-fallbacks": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz", - "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==" + "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==", + "requires": {} }, "@emotion/utils": { "version": "1.2.0", @@ -9777,7 +9752,6 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", - "dev": true, "requires": { "@jridgewell/set-array": "^1.0.0", "@jridgewell/sourcemap-codec": "^1.4.10" @@ -10210,7 +10184,8 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", - "dev": true + "dev": true, + "requires": {} }, "@webpack-cli/info": { "version": "1.5.0", @@ -10225,7 +10200,8 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", - "dev": true + "dev": true, + "requires": {} }, "@xtuc/ieee754": { "version": "1.2.0", @@ -10264,7 +10240,8 @@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", - "dev": true + "dev": true, + "requires": {} }, "ajv": { "version": "6.12.6", @@ -10311,7 +10288,8 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true + "dev": true, + "requires": {} }, "ansi-html-community": { "version": "0.0.8", @@ -10444,7 +10422,8 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/babel-plugin-react-svg/-/babel-plugin-react-svg-3.0.3.tgz", "integrity": "sha512-Pst1RWjUIiV0Ykv1ODSeceCBsFOP2Y4dusjq7/XkjuzJdvS9CjpkPMUIoO4MLlvp5PiLCeMlsOC7faEUA0gm3Q==", - "dev": true + "dev": true, + "requires": {} }, "babel-plugin-styled-components": { "version": "2.0.7", @@ -10568,7 +10547,6 @@ "version": "4.21.4", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", - "dev": true, "requires": { "caniuse-lite": "^1.0.30001400", "electron-to-chromium": "^1.4.251", @@ -11186,8 +11164,7 @@ "electron-to-chromium": { "version": "1.4.282", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.282.tgz", - "integrity": "sha512-Dki0WhHNh/br/Xi1vAkueU5mtIc9XLHcMKB6tNfQKk+kPG0TEUjRh5QEMAUbRp30/rYNMFD1zKKvbVzwq/4wmg==", - "dev": true + "integrity": "sha512-Dki0WhHNh/br/Xi1vAkueU5mtIc9XLHcMKB6tNfQKk+kPG0TEUjRh5QEMAUbRp30/rYNMFD1zKKvbVzwq/4wmg==" }, "emojis-list": { "version": "3.0.0", @@ -11289,8 +11266,7 @@ "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, "escape-html": { "version": "1.0.3", @@ -11696,8 +11672,7 @@ "gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" }, "get-intrinsic": { "version": "1.1.3", @@ -12140,7 +12115,8 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true + "dev": true, + "requires": {} }, "immer": { "version": "9.0.15", @@ -12498,8 +12474,7 @@ "json5": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", - "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", - "dev": true + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==" }, "kind-of": { "version": "6.0.3", @@ -12551,9 +12526,9 @@ "dev": true }, "loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", + "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", "dev": true, "requires": { "big.js": "^5.2.2", @@ -12791,8 +12766,7 @@ "node-releases": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", - "dev": true + "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==" }, "nopt": { "version": "3.0.6", @@ -13137,8 +13111,7 @@ "picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" }, "picomatch": { "version": "2.3.1", @@ -13174,7 +13147,8 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true + "dev": true, + "requires": {} }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -13409,9 +13383,9 @@ } }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz", + "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", "dev": true, "requires": { "big.js": "^5.2.2", @@ -13471,7 +13445,8 @@ "redux-thunk": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz", - "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==" + "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==", + "requires": {} }, "regenerate": { "version": "1.4.2", @@ -13674,8 +13649,7 @@ "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" }, "send": { "version": "0.18.0", @@ -14009,7 +13983,8 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz", "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==", - "dev": true + "dev": true, + "requires": {} }, "styled-components": { "version": "5.3.6", @@ -14253,7 +14228,6 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", - "dev": true, "requires": { "escalade": "^3.1.1", "picocolors": "^1.0.0" @@ -14311,7 +14285,8 @@ "use-sync-external-store": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz", - "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==" + "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==", + "requires": {} }, "util-deprecate": { "version": "1.0.2", @@ -14662,7 +14637,8 @@ "version": "8.9.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz", "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==", - "dev": true + "dev": true, + "requires": {} }, "yallist": { "version": "4.0.0", From 10084cc833e640094d609b364e1346c92031be12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 00:40:58 +0000 Subject: [PATCH 08/14] Bump loader-utils from 1.4.1 to 1.4.2 in /graphwalker-studio Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md) - [Commits](https://github.com/webpack/loader-utils/compare/v1.4.1...v1.4.2) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] --- graphwalker-studio/package-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/graphwalker-studio/package-lock.json b/graphwalker-studio/package-lock.json index e994c5034..4c74c2f09 100644 --- a/graphwalker-studio/package-lock.json +++ b/graphwalker-studio/package-lock.json @@ -5506,9 +5506,9 @@ } }, "node_modules/loader-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", - "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, "dependencies": { "big.js": "^5.2.2", @@ -6692,9 +6692,9 @@ } }, "node_modules/react-svg-loader/node_modules/loader-utils": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz", - "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", "dev": true, "dependencies": { "big.js": "^5.2.2", @@ -12526,9 +12526,9 @@ "dev": true }, "loader-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", - "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, "requires": { "big.js": "^5.2.2", @@ -13383,9 +13383,9 @@ } }, "loader-utils": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz", - "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", "dev": true, "requires": { "big.js": "^5.2.2", From f90de464ee8bdae5a1b1829b097dfc18d10a3dfd Mon Sep 17 00:00:00 2001 From: Robert-96 Date: Mon, 21 Nov 2022 14:34:25 +0200 Subject: [PATCH 09/14] Fix conflicts --- .../src/test/java/org/graphwalker/cli/CheckTest.java | 10 ---------- .../java/org/graphwalker/cli/ConvertFilesTest.java | 6 ------ .../java/org/graphwalker/cli/CorrectModelsTest.java | 5 +++-- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java index eded5f24d..b1615e15e 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java @@ -41,27 +41,17 @@ public class CheckTest extends CLITestRoot { public void check() throws IOException { String args[] = {"check", "-m", "graphml/online/ShoppingCart.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("No issues found with the model(s).")); -======= - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), containsString("No issues found with the model(s).")); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } @Test public void checkWithBlocked() throws IOException { String args[] = {"check", "-m", "graphml/online/ShoppingCart.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("No issues found with the model(s).")); -======= - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), containsString("No issues found with the model(s).")); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java index 9d1d2ade1..8510dac64 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java @@ -46,15 +46,9 @@ public class ConvertFilesTest extends CLITestRoot { public void convertGraphmlToJava() throws IOException { String args[] = {"convert", "--input", "graphml/UC01_GW2.graphml", "--format", "java"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); // TODO: Fix test // Assert.assertTrue(tempFile.length() > 0); -======= - assertThat(result.getError(), is("")); - //TODO:Fix test -// Assert.assertTrue(tempFile.length() > 0); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java index 89b150e7a..15101d74d 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java @@ -112,8 +112,9 @@ public void loginNoErrors() { public void noStartVertex() { String args[] = {"offline", "-e", "v1", "-m", "graphml/CorrectModels/modelWithNoStartVertex.graphml", "a_star(reached_edge(e4))"}; Result result = runCommand(args); - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), is("{\"currentElementName\":\"v1\"}" + System.lineSeparator() + + Assert.assertThat(result.getStatus(), is(0)); + Assert.assertThat(result.getError(), is("")); + Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"v1\"}" + System.lineSeparator() + "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + "{\"currentElementName\":\"v2\"}" + System.lineSeparator() + "{\"currentElementName\":\"e4\"}" + System.lineSeparator())); From 1ac2e2d03aa32f80cf8b335b5e9d10000559e23b Mon Sep 17 00:00:00 2001 From: Robert-96 Date: Mon, 21 Nov 2022 14:28:12 +0200 Subject: [PATCH 10/14] Fix conflicts --- .../org/graphwalker/cli/ConvertFilesTest.java | 6 +++ .../graphwalker/cli/CorrectModelsTest.java | 39 +++++++++++++++++++ .../org/graphwalker/cli/IOErrorsTest.java | 7 ++++ .../java/org/graphwalker/cli/MethodsTest.java | 5 +++ .../org/graphwalker/cli/PrintHelpTest.java | 5 +++ .../org/graphwalker/cli/PrintVersionTest.java | 5 +++ .../org/graphwalker/cli/RequirementsTest.java | 4 ++ .../java/org/graphwalker/cli/SourceTest.java | 10 +++++ 8 files changed, 81 insertions(+) diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java index 8510dac64..9d1d2ade1 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java @@ -46,9 +46,15 @@ public class ConvertFilesTest extends CLITestRoot { public void convertGraphmlToJava() throws IOException { String args[] = {"convert", "--input", "graphml/UC01_GW2.graphml", "--format", "java"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); // TODO: Fix test // Assert.assertTrue(tempFile.length() > 0); +======= + assertThat(result.getError(), is("")); + //TODO:Fix test +// Assert.assertTrue(tempFile.length() > 0); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java index 15101d74d..bbf062a98 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java @@ -67,9 +67,14 @@ public class CorrectModelsTest extends CLITestRoot { public void simplestModel() { String args[] = {"offline", "-m", "graphml/CorrectModels/simplestModel.graphml", "random(vertex_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +>>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"v1\"}" + System.lineSeparator())); } @@ -80,9 +85,14 @@ public void simplestModel() { public void shortestAllPathsVertexCoverage() { String args[] = {"offline", "-m", "graphml/CorrectModels/shortestAllPathsVertexCoverage.graphml", "shortest_all_paths(vertex_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +>>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"v1\"}" + System.lineSeparator() + "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + "{\"currentElementName\":\"v2\"}" + System.lineSeparator() + @@ -101,8 +111,12 @@ public void shortestAllPathsVertexCoverage() { public void loginNoErrors() { String args[] = {"offline", "-o", "-m", "graphml/Login.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); +======= + assertThat(result.getError(), is("")); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } /** @@ -112,9 +126,14 @@ public void loginNoErrors() { public void noStartVertex() { String args[] = {"offline", "-e", "v1", "-m", "graphml/CorrectModels/modelWithNoStartVertex.graphml", "a_star(reached_edge(e4))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"v1\"}" + System.lineSeparator() + +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), is("{\"currentElementName\":\"v1\"}" + System.lineSeparator() + +>>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + "{\"currentElementName\":\"v2\"}" + System.lineSeparator() + "{\"currentElementName\":\"e4\"}" + System.lineSeparator())); @@ -127,9 +146,14 @@ public void noStartVertex() { public void dontUseBlocked() { String args[] = {"offline", "-b", "false", "-m", "graphml/CorrectModels/blockedVertex.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +>>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"v1\"}" + System.lineSeparator() + "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + "{\"currentElementName\":\"v2\"}" + System.lineSeparator())); @@ -142,9 +166,14 @@ public void dontUseBlocked() { public void useBlocked() { String args[] = {"offline", "-m", "graphml/CorrectModels/blockedVertex.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + +>>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"v1\"}" + System.lineSeparator())); } @@ -155,9 +184,14 @@ public void useBlocked() { public void dontUseBlockedJson() { String args[] = {"offline", "-b", "false", "-g", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), +======= + assertThat(result.getError(), is("")); + assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), +>>>>>>> 3036b2c4 (Replace deprecated assertThat) hasItems("{\"currentElementName\":\"e1\"}", "{\"currentElementName\":\"e2\"}", "{\"currentElementName\":\"e3\"}", @@ -182,9 +216,14 @@ public void dontUseBlockedJson() { public void useBlockedJson() { String args[] = {"offline", "-g", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), +======= + assertThat(result.getError(), is("")); + assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), +>>>>>>> 3036b2c4 (Replace deprecated assertThat) hasItems("{\"currentElementName\":\"e1\"}", "{\"currentElementName\":\"e2\"}", "{\"currentElementName\":\"e3\"}", diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java index 14d58d825..618f3d5e0 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java @@ -41,10 +41,17 @@ public class IOErrorsTest extends CLITestRoot { public void nonExistentFile() { String args[] = {"offline", "-m", "sdsdtkdsjhsl.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(2)); Assert.assertThat(result.getOutput(), is("")); Assert.assertThat(result.getError(), is("An error occurred when running command: " + "offline -m sdsdtkdsjhsl.graphml random(edge_coverage(100))" + System.lineSeparator() + "Could not read the file." + System.lineSeparator() + System.lineSeparator())); +======= + assertThat(result.getError(), is("An error occurred when running command: " + + "offline -m sdsdtkdsjhsl.graphml random(edge_coverage(100))" + + System.lineSeparator() + "Could not read the file." + System.lineSeparator() + System.lineSeparator())); + assertThat(result.getOutput(), is("")); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java index 236a61800..9147942f8 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java @@ -65,9 +65,14 @@ public void methodsDontUseBlockedFeature() throws IOException { public void methodsUseBlockedFeature() throws IOException { String args[] = {"methods", "-m", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(Arrays.asList(result.getOutput().split("\\s+")), +======= + assertThat(result.getError(), is("")); + assertThat(Arrays.asList(result.getOutput().split("\\s+")), +>>>>>>> 3036b2c4 (Replace deprecated assertThat) containsInAnyOrder("e1", "e2", "e3", diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java index 4d1b31bd1..824143236 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java @@ -41,8 +41,13 @@ public class PrintHelpTest extends CLITestRoot { public void help() throws IOException { String args[] = {"--help"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("Usage: graphwalker [options] [command] [command options]")); +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), containsString("Usage: graphwalker [options] [command] [command options]")); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java index 4a0f060f8..347d9132e 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java @@ -41,8 +41,13 @@ public class PrintVersionTest extends CLITestRoot { public void version() throws IOException { String args[] = {"--version"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("org.graphwalker version: ")); +======= + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), containsString("org.graphwalker version: ")); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java index 42f239f66..32449fed9 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java @@ -43,8 +43,12 @@ public class RequirementsTest extends CLITestRoot { public void requirements() throws IOException { String args[] = {"requirements", "-m", "graphml/online/ShoppingCart.graphml"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); +======= + assertThat(result.getError(), is("")); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) List array = Arrays.asList(result.getOutput().split("\n")); for (int i = 0; i < array.size(); i++) { diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java index 49809f55f..386f2994a 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java @@ -41,17 +41,27 @@ public class SourceTest extends CLITestRoot { public void generatePerl() throws IOException { String args[] = {"source", "--input", "json/example.json", "template/perl.template"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertTrue(result.getOutput().length() > 1200 && result.getOutput().length() < 1300); +======= + assertThat(result.getError(), is("")); + assertTrue(result.getOutput().length() > 1200 && result.getOutput().length() < 1300); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } @Test public void generatePython() throws IOException { String args[] = {"source", "--input", "json/example.json", "template/python.template"}; Result result = runCommand(args); +<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertTrue(result.getOutput().length() > 950 && result.getOutput().length() < 1150); +======= + assertThat(result.getError(), is("")); + assertTrue(result.getOutput().length() > 950 && result.getOutput().length() < 1150); +>>>>>>> 3036b2c4 (Replace deprecated assertThat) } } From 923974d6038272755785e40435ff0e91f9e9c2b5 Mon Sep 17 00:00:00 2001 From: Robert-96 Date: Mon, 21 Nov 2022 14:24:00 +0200 Subject: [PATCH 11/14] Fix conflicts --- .../org/graphwalker/cli/ConvertFilesTest.java | 6 ---- .../graphwalker/cli/CorrectModelsTest.java | 29 ------------------- .../org/graphwalker/cli/IOErrorsTest.java | 7 ----- .../java/org/graphwalker/cli/MethodsTest.java | 5 ---- .../org/graphwalker/cli/PrintHelpTest.java | 5 ---- .../org/graphwalker/cli/PrintVersionTest.java | 5 ---- .../org/graphwalker/cli/RequirementsTest.java | 4 --- .../java/org/graphwalker/cli/SourceTest.java | 10 ------- 8 files changed, 71 deletions(-) diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java index 9d1d2ade1..8510dac64 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java @@ -46,15 +46,9 @@ public class ConvertFilesTest extends CLITestRoot { public void convertGraphmlToJava() throws IOException { String args[] = {"convert", "--input", "graphml/UC01_GW2.graphml", "--format", "java"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); // TODO: Fix test // Assert.assertTrue(tempFile.length() > 0); -======= - assertThat(result.getError(), is("")); - //TODO:Fix test -// Assert.assertTrue(tempFile.length() > 0); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java index bbf062a98..b95b3326e 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java @@ -67,14 +67,9 @@ public class CorrectModelsTest extends CLITestRoot { public void simplestModel() { String args[] = {"offline", "-m", "graphml/CorrectModels/simplestModel.graphml", "random(vertex_coverage(100))"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + -======= - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + ->>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"v1\"}" + System.lineSeparator())); } @@ -85,14 +80,9 @@ public void simplestModel() { public void shortestAllPathsVertexCoverage() { String args[] = {"offline", "-m", "graphml/CorrectModels/shortestAllPathsVertexCoverage.graphml", "shortest_all_paths(vertex_coverage(100))"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + -======= - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + ->>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"v1\"}" + System.lineSeparator() + "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + "{\"currentElementName\":\"v2\"}" + System.lineSeparator() + @@ -111,12 +101,8 @@ public void shortestAllPathsVertexCoverage() { public void loginNoErrors() { String args[] = {"offline", "-o", "-m", "graphml/Login.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); -======= - assertThat(result.getError(), is("")); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } /** @@ -166,14 +152,9 @@ public void dontUseBlocked() { public void useBlocked() { String args[] = {"offline", "-m", "graphml/CorrectModels/blockedVertex.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + -======= - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + ->>>>>>> 3036b2c4 (Replace deprecated assertThat) "{\"currentElementName\":\"v1\"}" + System.lineSeparator())); } @@ -184,14 +165,9 @@ public void useBlocked() { public void dontUseBlockedJson() { String args[] = {"offline", "-b", "false", "-g", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), -======= - assertThat(result.getError(), is("")); - assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), ->>>>>>> 3036b2c4 (Replace deprecated assertThat) hasItems("{\"currentElementName\":\"e1\"}", "{\"currentElementName\":\"e2\"}", "{\"currentElementName\":\"e3\"}", @@ -216,14 +192,9 @@ public void dontUseBlockedJson() { public void useBlockedJson() { String args[] = {"offline", "-g", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), -======= - assertThat(result.getError(), is("")); - assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), ->>>>>>> 3036b2c4 (Replace deprecated assertThat) hasItems("{\"currentElementName\":\"e1\"}", "{\"currentElementName\":\"e2\"}", "{\"currentElementName\":\"e3\"}", diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java index 618f3d5e0..14d58d825 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java @@ -41,17 +41,10 @@ public class IOErrorsTest extends CLITestRoot { public void nonExistentFile() { String args[] = {"offline", "-m", "sdsdtkdsjhsl.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(2)); Assert.assertThat(result.getOutput(), is("")); Assert.assertThat(result.getError(), is("An error occurred when running command: " + "offline -m sdsdtkdsjhsl.graphml random(edge_coverage(100))" + System.lineSeparator() + "Could not read the file." + System.lineSeparator() + System.lineSeparator())); -======= - assertThat(result.getError(), is("An error occurred when running command: " + - "offline -m sdsdtkdsjhsl.graphml random(edge_coverage(100))" + - System.lineSeparator() + "Could not read the file." + System.lineSeparator() + System.lineSeparator())); - assertThat(result.getOutput(), is("")); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java index 9147942f8..236a61800 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java @@ -65,14 +65,9 @@ public void methodsDontUseBlockedFeature() throws IOException { public void methodsUseBlockedFeature() throws IOException { String args[] = {"methods", "-m", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(Arrays.asList(result.getOutput().split("\\s+")), -======= - assertThat(result.getError(), is("")); - assertThat(Arrays.asList(result.getOutput().split("\\s+")), ->>>>>>> 3036b2c4 (Replace deprecated assertThat) containsInAnyOrder("e1", "e2", "e3", diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java index 824143236..4d1b31bd1 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java @@ -41,13 +41,8 @@ public class PrintHelpTest extends CLITestRoot { public void help() throws IOException { String args[] = {"--help"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("Usage: graphwalker [options] [command] [command options]")); -======= - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), containsString("Usage: graphwalker [options] [command] [command options]")); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java index 347d9132e..4a0f060f8 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java @@ -41,13 +41,8 @@ public class PrintVersionTest extends CLITestRoot { public void version() throws IOException { String args[] = {"--version"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertThat(result.getOutput(), containsString("org.graphwalker version: ")); -======= - assertThat(result.getError(), is("")); - assertThat(result.getOutput(), containsString("org.graphwalker version: ")); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java index 32449fed9..42f239f66 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java @@ -43,12 +43,8 @@ public class RequirementsTest extends CLITestRoot { public void requirements() throws IOException { String args[] = {"requirements", "-m", "graphml/online/ShoppingCart.graphml"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); -======= - assertThat(result.getError(), is("")); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) List array = Arrays.asList(result.getOutput().split("\n")); for (int i = 0; i < array.size(); i++) { diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java index 386f2994a..49809f55f 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java @@ -41,27 +41,17 @@ public class SourceTest extends CLITestRoot { public void generatePerl() throws IOException { String args[] = {"source", "--input", "json/example.json", "template/perl.template"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertTrue(result.getOutput().length() > 1200 && result.getOutput().length() < 1300); -======= - assertThat(result.getError(), is("")); - assertTrue(result.getOutput().length() > 1200 && result.getOutput().length() < 1300); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } @Test public void generatePython() throws IOException { String args[] = {"source", "--input", "json/example.json", "template/python.template"}; Result result = runCommand(args); -<<<<<<< HEAD Assert.assertThat(result.getStatus(), is(0)); Assert.assertThat(result.getError(), is("")); Assert.assertTrue(result.getOutput().length() > 950 && result.getOutput().length() < 1150); -======= - assertThat(result.getError(), is("")); - assertTrue(result.getOutput().length() > 950 && result.getOutput().length() < 1150); ->>>>>>> 3036b2c4 (Replace deprecated assertThat) } } From a0c87157779d4442b6107c16922cc91613f6d0bf Mon Sep 17 00:00:00 2001 From: Robert-96 Date: Mon, 21 Nov 2022 14:56:20 +0200 Subject: [PATCH 12/14] Fix unit tests --- .../java/org/graphwalker/cli/CheckTest.java | 12 +- .../org/graphwalker/cli/ConvertFilesTest.java | 6 +- .../graphwalker/cli/CorrectModelsTest.java | 138 +++++++++--------- .../org/graphwalker/cli/IOErrorsTest.java | 10 +- .../java/org/graphwalker/cli/MethodsTest.java | 58 ++++---- .../java/org/graphwalker/cli/OnlineTest.java | 4 +- .../org/graphwalker/cli/PrintHelpTest.java | 6 +- .../org/graphwalker/cli/PrintVersionTest.java | 6 +- .../org/graphwalker/cli/RequirementsTest.java | 14 +- .../java/org/graphwalker/cli/SourceTest.java | 12 +- 10 files changed, 133 insertions(+), 133 deletions(-) diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java index b1615e15e..fba60dd47 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CheckTest.java @@ -41,17 +41,17 @@ public class CheckTest extends CLITestRoot { public void check() throws IOException { String args[] = {"check", "-m", "graphml/online/ShoppingCart.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); - Assert.assertThat(result.getOutput(), containsString("No issues found with the model(s).")); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), containsString("No issues found with the model(s).")); } @Test public void checkWithBlocked() throws IOException { String args[] = {"check", "-m", "graphml/online/ShoppingCart.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); - Assert.assertThat(result.getOutput(), containsString("No issues found with the model(s).")); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), containsString("No issues found with the model(s).")); } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java index 8510dac64..9f54eece7 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/ConvertFilesTest.java @@ -46,9 +46,9 @@ public class ConvertFilesTest extends CLITestRoot { public void convertGraphmlToJava() throws IOException { String args[] = {"convert", "--input", "graphml/UC01_GW2.graphml", "--format", "java"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); // TODO: Fix test - // Assert.assertTrue(tempFile.length() > 0); + // assertTrue(tempFile.length() > 0); } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java index 15101d74d..a556bd262 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/CorrectModelsTest.java @@ -67,10 +67,10 @@ public class CorrectModelsTest extends CLITestRoot { public void simplestModel() { String args[] = {"offline", "-m", "graphml/CorrectModels/simplestModel.graphml", "random(vertex_coverage(100))"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); - Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + - "{\"currentElementName\":\"v1\"}" + System.lineSeparator())); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + + "{\"currentElementName\":\"v1\"}" + System.lineSeparator())); } /** @@ -80,18 +80,18 @@ public void simplestModel() { public void shortestAllPathsVertexCoverage() { String args[] = {"offline", "-m", "graphml/CorrectModels/shortestAllPathsVertexCoverage.graphml", "shortest_all_paths(vertex_coverage(100))"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); - Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + - "{\"currentElementName\":\"v1\"}" + System.lineSeparator() + - "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + - "{\"currentElementName\":\"v2\"}" + System.lineSeparator() + - "{\"currentElementName\":\"e4\"}" + System.lineSeparator() + - "{\"currentElementName\":\"v4\"}" + System.lineSeparator() + - "{\"currentElementName\":\"e6\"}" + System.lineSeparator() + - "{\"currentElementName\":\"v1\"}" + System.lineSeparator() + - "{\"currentElementName\":\"e3\"}" + System.lineSeparator() + - "{\"currentElementName\":\"v3\"}" + System.lineSeparator())); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + + "{\"currentElementName\":\"v1\"}" + System.lineSeparator() + + "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + + "{\"currentElementName\":\"v2\"}" + System.lineSeparator() + + "{\"currentElementName\":\"e4\"}" + System.lineSeparator() + + "{\"currentElementName\":\"v4\"}" + System.lineSeparator() + + "{\"currentElementName\":\"e6\"}" + System.lineSeparator() + + "{\"currentElementName\":\"v1\"}" + System.lineSeparator() + + "{\"currentElementName\":\"e3\"}" + System.lineSeparator() + + "{\"currentElementName\":\"v3\"}" + System.lineSeparator())); } /** @@ -101,8 +101,8 @@ public void shortestAllPathsVertexCoverage() { public void loginNoErrors() { String args[] = {"offline", "-o", "-m", "graphml/Login.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); } /** @@ -112,12 +112,12 @@ public void loginNoErrors() { public void noStartVertex() { String args[] = {"offline", "-e", "v1", "-m", "graphml/CorrectModels/modelWithNoStartVertex.graphml", "a_star(reached_edge(e4))"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); - Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"v1\"}" + System.lineSeparator() + - "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + - "{\"currentElementName\":\"v2\"}" + System.lineSeparator() + - "{\"currentElementName\":\"e4\"}" + System.lineSeparator())); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), is("{\"currentElementName\":\"v1\"}" + System.lineSeparator() + + "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + + "{\"currentElementName\":\"v2\"}" + System.lineSeparator() + + "{\"currentElementName\":\"e4\"}" + System.lineSeparator())); } /** @@ -127,12 +127,12 @@ public void noStartVertex() { public void dontUseBlocked() { String args[] = {"offline", "-b", "false", "-m", "graphml/CorrectModels/blockedVertex.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); - Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + - "{\"currentElementName\":\"v1\"}" + System.lineSeparator() + - "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + - "{\"currentElementName\":\"v2\"}" + System.lineSeparator())); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + + "{\"currentElementName\":\"v1\"}" + System.lineSeparator() + + "{\"currentElementName\":\"e2\"}" + System.lineSeparator() + + "{\"currentElementName\":\"v2\"}" + System.lineSeparator())); } /** @@ -142,10 +142,10 @@ public void dontUseBlocked() { public void useBlocked() { String args[] = {"offline", "-m", "graphml/CorrectModels/blockedVertex.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); - Assert.assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + - "{\"currentElementName\":\"v1\"}" + System.lineSeparator())); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), is("{\"currentElementName\":\"e1\"}" + System.lineSeparator() + + "{\"currentElementName\":\"v1\"}" + System.lineSeparator())); } /** @@ -155,24 +155,24 @@ public void useBlocked() { public void dontUseBlockedJson() { String args[] = {"offline", "-b", "false", "-g", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); - Assert.assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), - hasItems("{\"currentElementName\":\"e1\"}", - "{\"currentElementName\":\"e2\"}", - "{\"currentElementName\":\"e3\"}", - "{\"currentElementName\":\"e4\"}", - "{\"currentElementName\":\"e5\"}", - "{\"currentElementName\":\"e6\"}", - "{\"currentElementName\":\"e7\"}", - "{\"currentElementName\":\"e8\"}", - "{\"currentElementName\":\"e9\"}", - "{\"currentElementName\":\"e10\"}", - "{\"currentElementName\":\"v1\"}", - "{\"currentElementName\":\"v2\"}", - "{\"currentElementName\":\"v3\"}", - "{\"currentElementName\":\"v4\"}", - "{\"currentElementName\":\"v5\"}")); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); + assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), + hasItems("{\"currentElementName\":\"e1\"}", + "{\"currentElementName\":\"e2\"}", + "{\"currentElementName\":\"e3\"}", + "{\"currentElementName\":\"e4\"}", + "{\"currentElementName\":\"e5\"}", + "{\"currentElementName\":\"e6\"}", + "{\"currentElementName\":\"e7\"}", + "{\"currentElementName\":\"e8\"}", + "{\"currentElementName\":\"e9\"}", + "{\"currentElementName\":\"e10\"}", + "{\"currentElementName\":\"v1\"}", + "{\"currentElementName\":\"v2\"}", + "{\"currentElementName\":\"v3\"}", + "{\"currentElementName\":\"v4\"}", + "{\"currentElementName\":\"v5\"}")); } /** @@ -182,24 +182,24 @@ public void dontUseBlockedJson() { public void useBlockedJson() { String args[] = {"offline", "-g", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); - Assert.assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), - hasItems("{\"currentElementName\":\"e1\"}", - "{\"currentElementName\":\"e2\"}", - "{\"currentElementName\":\"e3\"}", - "{\"currentElementName\":\"e4\"}", - "{\"currentElementName\":\"e7\"}", - "{\"currentElementName\":\"e8\"}", - "{\"currentElementName\":\"e9\"}", - "{\"currentElementName\":\"v1\"}", - "{\"currentElementName\":\"v2\"}", - "{\"currentElementName\":\"v3\"}", - "{\"currentElementName\":\"v4\"}")); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); + assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), + hasItems("{\"currentElementName\":\"e1\"}", + "{\"currentElementName\":\"e2\"}", + "{\"currentElementName\":\"e3\"}", + "{\"currentElementName\":\"e4\"}", + "{\"currentElementName\":\"e7\"}", + "{\"currentElementName\":\"e8\"}", + "{\"currentElementName\":\"e9\"}", + "{\"currentElementName\":\"v1\"}", + "{\"currentElementName\":\"v2\"}", + "{\"currentElementName\":\"v3\"}", + "{\"currentElementName\":\"v4\"}")); assertThat(Arrays.asList(result.getOutput().split(System.lineSeparator())), - not(hasItems("{\"currentElementName\":\"e5\"}", - "{\"currentElementName\":\"e6\"}", - "{\"currentElementName\":\"v5\"}"))); + not(hasItems("{\"currentElementName\":\"e5\"}", + "{\"currentElementName\":\"e6\"}", + "{\"currentElementName\":\"v5\"}"))); } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java index 14d58d825..2026a1778 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java @@ -41,10 +41,10 @@ public class IOErrorsTest extends CLITestRoot { public void nonExistentFile() { String args[] = {"offline", "-m", "sdsdtkdsjhsl.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(2)); - Assert.assertThat(result.getOutput(), is("")); - Assert.assertThat(result.getError(), is("An error occurred when running command: " + - "offline -m sdsdtkdsjhsl.graphml random(edge_coverage(100))" + System.lineSeparator() + - "Could not read the file." + System.lineSeparator() + System.lineSeparator())); + assertThat(result.getStatus(), is(2)); + assertThat(result.getOutput(), is("")); + assertThat(result.getError(), is("An error occurred when running command: " + + "offline -m sdsdtkdsjhsl.graphml random(edge_coverage(100))" + System.lineSeparator() + + "Could not read the file." + System.lineSeparator() + System.lineSeparator())); } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java index 236a61800..6dbbc8f7d 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/MethodsTest.java @@ -44,40 +44,40 @@ public void methodsDontUseBlockedFeature() throws IOException { Result result = runCommand(args); assertThat(result.getError(), is("")); assertThat(Arrays.asList(result.getOutput().split("\\s+")), - containsInAnyOrder("e1", - "e2", - "e3", - "e4", - "e5", - "e6", - "e7", - "e8", - "e9", - "e10", - "v1", - "v2", - "v3", - "v4", - "v5")); + containsInAnyOrder("e1", + "e2", + "e3", + "e4", + "e5", + "e6", + "e7", + "e8", + "e9", + "e10", + "v1", + "v2", + "v3", + "v4", + "v5")); } @Test public void methodsUseBlockedFeature() throws IOException { String args[] = {"methods", "-m", "json/graphWithBlockedElements.json"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); - Assert.assertThat(Arrays.asList(result.getOutput().split("\\s+")), - containsInAnyOrder("e1", - "e2", - "e3", - "e4", - "e7", - "e8", - "e9", - "v1", - "v2", - "v3", - "v4")); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); + assertThat(Arrays.asList(result.getOutput().split("\\s+")), + containsInAnyOrder("e1", + "e2", + "e3", + "e4", + "e7", + "e8", + "e9", + "v1", + "v2", + "v3", + "v4")); } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/OnlineTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/OnlineTest.java index 91405a34b..a5d9bf579 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/OnlineTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/OnlineTest.java @@ -10,10 +10,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java index 4d1b31bd1..89534215b 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintHelpTest.java @@ -41,8 +41,8 @@ public class PrintHelpTest extends CLITestRoot { public void help() throws IOException { String args[] = {"--help"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); - Assert.assertThat(result.getOutput(), containsString("Usage: graphwalker [options] [command] [command options]")); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), containsString("Usage: graphwalker [options] [command] [command options]")); } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java index 4a0f060f8..9a71cbdd9 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/PrintVersionTest.java @@ -41,8 +41,8 @@ public class PrintVersionTest extends CLITestRoot { public void version() throws IOException { String args[] = {"--version"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); - Assert.assertThat(result.getOutput(), containsString("org.graphwalker version: ")); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); + assertThat(result.getOutput(), containsString("org.graphwalker version: ")); } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java index 42f239f66..c09cbf1ef 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/RequirementsTest.java @@ -43,18 +43,18 @@ public class RequirementsTest extends CLITestRoot { public void requirements() throws IOException { String args[] = {"requirements", "-m", "graphml/online/ShoppingCart.graphml"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); List array = Arrays.asList(result.getOutput().split("\n")); for (int i = 0; i < array.size(); i++) { array.set(i, array.get(i).trim()); } assertThat(array, - containsInAnyOrder("UC01 2.2.1", - "UC01 2.2.2", - "UC01 2.2.3", - "UC01 2.3", - "UC01 2.4")); + containsInAnyOrder("UC01 2.2.1", + "UC01 2.2.2", + "UC01 2.2.3", + "UC01 2.3", + "UC01 2.4")); } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java index 49809f55f..18bc9a897 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/SourceTest.java @@ -41,17 +41,17 @@ public class SourceTest extends CLITestRoot { public void generatePerl() throws IOException { String args[] = {"source", "--input", "json/example.json", "template/perl.template"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); - Assert.assertTrue(result.getOutput().length() > 1200 && result.getOutput().length() < 1300); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); + assertTrue(result.getOutput().length() > 1200 && result.getOutput().length() < 1300); } @Test public void generatePython() throws IOException { String args[] = {"source", "--input", "json/example.json", "template/python.template"}; Result result = runCommand(args); - Assert.assertThat(result.getStatus(), is(0)); - Assert.assertThat(result.getError(), is("")); - Assert.assertTrue(result.getOutput().length() > 950 && result.getOutput().length() < 1150); + assertThat(result.getStatus(), is(0)); + assertThat(result.getError(), is("")); + assertTrue(result.getOutput().length() > 950 && result.getOutput().length() < 1150); } } From d621cacf88058a16e455b4a17852b04fb4ecb3ca Mon Sep 17 00:00:00 2001 From: Robert-96 Date: Tue, 22 Nov 2022 00:28:07 +0200 Subject: [PATCH 13/14] Update error messages --- .../main/java/org/graphwalker/cli/CLI.java | 24 ++++++++---- .../org/graphwalker/cli/IOErrorsTest.java | 6 +-- .../graphwalker/cli/IncorrectModelsTest.java | 37 +++++++++---------- 3 files changed, 36 insertions(+), 31 deletions(-) diff --git a/graphwalker-cli/src/main/java/org/graphwalker/cli/CLI.java b/graphwalker-cli/src/main/java/org/graphwalker/cli/CLI.java index 7afd2e4f6..e287db845 100644 --- a/graphwalker-cli/src/main/java/org/graphwalker/cli/CLI.java +++ b/graphwalker-cli/src/main/java/org/graphwalker/cli/CLI.java @@ -181,13 +181,13 @@ public int run(String[] args) { System.err.println(e.getMessage() + System.lineSeparator()); return 1; } catch (ParameterException e) { - System.err.println("An error occurred when running command: " + StringUtils.join(args, " ")); + System.err.println("An error occurred when running command: '" + StringUtils.join(args, " ") + "'."); System.err.println(e.getMessage() + System.lineSeparator()); jc.usage(); return 1; } catch (Exception e) { logger.error("An error occurred when running command: " + StringUtils.join(args, " "), e); - System.err.println("An error occurred when running command: " + StringUtils.join(args, " ")); + System.err.println("An error occurred when running command: '" + StringUtils.join(args, " ") + "'."); System.err.println(e.getMessage() + System.lineSeparator()); return 2; } @@ -329,7 +329,9 @@ private void runCommandConvert() throws Exception, UnsupportedFileFormat { try { contexts = inputFactory.create(Paths.get(inputFileName)); } catch (DslException e) { - throw new Exception("The following syntax error occurred when parsing: '" + inputFileName + "': " + e.getMessage() + System.lineSeparator()); + throw new Exception("The following syntax error occurred when parsing: '" + inputFileName + "'." + + System.lineSeparator() + + "Syntax Error: " + e.getMessage() + System.lineSeparator()); } if (convert.blocked) { @@ -351,10 +353,12 @@ private void runCommandSource() throws Exception, UnsupportedFileFormat { contexts = inputFactory.create(Paths.get(modelFileName)); if (isNullOrEmpty(contexts)) { logger.error("No valid models found in: " + modelFileName); - throw new RuntimeException("No valid models found in: " + modelFileName); + throw new RuntimeException("No valid models found in: '" + modelFileName + "'."); } } catch (DslException e) { - throw new Exception("The following syntax error occurred when parsing: '" + modelFileName + "': " + e.getMessage() + System.lineSeparator()); + throw new Exception("The following syntax error occurred when parsing: '" + modelFileName + "'." + + System.lineSeparator() + + "Syntax Error: " + e.getMessage()); } if (source.blocked) { @@ -383,7 +387,7 @@ private void runCommandSource() throws Exception, UnsupportedFileFormat { } } catch (IOException e) { logger.error(e.getMessage()); - throw new RuntimeException("Could not read the file: " + templateFileName); + throw new RuntimeException("Could not read the file: '" + templateFileName + "'."); } String templateStr = templateStrBuilder.toString(); @@ -453,7 +457,9 @@ public List getContextsWithPathGenerators(Iterator itr) throws Exceptio try { contexts = factory.create(Paths.get(modelFileName)); } catch (DslException e) { - throw new Exception("The following error occurred when parsing: '" + modelFileName + "'." + System.lineSeparator() + e.getMessage() + System.lineSeparator()); + throw new Exception("The following syntax error occurred when parsing: '" + modelFileName + "'." + + System.lineSeparator() + + "Syntax Error: " + e.getMessage()); } // TODO fix all occurrences of get(0) is not safe @@ -508,7 +514,9 @@ private List getContexts(Iterator itr) throws Exception, UnsupportedFil try { contexts = factory.create(Paths.get(modelFileName)); } catch (DslException e) { - throw new Exception("The following error occurred when parsing: '" + modelFileName + "' " + e.getMessage()); + throw new Exception("The following syntax error occurred when parsing: '" + modelFileName + "'." + + System.lineSeparator() + + "Syntax Error: " + e.getMessage()); } executionContexts.addAll(contexts); } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java index 2026a1778..e30eedaf2 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/IOErrorsTest.java @@ -43,8 +43,8 @@ public void nonExistentFile() { Result result = runCommand(args); assertThat(result.getStatus(), is(2)); assertThat(result.getOutput(), is("")); - assertThat(result.getError(), is("An error occurred when running command: " + - "offline -m sdsdtkdsjhsl.graphml random(edge_coverage(100))" + System.lineSeparator() + - "Could not read the file." + System.lineSeparator() + System.lineSeparator())); + assertThat(result.getError(), is("An error occurred when running command: 'offline -m sdsdtkdsjhsl.graphml random(edge_coverage(100))'." + + System.lineSeparator() + + "Could not read the file." + System.lineSeparator() + System.lineSeparator())); } } diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java index f9a43ea57..bda48bb34 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java @@ -12,10 +12,10 @@ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * copies of the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE @@ -42,12 +42,11 @@ public void wrongVertexSyntax() { String args[] = {"offline", "-m", "graphml/IncorrectModels/wrongVertexSyntax.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); assertThat(result.getError(), - is("When parsing model: 'graphml/IncorrectModels/wrongVertexSyntax.graphml' The string '1' did not conform to GraphWalker syntax rules." + is("An error occurred when running command: 'offline -m graphml/IncorrectModels/wrongVertexSyntax.graphml random(edge_coverage(100))'." + System.lineSeparator() + + "The following syntax error occurred when parsing: 'graphml/IncorrectModels/wrongVertexSyntax.graphml'." + System.lineSeparator() - + "An error occurred when running command: offline -m graphml/IncorrectModels/wrongVertexSyntax.graphml random(edge_coverage(100))" - + System.lineSeparator() - + "Model syntax error" + System.lineSeparator() + System.lineSeparator())); + + "Syntax Error: The string '1' did not conform to GraphWalker syntax rules." + System.lineSeparator() + System.lineSeparator())); assertThat(result.getOutput(), is("")); } @@ -58,9 +57,9 @@ public void wrongVertexSyntax() { public void onlyOneVertex() { String args[] = {"offline", "-m", "graphml/IncorrectModels/singleVertex.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); - assertThat(result.getError(), is("An error occurred when running command: " + - "offline -m graphml/IncorrectModels/singleVertex.graphml random(edge_coverage(100))" + - System.lineSeparator() + "No start context found" + System.lineSeparator() + System.lineSeparator())); + assertThat(result.getError(), is("An error occurred when running command: 'offline -m graphml/IncorrectModels/singleVertex.graphml random(edge_coverage(100))'." + + System.lineSeparator() + + "No start context found" + System.lineSeparator() + System.lineSeparator())); assertThat(result.getOutput(), is("")); } @@ -71,9 +70,9 @@ public void onlyOneVertex() { public void singleStartVertex() { String args[] = {"offline", "-m", "graphml/IncorrectModels/singleStartVertex.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); - assertThat(result.getError(), is("An error occurred when running command: " + - "offline -m graphml/IncorrectModels/singleStartVertex.graphml random(edge_coverage(100))" + - System.lineSeparator() + "No start context found" + System.lineSeparator() + System.lineSeparator())); + assertThat(result.getError(), is("An error occurred when running command: 'offline -m graphml/IncorrectModels/singleStartVertex.graphml random(edge_coverage(100))'." + + System.lineSeparator() + + "No start context found" + System.lineSeparator() + System.lineSeparator())); assertThat(result.getOutput(), is("")); } @@ -85,12 +84,11 @@ public void badEdgeName() { String args[] = {"offline", "-m", "graphml/IncorrectModels/badEdgeName.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); assertThat(result.getError(), - is("When parsing model: 'graphml/IncorrectModels/badEdgeName.graphml' The string '1_badName' did not conform to GraphWalker syntax rules." - + System.lineSeparator() + is("An error occurred when running command: 'offline -m graphml/IncorrectModels/badEdgeName.graphml random(edge_coverage(100))'." + System.lineSeparator() - + "An error occurred when running command: offline -m graphml/IncorrectModels/badEdgeName.graphml random(edge_coverage(100))" + + "The following syntax error occurred when parsing: 'graphml/IncorrectModels/badEdgeName.graphml'." + System.lineSeparator() - + "Model syntax error" + System.lineSeparator() + System.lineSeparator())); + + "Syntax Error: The string '1_badName' did not conform to GraphWalker syntax rules." + System.lineSeparator() + System.lineSeparator())); assertThat(result.getOutput(), is("")); } @@ -102,12 +100,11 @@ public void badVertexName() { String args[] = {"offline", "-m", "graphml/IncorrectModels/badVertexName.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); assertThat(result.getError(), - is("When parsing model: 'graphml/IncorrectModels/badVertexName.graphml' The string '1_badName' did not conform to GraphWalker syntax rules." - + System.lineSeparator() + is("An error occurred when running command: 'offline -m graphml/IncorrectModels/badVertexName.graphml random(edge_coverage(100))'." + System.lineSeparator() - + "An error occurred when running command: offline -m graphml/IncorrectModels/badVertexName.graphml random(edge_coverage(100))" + + "The following syntax error occurred when parsing: 'graphml/IncorrectModels/badVertexName.graphml'." + System.lineSeparator() - + "Model syntax error" + System.lineSeparator() + System.lineSeparator())); + + "Syntax Error: The string '1_badName' did not conform to GraphWalker syntax rules." + System.lineSeparator() + System.lineSeparator())); assertThat(result.getOutput(), is("")); } } From b2c08d31139fdae23dd2e143c771d411b0d98eec Mon Sep 17 00:00:00 2001 From: Robert-96 Date: Tue, 22 Nov 2022 00:35:59 +0200 Subject: [PATCH 14/14] Update unit tests --- .../graphwalker/cli/IncorrectModelsTest.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java b/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java index bda48bb34..9e7a6bba2 100644 --- a/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java +++ b/graphwalker-cli/src/test/java/org/graphwalker/cli/IncorrectModelsTest.java @@ -42,11 +42,11 @@ public void wrongVertexSyntax() { String args[] = {"offline", "-m", "graphml/IncorrectModels/wrongVertexSyntax.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); assertThat(result.getError(), - is("An error occurred when running command: 'offline -m graphml/IncorrectModels/wrongVertexSyntax.graphml random(edge_coverage(100))'." - + System.lineSeparator() - + "The following syntax error occurred when parsing: 'graphml/IncorrectModels/wrongVertexSyntax.graphml'." - + System.lineSeparator() - + "Syntax Error: The string '1' did not conform to GraphWalker syntax rules." + System.lineSeparator() + System.lineSeparator())); + is("An error occurred when running command: 'offline -m graphml/IncorrectModels/wrongVertexSyntax.graphml random(edge_coverage(100))'." + + System.lineSeparator() + + "The following syntax error occurred when parsing: 'graphml/IncorrectModels/wrongVertexSyntax.graphml'." + + System.lineSeparator() + + "Syntax Error: The string '1' did not conform to GraphWalker syntax rules." + System.lineSeparator() + System.lineSeparator())); assertThat(result.getOutput(), is("")); } @@ -84,11 +84,11 @@ public void badEdgeName() { String args[] = {"offline", "-m", "graphml/IncorrectModels/badEdgeName.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); assertThat(result.getError(), - is("An error occurred when running command: 'offline -m graphml/IncorrectModels/badEdgeName.graphml random(edge_coverage(100))'." - + System.lineSeparator() - + "The following syntax error occurred when parsing: 'graphml/IncorrectModels/badEdgeName.graphml'." - + System.lineSeparator() - + "Syntax Error: The string '1_badName' did not conform to GraphWalker syntax rules." + System.lineSeparator() + System.lineSeparator())); + is("An error occurred when running command: 'offline -m graphml/IncorrectModels/badEdgeName.graphml random(edge_coverage(100))'." + + System.lineSeparator() + + "The following syntax error occurred when parsing: 'graphml/IncorrectModels/badEdgeName.graphml'." + + System.lineSeparator() + + "Syntax Error: The string '1_badName' did not conform to GraphWalker syntax rules." + System.lineSeparator() + System.lineSeparator())); assertThat(result.getOutput(), is("")); } @@ -100,11 +100,11 @@ public void badVertexName() { String args[] = {"offline", "-m", "graphml/IncorrectModels/badVertexName.graphml", "random(edge_coverage(100))"}; Result result = runCommand(args); assertThat(result.getError(), - is("An error occurred when running command: 'offline -m graphml/IncorrectModels/badVertexName.graphml random(edge_coverage(100))'." - + System.lineSeparator() - + "The following syntax error occurred when parsing: 'graphml/IncorrectModels/badVertexName.graphml'." - + System.lineSeparator() - + "Syntax Error: The string '1_badName' did not conform to GraphWalker syntax rules." + System.lineSeparator() + System.lineSeparator())); + is("An error occurred when running command: 'offline -m graphml/IncorrectModels/badVertexName.graphml random(edge_coverage(100))'." + + System.lineSeparator() + + "The following syntax error occurred when parsing: 'graphml/IncorrectModels/badVertexName.graphml'." + + System.lineSeparator() + + "Syntax Error: The string '1_badName' did not conform to GraphWalker syntax rules." + System.lineSeparator() + System.lineSeparator())); assertThat(result.getOutput(), is("")); } }