fix #645 #734 #740 #610

kusumotolab · Dec 1, 2020 · 51d0e00 · 51d0e00
1 parent eb78559
commit 51d0e00
Show file tree

Hide file tree

Showing 16 changed files with 364 additions and 226 deletions.
diff --git a/example/Abnormals/BuildFailure/kgenprog.toml b/example/Abnormals/BuildFailure/kgenprog.toml
@@ -0,0 +1,4 @@
+root-dir = "./"
+src = ["src/example/CloseToZero.java"]
+test = ["src/example/CloseToZeroTest.java"]
+
diff --git a/example/Abnormals/BuildFailure/src/example/CloseToZero.java b/example/Abnormals/BuildFailure/src/example/CloseToZero.java
@@ -0,0 +1,15 @@
+package example;
+
+public class CloseToZero {
+
+  public int close_to_zero(int n) {
+    if (n == 0) {
+      k++; // build failure
+    } else if (n > 0) {
+      n--;
+    } else {
+      n++;
+    }
+    return n;
+  }
+}
diff --git a/example/Abnormals/BuildFailure/src/example/CloseToZeroTest.java b/example/Abnormals/BuildFailure/src/example/CloseToZeroTest.java
@@ -0,0 +1,26 @@
+package example;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class CloseToZeroTest {
+  @Test
+  public void test01() {
+    assertEquals(9, new CloseToZero().close_to_zero(10));
+  }
+
+  @Test
+  public void test02() {
+    assertEquals(99, new CloseToZero().close_to_zero(100));
+  }
+
+  @Test
+  public void test03() {
+    assertEquals(0, new CloseToZero().close_to_zero(0));
+  }
+
+  @Test
+  public void test04() {
+    assertEquals(-9, new CloseToZero().close_to_zero(-10));
+  }
+}
diff --git a/example/Abnormals/NoBugs/kgenprog.toml b/example/Abnormals/NoBugs/kgenprog.toml
@@ -0,0 +1,4 @@
+root-dir = "./"
+src = ["src/example/CloseToZero.java"]
+test = ["src/example/CloseToZeroTest.java"]
+
diff --git a/example/Abnormals/NoBugs/src/example/CloseToZero.java b/example/Abnormals/NoBugs/src/example/CloseToZero.java
@@ -0,0 +1,15 @@
+package example;
+
+public class CloseToZero {
+
+  public int close_to_zero(int n) {
+    if (n == 0) {
+      ; // do nothing, means no bugs
+    } else if (n > 0) {
+      n--;
+    } else {
+      n++;
+    }
+    return n;
+  }
+}
diff --git a/example/Abnormals/NoBugs/src/example/CloseToZeroTest.java b/example/Abnormals/NoBugs/src/example/CloseToZeroTest.java
@@ -0,0 +1,26 @@
+package example;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class CloseToZeroTest {
+  @Test
+  public void test01() {
+    assertEquals(9, new CloseToZero().close_to_zero(10));
+  }
+
+  @Test
+  public void test02() {
+    assertEquals(99, new CloseToZero().close_to_zero(100));
+  }
+
+  @Test
+  public void test03() {
+    assertEquals(0, new CloseToZero().close_to_zero(0));
+  }
+
+  @Test
+  public void test04() {
+    assertEquals(-9, new CloseToZero().close_to_zero(-10));
+  }
+}
diff --git a/src/main/java/jp/kusumotolab/kgenprog/CUILauncher.java b/src/main/java/jp/kusumotolab/kgenprog/CUILauncher.java
@@ -1,10 +1,10 @@
 package jp.kusumotolab.kgenprog;
 
-import java.util.List;
 import java.util.Random;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import ch.qos.logback.classic.Level;
+import jp.kusumotolab.kgenprog.KGenProgMain.ExitStatus;
 import jp.kusumotolab.kgenprog.fl.FaultLocalization;
 import jp.kusumotolab.kgenprog.ga.codegeneration.DefaultSourceCodeGeneration;
 import jp.kusumotolab.kgenprog.ga.codegeneration.SourceCodeGeneration;
@@ -19,7 +19,6 @@
 import jp.kusumotolab.kgenprog.ga.selection.VariantSelection;
 import jp.kusumotolab.kgenprog.ga.validation.DefaultCodeValidation;
 import jp.kusumotolab.kgenprog.ga.validation.SourceCodeValidation;
-import jp.kusumotolab.kgenprog.ga.variant.Variant;
 import jp.kusumotolab.kgenprog.output.Exporters;
 import jp.kusumotolab.kgenprog.project.test.LocalTestExecutor;
 import jp.kusumotolab.kgenprog.project.test.TestExecutor;
@@ -38,7 +37,7 @@ public static void main(final String[] args) {
     }
   }
 
-  public List<Variant> launch(final Configuration config) {
+  public ExitStatus launch(final Configuration config) {
     setLogLevel(config.getLogLevel());
 
     final FaultLocalization faultLocalization = config.getFaultLocalization()

diff --git a/src/main/java/jp/kusumotolab/kgenprog/Configuration.java b/src/main/java/jp/kusumotolab/kgenprog/Configuration.java
@@ -22,6 +22,7 @@
 import org.kohsuke.args4j.spi.StringArrayOptionHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import com.electronwill.nightconfig.core.UnmodifiableConfig.Entry;
 import com.electronwill.nightconfig.core.conversion.Conversion;
 import com.electronwill.nightconfig.core.conversion.Converter;
 import com.electronwill.nightconfig.core.conversion.InvalidValueException;
@@ -334,14 +335,12 @@ private Builder() {
       testPaths = new ArrayList<>();
     }
 
-    public static Configuration buildFromCmdLineArgs(final String[] args)
-        throws IllegalArgumentException {
+    public static Configuration buildFromCmdLineArgs(final String[] args) {
       final Builder builder = createFromCmdLineArgs(args);
       return builder.build();
     }
 
-    public static Builder createFromCmdLineArgs(final String[] args)
-        throws IllegalArgumentException {
+    public static Builder createFromCmdLineArgs(final String[] args) {
 
       final Builder builder = new Builder();
       final CmdLineParser parser = new CmdLineParser(builder);
@@ -503,19 +502,19 @@ public Builder setHistoryRecord(final boolean historyRecord) {
       return this;
     }
 
-    private static void validateArgument(final Builder builder) throws IllegalArgumentException {
+    private static void validateArgument(final Builder builder) {
       validateExistences(builder);
       validateCurrentDir(builder);
     }
 
-    private static void validateExistences(final Builder builder) throws IllegalArgumentException {
+    private static void validateExistences(final Builder builder) {
       validateExistence(builder.rootDir);
       builder.productPaths.forEach(Builder::validateExistence);
       builder.testPaths.forEach(Builder::validateExistence);
       builder.classPaths.forEach(Builder::validateExistence);
     }
 
-    private static void validateExistence(final Path path) throws IllegalArgumentException {
+    private static void validateExistence(final Path path) {
       if (Files.notExists(path)) {
         log.error(path.toString() + " does not exist.");
         throw new IllegalArgumentException(path.toString() + " does not exist.");
@@ -549,7 +548,7 @@ private static boolean needsParseConfigFile(final String[] args) {
           .contains("--config");
     }
 
-    private void parseConfigFile() throws InvalidValueException, NoSuchFileException {
+    private void parseConfigFile() throws NoSuchFileException {
       try (final FileConfig config = loadConfig()) {
         final ObjectConverter converter = new ObjectConverter();
         converter.toObject(config, this);
@@ -563,7 +562,7 @@ private void findOptionsSetInConfigFile() throws NoSuchFileException {
         // 設定ファイルに記述されているオプション一覧を取得
         final Set<String> optionNames = config.entrySet()
             .stream()
-            .map(o -> o.getKey())
+            .map(Entry::getKey)
             .collect(Collectors.toSet());
 
         final Class<?> clazz = this.getClass();