From 235bf8a716c477efa7dc45a09011e0d4256e1ae0 Mon Sep 17 00:00:00 2001 From: syoon2 Date: Wed, 16 Aug 2023 13:34:24 +0900 Subject: [PATCH] Fix broken Gradle configurations --- .gitignore | 1 + build.gradle | 60 ++++++++---------- .../williamfiset/fastjavaio/InputReader.java | 0 .../williamfiset/fastjavaio/BenchMark.java | 3 +- .../fastjavaio/TestInputReader.java | 15 ++--- .../fastjavaio/resources/data_generator.py | 0 .../resources/double_data/doubles.txt | 0 .../resources/double_data/doubles_small.txt | 0 .../fastjavaio/resources/graphs.numbers | Bin .../resources/integer_data/integers.txt | 0 .../resources/integer_data/integers_small.txt | 0 .../resources/string_data/short_strings.txt | 0 .../string_data/short_strings_spaces.txt | 0 .../resources/string_data/strings_mini.txt | 0 .../resources/string_data/strings_small.txt | 0 15 files changed, 37 insertions(+), 42 deletions(-) rename {com => src/main/java/com}/williamfiset/fastjavaio/InputReader.java (100%) rename {javatests => src/test/java}/com/williamfiset/fastjavaio/BenchMark.java (98%) rename {javatests => src/test/java}/com/williamfiset/fastjavaio/TestInputReader.java (97%) rename {javatests => src/test/java}/com/williamfiset/fastjavaio/resources/data_generator.py (100%) rename {javatests => src/test/java}/com/williamfiset/fastjavaio/resources/double_data/doubles.txt (100%) rename {javatests => src/test/java}/com/williamfiset/fastjavaio/resources/double_data/doubles_small.txt (100%) rename {javatests => src/test/java}/com/williamfiset/fastjavaio/resources/graphs.numbers (100%) rename {javatests => src/test/java}/com/williamfiset/fastjavaio/resources/integer_data/integers.txt (100%) rename {javatests => src/test/java}/com/williamfiset/fastjavaio/resources/integer_data/integers_small.txt (100%) rename {javatests => src/test/java}/com/williamfiset/fastjavaio/resources/string_data/short_strings.txt (100%) rename {javatests => src/test/java}/com/williamfiset/fastjavaio/resources/string_data/short_strings_spaces.txt (100%) rename {javatests => src/test/java}/com/williamfiset/fastjavaio/resources/string_data/strings_mini.txt (100%) rename {javatests => src/test/java}/com/williamfiset/fastjavaio/resources/string_data/strings_small.txt (100%) diff --git a/.gitignore b/.gitignore index d22fba7..b94ecce 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .gradle /build/ +bin/* # Ignore Gradle GUI config gradle-app.setting diff --git a/build.gradle b/build.gradle index 9681c46..b0cb3ac 100644 --- a/build.gradle +++ b/build.gradle @@ -11,21 +11,21 @@ repositories { } dependencies { - // JUnit framework - testCompile 'junit:junit:4.+' - compile 'junit:junit:4.+' + // JUnit 5 / Jupiter + testImplementation('org.junit.jupiter:junit-jupiter:5.10.0') + testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.10.0') // Test mocking framework - testCompile "org.mockito:mockito-core:1.+" + testImplementation "org.mockito:mockito-core:5.+" // Google Guava lib - compile group: 'com.google.guava', name: 'guava', version: '22.0' + testImplementation group: 'com.google.guava', name: 'guava', version: '32.1.2-jre' // Google truth API - compile "com.google.truth:truth:0.36" + testImplementation "com.google.truth:truth:1.1.5" // Apache commons lang - compile 'org.apache.commons:commons-lang3:3.6' + implementation 'org.apache.commons:commons-lang3:3.13.0' } test { @@ -33,38 +33,34 @@ test { testLogging.showStandardStreams = true } -String javaAlgorithmsPackage = "com/williamfiset/fastjavaio"; -String javatestsAlgorithmsPackage = "javatests/com/williamfiset/fastjavaio"; +tasks.named('test', Test) { + useJUnitPlatform() +} -sourceSets { - main { - java { - srcDirs = [ - javaAlgorithmsPackage, - ] - } - } - test { - java { - srcDirs = [ - javatestsAlgorithmsPackage, - ] - } - } +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + options.compilerArgs += [ + '-Xlint:unchecked', + '-Xlint:deprecation' + ] } +// Options when compiling tests +compileTestJava { + options.encoding = 'UTF-8' + options.compilerArgs += [ + '-Xlint:unchecked', + '-Xlint:deprecation' + ] +} task buildDependenciesFolder(type: Copy) { - from configurations.compile + from configurations.implementation into './dependencies' } -task compileInputReader(type: Exec) { - commandLine 'javac', (javaAlgorithmsPackage + '/InputReader.java') -} - // Creates fastjavaio jar file. Call with "$ gradle makeJar" -task makeJar(type: Exec) { - dependsOn compileInputReader - commandLine 'jar', '-cvf', 'fastjavaio.jar', (javaAlgorithmsPackage + '/InputReader.class') +jar { + archiveBaseName = 'fastjavaio' + archiveVersion = '1.1' } diff --git a/com/williamfiset/fastjavaio/InputReader.java b/src/main/java/com/williamfiset/fastjavaio/InputReader.java similarity index 100% rename from com/williamfiset/fastjavaio/InputReader.java rename to src/main/java/com/williamfiset/fastjavaio/InputReader.java diff --git a/javatests/com/williamfiset/fastjavaio/BenchMark.java b/src/test/java/com/williamfiset/fastjavaio/BenchMark.java similarity index 98% rename from javatests/com/williamfiset/fastjavaio/BenchMark.java rename to src/test/java/com/williamfiset/fastjavaio/BenchMark.java index 2f7e43c..da113bc 100644 --- a/javatests/com/williamfiset/fastjavaio/BenchMark.java +++ b/src/test/java/com/williamfiset/fastjavaio/BenchMark.java @@ -3,9 +3,8 @@ * relative to Java's BufferedReader class * @author William Fiset **/ -package javatests.com.williamfiset.fastjavaio; +package com.williamfiset.fastjavaio; -import com.williamfiset.fastjavaio.InputReader; import java.io.*; public class BenchMark { diff --git a/javatests/com/williamfiset/fastjavaio/TestInputReader.java b/src/test/java/com/williamfiset/fastjavaio/TestInputReader.java similarity index 97% rename from javatests/com/williamfiset/fastjavaio/TestInputReader.java rename to src/test/java/com/williamfiset/fastjavaio/TestInputReader.java index 4c33569..ad05b4d 100644 --- a/javatests/com/williamfiset/fastjavaio/TestInputReader.java +++ b/src/test/java/com/williamfiset/fastjavaio/TestInputReader.java @@ -1,9 +1,8 @@ -package javatests.com.williamfiset.fastjavaio; +package com.williamfiset.fastjavaio; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; -import com.williamfiset.fastjavaio.InputReader; -import org.junit.*; +import org.junit.jupiter.api.*; import java.util.*; import java.io.*; @@ -17,14 +16,14 @@ public static InputReader getReader(String s) { return new InputReader(is, bufferSize); } - @Test(expected=IllegalArgumentException.class) + @Test public void testIllegalBufferSz1() { - new InputReader(0); + assertThrows(IllegalArgumentException.class, () -> new InputReader(0)); } - @Test(expected=IllegalArgumentException.class) + @Test public void testIllegalBufferSz2() { - new InputReader(-1); + assertThrows(IllegalArgumentException.class, () -> new InputReader(-1)); } @Test diff --git a/javatests/com/williamfiset/fastjavaio/resources/data_generator.py b/src/test/java/com/williamfiset/fastjavaio/resources/data_generator.py similarity index 100% rename from javatests/com/williamfiset/fastjavaio/resources/data_generator.py rename to src/test/java/com/williamfiset/fastjavaio/resources/data_generator.py diff --git a/javatests/com/williamfiset/fastjavaio/resources/double_data/doubles.txt b/src/test/java/com/williamfiset/fastjavaio/resources/double_data/doubles.txt similarity index 100% rename from javatests/com/williamfiset/fastjavaio/resources/double_data/doubles.txt rename to src/test/java/com/williamfiset/fastjavaio/resources/double_data/doubles.txt diff --git a/javatests/com/williamfiset/fastjavaio/resources/double_data/doubles_small.txt b/src/test/java/com/williamfiset/fastjavaio/resources/double_data/doubles_small.txt similarity index 100% rename from javatests/com/williamfiset/fastjavaio/resources/double_data/doubles_small.txt rename to src/test/java/com/williamfiset/fastjavaio/resources/double_data/doubles_small.txt diff --git a/javatests/com/williamfiset/fastjavaio/resources/graphs.numbers b/src/test/java/com/williamfiset/fastjavaio/resources/graphs.numbers similarity index 100% rename from javatests/com/williamfiset/fastjavaio/resources/graphs.numbers rename to src/test/java/com/williamfiset/fastjavaio/resources/graphs.numbers diff --git a/javatests/com/williamfiset/fastjavaio/resources/integer_data/integers.txt b/src/test/java/com/williamfiset/fastjavaio/resources/integer_data/integers.txt similarity index 100% rename from javatests/com/williamfiset/fastjavaio/resources/integer_data/integers.txt rename to src/test/java/com/williamfiset/fastjavaio/resources/integer_data/integers.txt diff --git a/javatests/com/williamfiset/fastjavaio/resources/integer_data/integers_small.txt b/src/test/java/com/williamfiset/fastjavaio/resources/integer_data/integers_small.txt similarity index 100% rename from javatests/com/williamfiset/fastjavaio/resources/integer_data/integers_small.txt rename to src/test/java/com/williamfiset/fastjavaio/resources/integer_data/integers_small.txt diff --git a/javatests/com/williamfiset/fastjavaio/resources/string_data/short_strings.txt b/src/test/java/com/williamfiset/fastjavaio/resources/string_data/short_strings.txt similarity index 100% rename from javatests/com/williamfiset/fastjavaio/resources/string_data/short_strings.txt rename to src/test/java/com/williamfiset/fastjavaio/resources/string_data/short_strings.txt diff --git a/javatests/com/williamfiset/fastjavaio/resources/string_data/short_strings_spaces.txt b/src/test/java/com/williamfiset/fastjavaio/resources/string_data/short_strings_spaces.txt similarity index 100% rename from javatests/com/williamfiset/fastjavaio/resources/string_data/short_strings_spaces.txt rename to src/test/java/com/williamfiset/fastjavaio/resources/string_data/short_strings_spaces.txt diff --git a/javatests/com/williamfiset/fastjavaio/resources/string_data/strings_mini.txt b/src/test/java/com/williamfiset/fastjavaio/resources/string_data/strings_mini.txt similarity index 100% rename from javatests/com/williamfiset/fastjavaio/resources/string_data/strings_mini.txt rename to src/test/java/com/williamfiset/fastjavaio/resources/string_data/strings_mini.txt diff --git a/javatests/com/williamfiset/fastjavaio/resources/string_data/strings_small.txt b/src/test/java/com/williamfiset/fastjavaio/resources/string_data/strings_small.txt similarity index 100% rename from javatests/com/williamfiset/fastjavaio/resources/string_data/strings_small.txt rename to src/test/java/com/williamfiset/fastjavaio/resources/string_data/strings_small.txt