Skip to content

Commit

Permalink
Merge pull request #324 from hazendaz/master
Browse files Browse the repository at this point in the history
Use correct exception and add some comments
  • Loading branch information
hazendaz authored Nov 11, 2023
2 parents ddffa8e + 68c5579 commit d38bc31
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/main/java/org/apache/ibatis/migration/CommandLine.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.apache.ibatis.migration.utils.Util;

public class CommandLine {
// Leave this non static as it is messed with in this project tests
private final PrintStream console = System.out;
private final String[] args;

Expand Down
4 changes: 3 additions & 1 deletion src/test/java/org/apache/ibatis/migration/MigratorTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.github.stefanbirkner.systemlambda.SystemLambda;

import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.nio.file.Files;
import java.nio.file.Path;
Expand Down Expand Up @@ -55,7 +56,7 @@ class MigratorTest {
private static Properties env;

@BeforeAll
static void setup() throws Exception {
static void setup() throws IOException {
dir = Resources.getResourceAsFile("org/apache/ibatis/migration/example");
env = Resources.getResourceAsProperties("org/apache/ibatis/migration/example/environments/development.properties");
}
Expand All @@ -80,6 +81,7 @@ void testStatusContainsNoPendingEntriesUsingStatusShorthand() throws Exception {
assertTrue(output.contains("...pending..."));
}

// TODO This causes hsqldb 2.7.1 or 2.7.2 to blow up
@Test
@Order(3)
void testUpCommandWithSpecifiedSteps() throws Exception {
Expand Down

0 comments on commit d38bc31

Please sign in to comment.