From 4c6575c31306cc757ea406b9c18f0fe704a7245e Mon Sep 17 00:00:00 2001 From: shinsuke-mat Date: Thu, 15 Nov 2018 17:53:11 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=82=B9=E3=83=AC=E3=83=83=E3=83=89?= =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=A0=E3=82=A2=E3=82=A6=E3=83=88=E3=81=AE?= =?UTF-8?q?=E6=8E=92=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jp/kusumotolab/kgenprog/project/test/TestExecutor.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/jp/kusumotolab/kgenprog/project/test/TestExecutor.java b/src/main/java/jp/kusumotolab/kgenprog/project/test/TestExecutor.java index 74a1e69a0..9499405f1 100644 --- a/src/main/java/jp/kusumotolab/kgenprog/project/test/TestExecutor.java +++ b/src/main/java/jp/kusumotolab/kgenprog/project/test/TestExecutor.java @@ -4,8 +4,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import jp.kusumotolab.kgenprog.Configuration; import jp.kusumotolab.kgenprog.project.GeneratedSourceCode; import jp.kusumotolab.kgenprog.project.build.BuildResults; @@ -34,7 +32,7 @@ public TestResults exec(final GeneratedSourceCode generatedSourceCode) { final Future future = executor.submit(testThread); executor.shutdown(); try { - future.get(config.getTestTimeLimitSeconds(), TimeUnit.SECONDS); + future.get(); } catch (final ExecutionException e) { // TODO Should handle safely // Executor側での例外をそのまま通す. @@ -42,8 +40,6 @@ public TestResults exec(final GeneratedSourceCode generatedSourceCode) { } catch (final InterruptedException e) { // TODO Should handle safely e.printStackTrace(); - } catch (final TimeoutException e) { - return EmptyTestResults.instance; } return testThread.getTestResults(); From b1cb44927f6e666b0b76987e1eb62a6d603f04d7 Mon Sep 17 00:00:00 2001 From: shinsuke-mat Date: Thu, 15 Nov 2018 17:53:31 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=B9=E3=83=AC=E3=83=83=E3=83=89?= =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=A0=E3=82=A2=E3=82=A6=E3=83=88=E6=8E=92?= =?UTF-8?q?=E9=99=A4=E3=81=AB=E3=82=88=E3=82=8B=E7=84=A1=E9=99=90=E3=83=AB?= =?UTF-8?q?=E3=83=BC=E3=83=97=E3=83=86=E3=82=B9=E3=83=88=E3=81=AEIgnore?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kusumotolab/kgenprog/project/test/TestExecutorTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/java/jp/kusumotolab/kgenprog/project/test/TestExecutorTest.java b/src/test/java/jp/kusumotolab/kgenprog/project/test/TestExecutorTest.java index bdf9e6c4b..13efa9a71 100644 --- a/src/test/java/jp/kusumotolab/kgenprog/project/test/TestExecutorTest.java +++ b/src/test/java/jp/kusumotolab/kgenprog/project/test/TestExecutorTest.java @@ -21,6 +21,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.junit.Ignore; import org.junit.Test; import jp.kusumotolab.kgenprog.Configuration; import jp.kusumotolab.kgenprog.project.ASTLocation; @@ -184,6 +185,9 @@ public void testExecWithRetrievingFLParametersWithInnerClass() throws Exception assertThat(nf2).isEqualTo(1); // FooTest#test03 } + @Ignore + // #408 テスト打ち切り方針をJUnitアノテーションに変更したので,以下テストは成功しなくなった. + // JUnitアノテーションの差し込みは Variant 生成時に限るので,以下テストでは適切にタイムアウト処理が行われず無限ループとなる. @Test // 無限ループする題材の確認 public void testExecForInfiniteLoop() throws Exception {