From c28aa4004a994c0b2ea6eb1ac1ea976cc1b2521a Mon Sep 17 00:00:00 2001 From: Victor Date: Sun, 24 Jul 2016 12:17:05 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- src/test/java/com/annimon/ownlang/parser/ProgramsTest.java | 2 +- .../{java => }/resources/expressions/assignmentExpression.own | 0 .../resources/expressions/binaryExpressionOnNumbers.own | 0 .../resources/expressions/binaryExpressionOnStrings.own | 0 src/test/{java => }/resources/expressions/binaryUnaryExpr.own | 0 .../{java => }/resources/expressions/functionReference.own | 0 .../resources/expressions/unaryExpressionOnStrings.own | 0 src/test/{java => }/resources/expressions/varFuncSameName.own | 0 src/test/{java => }/resources/modules/date/compareDates.own | 0 src/test/{java => }/resources/modules/date/dateFormat.own | 0 src/test/{java => }/resources/modules/date/dateParse.own | 0 src/test/{java => }/resources/modules/date/newDate.own | 0 src/test/{java => }/resources/modules/files/files.own | 0 src/test/{java => }/resources/modules/functional/chain.own | 0 src/test/{java => }/resources/modules/java/classes.own | 0 src/test/{java => }/resources/modules/std/range.own | 0 src/test/{java => }/resources/other/recursion.own | 0 src/test/{java => }/resources/other/scope.own | 0 src/test/{java => }/resources/other/types.own | 0 20 files changed, 3 insertions(+), 3 deletions(-) rename src/test/{java => }/resources/expressions/assignmentExpression.own (100%) rename src/test/{java => }/resources/expressions/binaryExpressionOnNumbers.own (100%) rename src/test/{java => }/resources/expressions/binaryExpressionOnStrings.own (100%) rename src/test/{java => }/resources/expressions/binaryUnaryExpr.own (100%) rename src/test/{java => }/resources/expressions/functionReference.own (100%) rename src/test/{java => }/resources/expressions/unaryExpressionOnStrings.own (100%) rename src/test/{java => }/resources/expressions/varFuncSameName.own (100%) rename src/test/{java => }/resources/modules/date/compareDates.own (100%) rename src/test/{java => }/resources/modules/date/dateFormat.own (100%) rename src/test/{java => }/resources/modules/date/dateParse.own (100%) rename src/test/{java => }/resources/modules/date/newDate.own (100%) rename src/test/{java => }/resources/modules/files/files.own (100%) rename src/test/{java => }/resources/modules/functional/chain.own (100%) rename src/test/{java => }/resources/modules/java/classes.own (100%) rename src/test/{java => }/resources/modules/std/range.own (100%) rename src/test/{java => }/resources/other/recursion.own (100%) rename src/test/{java => }/resources/other/scope.own (100%) rename src/test/{java => }/resources/other/types.own (100%) diff --git a/build.gradle b/build.gradle index 5f3177b..6bbfc05 100644 --- a/build.gradle +++ b/build.gradle @@ -56,6 +56,6 @@ dependencies { compile 'org.json:json:20160212' testCompile 'junit:junit:4.12' - testCompile 'org.openjdk.jmh:jmh-core:1.12' - testCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.12' + testCompile 'org.openjdk.jmh:jmh-core:1.13' + testCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.13' } diff --git a/src/test/java/com/annimon/ownlang/parser/ProgramsTest.java b/src/test/java/com/annimon/ownlang/parser/ProgramsTest.java index 546e37d..c8ed605 100644 --- a/src/test/java/com/annimon/ownlang/parser/ProgramsTest.java +++ b/src/test/java/com/annimon/ownlang/parser/ProgramsTest.java @@ -24,7 +24,7 @@ import org.junit.runners.Parameterized.Parameters; @RunWith(value = Parameterized.class) public class ProgramsTest { - private static final String RES_DIR = "test/resources"; + private static final String RES_DIR = "src/test/resources"; private final String programPath; diff --git a/src/test/java/resources/expressions/assignmentExpression.own b/src/test/resources/expressions/assignmentExpression.own similarity index 100% rename from src/test/java/resources/expressions/assignmentExpression.own rename to src/test/resources/expressions/assignmentExpression.own diff --git a/src/test/java/resources/expressions/binaryExpressionOnNumbers.own b/src/test/resources/expressions/binaryExpressionOnNumbers.own similarity index 100% rename from src/test/java/resources/expressions/binaryExpressionOnNumbers.own rename to src/test/resources/expressions/binaryExpressionOnNumbers.own diff --git a/src/test/java/resources/expressions/binaryExpressionOnStrings.own b/src/test/resources/expressions/binaryExpressionOnStrings.own similarity index 100% rename from src/test/java/resources/expressions/binaryExpressionOnStrings.own rename to src/test/resources/expressions/binaryExpressionOnStrings.own diff --git a/src/test/java/resources/expressions/binaryUnaryExpr.own b/src/test/resources/expressions/binaryUnaryExpr.own similarity index 100% rename from src/test/java/resources/expressions/binaryUnaryExpr.own rename to src/test/resources/expressions/binaryUnaryExpr.own diff --git a/src/test/java/resources/expressions/functionReference.own b/src/test/resources/expressions/functionReference.own similarity index 100% rename from src/test/java/resources/expressions/functionReference.own rename to src/test/resources/expressions/functionReference.own diff --git a/src/test/java/resources/expressions/unaryExpressionOnStrings.own b/src/test/resources/expressions/unaryExpressionOnStrings.own similarity index 100% rename from src/test/java/resources/expressions/unaryExpressionOnStrings.own rename to src/test/resources/expressions/unaryExpressionOnStrings.own diff --git a/src/test/java/resources/expressions/varFuncSameName.own b/src/test/resources/expressions/varFuncSameName.own similarity index 100% rename from src/test/java/resources/expressions/varFuncSameName.own rename to src/test/resources/expressions/varFuncSameName.own diff --git a/src/test/java/resources/modules/date/compareDates.own b/src/test/resources/modules/date/compareDates.own similarity index 100% rename from src/test/java/resources/modules/date/compareDates.own rename to src/test/resources/modules/date/compareDates.own diff --git a/src/test/java/resources/modules/date/dateFormat.own b/src/test/resources/modules/date/dateFormat.own similarity index 100% rename from src/test/java/resources/modules/date/dateFormat.own rename to src/test/resources/modules/date/dateFormat.own diff --git a/src/test/java/resources/modules/date/dateParse.own b/src/test/resources/modules/date/dateParse.own similarity index 100% rename from src/test/java/resources/modules/date/dateParse.own rename to src/test/resources/modules/date/dateParse.own diff --git a/src/test/java/resources/modules/date/newDate.own b/src/test/resources/modules/date/newDate.own similarity index 100% rename from src/test/java/resources/modules/date/newDate.own rename to src/test/resources/modules/date/newDate.own diff --git a/src/test/java/resources/modules/files/files.own b/src/test/resources/modules/files/files.own similarity index 100% rename from src/test/java/resources/modules/files/files.own rename to src/test/resources/modules/files/files.own diff --git a/src/test/java/resources/modules/functional/chain.own b/src/test/resources/modules/functional/chain.own similarity index 100% rename from src/test/java/resources/modules/functional/chain.own rename to src/test/resources/modules/functional/chain.own diff --git a/src/test/java/resources/modules/java/classes.own b/src/test/resources/modules/java/classes.own similarity index 100% rename from src/test/java/resources/modules/java/classes.own rename to src/test/resources/modules/java/classes.own diff --git a/src/test/java/resources/modules/std/range.own b/src/test/resources/modules/std/range.own similarity index 100% rename from src/test/java/resources/modules/std/range.own rename to src/test/resources/modules/std/range.own diff --git a/src/test/java/resources/other/recursion.own b/src/test/resources/other/recursion.own similarity index 100% rename from src/test/java/resources/other/recursion.own rename to src/test/resources/other/recursion.own diff --git a/src/test/java/resources/other/scope.own b/src/test/resources/other/scope.own similarity index 100% rename from src/test/java/resources/other/scope.own rename to src/test/resources/other/scope.own diff --git a/src/test/java/resources/other/types.own b/src/test/resources/other/types.own similarity index 100% rename from src/test/java/resources/other/types.own rename to src/test/resources/other/types.own