From 69dfcc61d3fdb28c07fd22cdfc385f286d72be20 Mon Sep 17 00:00:00 2001 From: mperor Date: Sun, 27 Oct 2024 22:23:25 +0100 Subject: [PATCH] Divide project into submodules: jdk + basics --- .github/workflows/gradle.yml | 3 +- README.md | 33 ++----------- basics/README.md | 5 ++ .../main/java/pl/mperor/lab/java/Main.java | 7 +++ .../java/pl/mperor/lab/java/JavaBasics.java | 21 ++++++++ build.gradle | 46 ++++++++---------- jdk/README.md | 31 ++++++++++++ jdk/build.gradle | 10 ++++ .../main/java/pl/mperor/lab/java/Hidden.java | 0 .../main/java/pl/mperor/lab/java/Main.java | 2 +- .../java/pl/mperor/lab/java/SwingForm.java | 0 .../java/pl/mperor/lab/java/generic/Box.java | 0 .../mperor/lab/java/jndi/CustomContext.java | 0 .../jndi/CustomInitialContextFactory.java | 0 .../pl/mperor/lab/java/lang/JavaBean.java | 0 .../pl/mperor/lab/java/lang/OuterClass.java | 0 .../pl/mperor/lab/java/sealed/AlsoFinal.java | 0 .../pl/mperor/lab/java/sealed/AlsoSealed.java | 0 .../java/pl/mperor/lab/java/sealed/Final.java | 0 .../lab/java/sealed/ImplicitlyFinal.java | 0 .../pl/mperor/lab/java/sealed/NonSealed.java | 0 .../pl/mperor/lab/java/sealed/Sealed.java | 0 .../test/java/pl/mperor/lab/TestUtils.java | 0 .../test/java/pl/mperor/lab/java/Java1.java | 0 .../test/java/pl/mperor/lab/java/Java10.java | 0 .../test/java/pl/mperor/lab/java/Java11.java | 0 .../test/java/pl/mperor/lab/java/Java12.java | 0 .../test/java/pl/mperor/lab/java/Java13.java | 0 .../test/java/pl/mperor/lab/java/Java14.java | 0 .../test/java/pl/mperor/lab/java/Java15.java | 0 .../test/java/pl/mperor/lab/java/Java16.java | 0 .../test/java/pl/mperor/lab/java/Java17.java | 0 .../test/java/pl/mperor/lab/java/Java18.java | 0 .../test/java/pl/mperor/lab/java/Java19.java | 0 .../test/java/pl/mperor/lab/java/Java2.java | 0 .../test/java/pl/mperor/lab/java/Java20.java | 0 .../test/java/pl/mperor/lab/java/Java21.java | 0 .../test/java/pl/mperor/lab/java/Java22.java | 0 .../test/java/pl/mperor/lab/java/Java23.java | 0 .../test/java/pl/mperor/lab/java/Java3.java | 0 .../test/java/pl/mperor/lab/java/Java4.java | 0 .../test/java/pl/mperor/lab/java/Java5.java | 0 .../test/java/pl/mperor/lab/java/Java6.java | 1 + .../test/java/pl/mperor/lab/java/Java7.java | 0 .../test/java/pl/mperor/lab/java/Java8.java | 0 .../test/java/pl/mperor/lab/java/Java9.java | 0 {src => jdk/src}/test/resources/bean | Bin {src => jdk/src}/test/resources/beep.wav | Bin .../src}/test/resources/encoding/fileUTF8.txt | 0 .../test/resources/encoding/fileWin1250.txt | 0 {src => jdk/src}/test/resources/imageio.png | Bin {src => jdk/src}/test/resources/nio.txt | 0 {src => jdk/src}/test/resources/nio2.txt | 0 settings.gradle | 2 +- 54 files changed, 104 insertions(+), 57 deletions(-) create mode 100644 basics/README.md create mode 100644 basics/src/main/java/pl/mperor/lab/java/Main.java create mode 100644 basics/src/test/java/pl/mperor/lab/java/JavaBasics.java create mode 100644 jdk/README.md create mode 100644 jdk/build.gradle rename {src => jdk/src}/main/java/pl/mperor/lab/java/Hidden.java (100%) rename {src => jdk/src}/main/java/pl/mperor/lab/java/Main.java (75%) rename {src => jdk/src}/main/java/pl/mperor/lab/java/SwingForm.java (100%) rename {src => jdk/src}/main/java/pl/mperor/lab/java/generic/Box.java (100%) rename {src => jdk/src}/main/java/pl/mperor/lab/java/jndi/CustomContext.java (100%) rename {src => jdk/src}/main/java/pl/mperor/lab/java/jndi/CustomInitialContextFactory.java (100%) rename {src => jdk/src}/main/java/pl/mperor/lab/java/lang/JavaBean.java (100%) rename {src => jdk/src}/main/java/pl/mperor/lab/java/lang/OuterClass.java (100%) rename {src => jdk/src}/main/java/pl/mperor/lab/java/sealed/AlsoFinal.java (100%) rename {src => jdk/src}/main/java/pl/mperor/lab/java/sealed/AlsoSealed.java (100%) rename {src => jdk/src}/main/java/pl/mperor/lab/java/sealed/Final.java (100%) rename {src => jdk/src}/main/java/pl/mperor/lab/java/sealed/ImplicitlyFinal.java (100%) rename {src => jdk/src}/main/java/pl/mperor/lab/java/sealed/NonSealed.java (100%) rename {src => jdk/src}/main/java/pl/mperor/lab/java/sealed/Sealed.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/TestUtils.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java1.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java10.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java11.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java12.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java13.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java14.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java15.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java16.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java17.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java18.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java19.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java2.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java20.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java21.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java22.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java23.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java3.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java4.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java5.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java6.java (95%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java7.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java8.java (100%) rename {src => jdk/src}/test/java/pl/mperor/lab/java/Java9.java (100%) rename {src => jdk/src}/test/resources/bean (100%) rename {src => jdk/src}/test/resources/beep.wav (100%) rename {src => jdk/src}/test/resources/encoding/fileUTF8.txt (100%) rename {src => jdk/src}/test/resources/encoding/fileWin1250.txt (100%) rename {src => jdk/src}/test/resources/imageio.png (100%) rename {src => jdk/src}/test/resources/nio.txt (100%) rename {src => jdk/src}/test/resources/nio2.txt (100%) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 7df3c05..a04db81 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -47,7 +47,8 @@ jobs: if: always() with: files: | - build/test-results/test/*.xml + jdk/build/test-results/test/*.xml + basics/build/test-results/test/*.xml - name: Set badge color shell: bash diff --git a/README.md b/README.md index 9fb1efd..c7a2362 100644 --- a/README.md +++ b/README.md @@ -1,39 +1,14 @@ # JavaLab [![Java CI with Gradle](https://github.com/mperor/JavaLab/actions/workflows/gradle.yml/badge.svg)](https://github.com/mperor/JavaLab/actions/workflows/gradle.yml) -[![Test Results](https://gist.githubusercontent.com/mperor/710a27220e46b738c4a2ccb888676388/raw/badge.svg)](src/test/java/pl/mperor/lab/java) +[![Test Results](https://gist.githubusercontent.com/mperor/710a27220e46b738c4a2ccb888676388/raw/badge.svg)](jdk/src/test/java/pl/mperor/lab/java) ## Description **JavaLab** serves as an experimental playground and knowledge base for the Java programming language. The goal of this project is to maintain a set of tests that explore various nuances and intricacies of Java code. Each test aims to provide clear examples and answers to common (and not-so-common) challenges developers face when working with Java. -### Key functionality tests in Java versions +## Modules -This project includes unit tests for key functionalities introduced in each Java version. - -- [Java 1.1 (Java 1)](src/test/java/pl/mperor/lab/java/Java1.java) -- [Java 1.2 (Java 2)](src/test/java/pl/mperor/lab/java/Java2.java) -- [Java 1.3 (Java 3)](src/test/java/pl/mperor/lab/java/Java3.java) -- [Java 1.4 (Java 4)](src/test/java/pl/mperor/lab/java/Java4.java) -- [Java 1.5 (Java 5)](src/test/java/pl/mperor/lab/java/Java5.java) -- [Java 1.6 (Java 6)](src/test/java/pl/mperor/lab/java/Java6.java) -- [Java 1.7 (Java 7)](src/test/java/pl/mperor/lab/java/Java7.java) -- [Java 1.8 (Java 8)](src/test/java/pl/mperor/lab/java/Java8.java) -- [Java 9](src/test/java/pl/mperor/lab/java/Java9.java) -- [Java 10](src/test/java/pl/mperor/lab/java/Java10.java) -- [Java 11](src/test/java/pl/mperor/lab/java/Java11.java) -- [Java 12](src/test/java/pl/mperor/lab/java/Java12.java) -- [Java 13](src/test/java/pl/mperor/lab/java/Java13.java) -- [Java 14](src/test/java/pl/mperor/lab/java/Java14.java) -- [Java 15](src/test/java/pl/mperor/lab/java/Java15.java) -- [Java 16](src/test/java/pl/mperor/lab/java/Java16.java) -- [Java 17](src/test/java/pl/mperor/lab/java/Java17.java) -- [Java 18](src/test/java/pl/mperor/lab/java/Java18.java) -- [Java 19](src/test/java/pl/mperor/lab/java/Java19.java) -- [Java 20](src/test/java/pl/mperor/lab/java/Java20.java) -- [Java 21](src/test/java/pl/mperor/lab/java/Java21.java) -- [Java 22](src/test/java/pl/mperor/lab/java/Java22.java) -- [Java 23](src/test/java/pl/mperor/lab/java/Java23.java) - -For detailed examples and tests of each feature, please refer to the individual source files linked above. \ No newline at end of file +- **[JDK](jdk/README.md): JDK key features** +- **[BASICS](basics/README.md): Java basics** \ No newline at end of file diff --git a/basics/README.md b/basics/README.md new file mode 100644 index 0000000..f75a913 --- /dev/null +++ b/basics/README.md @@ -0,0 +1,5 @@ +# Java Basics + +## Description + +**Java Basics** is a project that serves as a course for this language, attempting to describe it exclusively through examples of source code. diff --git a/basics/src/main/java/pl/mperor/lab/java/Main.java b/basics/src/main/java/pl/mperor/lab/java/Main.java new file mode 100644 index 0000000..df0b4c6 --- /dev/null +++ b/basics/src/main/java/pl/mperor/lab/java/Main.java @@ -0,0 +1,7 @@ +package pl.mperor.lab.java; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello Java Basics module."); + } +} \ No newline at end of file diff --git a/basics/src/test/java/pl/mperor/lab/java/JavaBasics.java b/basics/src/test/java/pl/mperor/lab/java/JavaBasics.java new file mode 100644 index 0000000..bbc1710 --- /dev/null +++ b/basics/src/test/java/pl/mperor/lab/java/JavaBasics.java @@ -0,0 +1,21 @@ +package pl.mperor.lab.java; + +import org.junit.jupiter.api.Test; + +public class JavaBasics { + + @Test + public void testTypesOfComments() { + // Single line comment + /* + Multi + line + comment + */ + /** + * JavaDoc + */ + /// Markdown JavaDoc (Since JDK 23) + } + +} diff --git a/build.gradle b/build.gradle index 5cb5d45..9b96ec3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,34 +1,30 @@ -plugins { - id 'java' -} - group = 'pl.mperor.lab.java' version = '1.0-SNAPSHOT' -repositories { - mavenCentral() -} +subprojects { + apply plugin: 'java' + + group = rootProject.group + version = rootProject.version -ext { - graaljsVersion = '24.1.1' -} + dependencies { + testImplementation platform('org.junit:junit-bom:5.11.3') + testImplementation 'org.junit.jupiter:junit-jupiter' + } -dependencies { - testImplementation platform('org.junit:junit-bom:5.11.3') - testImplementation 'org.junit.jupiter:junit-jupiter' - testRuntimeOnly 'com.h2database:h2:2.2.224' - testRuntimeOnly "org.graalvm.js:js:${graaljsVersion}" - testImplementation "org.graalvm.js:js-scriptengine:${graaljsVersion}" -} + test { + useJUnitPlatform() + } -test { - useJUnitPlatform() -} + repositories { + mavenCentral() + } -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -} + tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + } -tasks.withType(Test) { - jvmArgs("-Dfile.encoding=UTF-8") + tasks.withType(Test) { + jvmArgs("-Dfile.encoding=UTF-8") + } } \ No newline at end of file diff --git a/jdk/README.md b/jdk/README.md new file mode 100644 index 0000000..4b7d205 --- /dev/null +++ b/jdk/README.md @@ -0,0 +1,31 @@ +# JDK key features + +## Description + +This project includes unit tests for key functionalities introduced in each Java version. + +- [Java 1.1 (Java 1)](jdk/src/test/java/pl/mperor/lab/java/Java1.java) +- [Java 1.2 (Java 2)](jdk/src/test/java/pl/mperor/lab/java/Java2.java) +- [Java 1.3 (Java 3)](jdk/src/test/java/pl/mperor/lab/java/Java3.java) +- [Java 1.4 (Java 4)](jdk/src/test/java/pl/mperor/lab/java/Java4.java) +- [Java 1.5 (Java 5)](jdk/src/test/java/pl/mperor/lab/java/Java5.java) +- [Java 1.6 (Java 6)](jdk/src/test/java/pl/mperor/lab/java/Java6.java) +- [Java 1.7 (Java 7)](jdk/src/test/java/pl/mperor/lab/java/Java7.java) +- [Java 1.8 (Java 8)](jdk/src/test/java/pl/mperor/lab/java/Java8.java) +- [Java 9](jdk/src/test/java/pl/mperor/lab/java/Java9.java) +- [Java 10](jdk/src/test/java/pl/mperor/lab/java/Java10.java) +- [Java 11](jdk/src/test/java/pl/mperor/lab/java/Java11.java) +- [Java 12](jdk/src/test/java/pl/mperor/lab/java/Java12.java) +- [Java 13](jdk/src/test/java/pl/mperor/lab/java/Java13.java) +- [Java 14](jdk/src/test/java/pl/mperor/lab/java/Java14.java) +- [Java 15](jdk/src/test/java/pl/mperor/lab/java/Java15.java) +- [Java 16](jdk/src/test/java/pl/mperor/lab/java/Java16.java) +- [Java 17](jdk/src/test/java/pl/mperor/lab/java/Java17.java) +- [Java 18](jdk/src/test/java/pl/mperor/lab/java/Java18.java) +- [Java 19](jdk/src/test/java/pl/mperor/lab/java/Java19.java) +- [Java 20](jdk/src/test/java/pl/mperor/lab/java/Java20.java) +- [Java 21](jdk/src/test/java/pl/mperor/lab/java/Java21.java) +- [Java 22](jdk/src/test/java/pl/mperor/lab/java/Java22.java) +- [Java 23](jdk/src/test/java/pl/mperor/lab/java/Java23.java) + +For detailed examples and tests of each feature, please refer to the individual source files linked above. \ No newline at end of file diff --git a/jdk/build.gradle b/jdk/build.gradle new file mode 100644 index 0000000..91f3bf2 --- /dev/null +++ b/jdk/build.gradle @@ -0,0 +1,10 @@ +ext { + graaljsVersion = '24.1.1' +} + +dependencies { + testRuntimeOnly 'com.h2database:h2:2.2.224' + testRuntimeOnly "org.graalvm.js:js:${graaljsVersion}" + testImplementation "org.graalvm.js:js-scriptengine:${graaljsVersion}" +} + diff --git a/src/main/java/pl/mperor/lab/java/Hidden.java b/jdk/src/main/java/pl/mperor/lab/java/Hidden.java similarity index 100% rename from src/main/java/pl/mperor/lab/java/Hidden.java rename to jdk/src/main/java/pl/mperor/lab/java/Hidden.java diff --git a/src/main/java/pl/mperor/lab/java/Main.java b/jdk/src/main/java/pl/mperor/lab/java/Main.java similarity index 75% rename from src/main/java/pl/mperor/lab/java/Main.java rename to jdk/src/main/java/pl/mperor/lab/java/Main.java index e66ffd8..5304f4e 100644 --- a/src/main/java/pl/mperor/lab/java/Main.java +++ b/jdk/src/main/java/pl/mperor/lab/java/Main.java @@ -5,7 +5,7 @@ public class Main { public static void main(String[] args) { - System.out.println("Hello World!"); + System.out.println("Hello JDK features module!"); SwingUtilities.invokeLater(SwingForm::new); } diff --git a/src/main/java/pl/mperor/lab/java/SwingForm.java b/jdk/src/main/java/pl/mperor/lab/java/SwingForm.java similarity index 100% rename from src/main/java/pl/mperor/lab/java/SwingForm.java rename to jdk/src/main/java/pl/mperor/lab/java/SwingForm.java diff --git a/src/main/java/pl/mperor/lab/java/generic/Box.java b/jdk/src/main/java/pl/mperor/lab/java/generic/Box.java similarity index 100% rename from src/main/java/pl/mperor/lab/java/generic/Box.java rename to jdk/src/main/java/pl/mperor/lab/java/generic/Box.java diff --git a/src/main/java/pl/mperor/lab/java/jndi/CustomContext.java b/jdk/src/main/java/pl/mperor/lab/java/jndi/CustomContext.java similarity index 100% rename from src/main/java/pl/mperor/lab/java/jndi/CustomContext.java rename to jdk/src/main/java/pl/mperor/lab/java/jndi/CustomContext.java diff --git a/src/main/java/pl/mperor/lab/java/jndi/CustomInitialContextFactory.java b/jdk/src/main/java/pl/mperor/lab/java/jndi/CustomInitialContextFactory.java similarity index 100% rename from src/main/java/pl/mperor/lab/java/jndi/CustomInitialContextFactory.java rename to jdk/src/main/java/pl/mperor/lab/java/jndi/CustomInitialContextFactory.java diff --git a/src/main/java/pl/mperor/lab/java/lang/JavaBean.java b/jdk/src/main/java/pl/mperor/lab/java/lang/JavaBean.java similarity index 100% rename from src/main/java/pl/mperor/lab/java/lang/JavaBean.java rename to jdk/src/main/java/pl/mperor/lab/java/lang/JavaBean.java diff --git a/src/main/java/pl/mperor/lab/java/lang/OuterClass.java b/jdk/src/main/java/pl/mperor/lab/java/lang/OuterClass.java similarity index 100% rename from src/main/java/pl/mperor/lab/java/lang/OuterClass.java rename to jdk/src/main/java/pl/mperor/lab/java/lang/OuterClass.java diff --git a/src/main/java/pl/mperor/lab/java/sealed/AlsoFinal.java b/jdk/src/main/java/pl/mperor/lab/java/sealed/AlsoFinal.java similarity index 100% rename from src/main/java/pl/mperor/lab/java/sealed/AlsoFinal.java rename to jdk/src/main/java/pl/mperor/lab/java/sealed/AlsoFinal.java diff --git a/src/main/java/pl/mperor/lab/java/sealed/AlsoSealed.java b/jdk/src/main/java/pl/mperor/lab/java/sealed/AlsoSealed.java similarity index 100% rename from src/main/java/pl/mperor/lab/java/sealed/AlsoSealed.java rename to jdk/src/main/java/pl/mperor/lab/java/sealed/AlsoSealed.java diff --git a/src/main/java/pl/mperor/lab/java/sealed/Final.java b/jdk/src/main/java/pl/mperor/lab/java/sealed/Final.java similarity index 100% rename from src/main/java/pl/mperor/lab/java/sealed/Final.java rename to jdk/src/main/java/pl/mperor/lab/java/sealed/Final.java diff --git a/src/main/java/pl/mperor/lab/java/sealed/ImplicitlyFinal.java b/jdk/src/main/java/pl/mperor/lab/java/sealed/ImplicitlyFinal.java similarity index 100% rename from src/main/java/pl/mperor/lab/java/sealed/ImplicitlyFinal.java rename to jdk/src/main/java/pl/mperor/lab/java/sealed/ImplicitlyFinal.java diff --git a/src/main/java/pl/mperor/lab/java/sealed/NonSealed.java b/jdk/src/main/java/pl/mperor/lab/java/sealed/NonSealed.java similarity index 100% rename from src/main/java/pl/mperor/lab/java/sealed/NonSealed.java rename to jdk/src/main/java/pl/mperor/lab/java/sealed/NonSealed.java diff --git a/src/main/java/pl/mperor/lab/java/sealed/Sealed.java b/jdk/src/main/java/pl/mperor/lab/java/sealed/Sealed.java similarity index 100% rename from src/main/java/pl/mperor/lab/java/sealed/Sealed.java rename to jdk/src/main/java/pl/mperor/lab/java/sealed/Sealed.java diff --git a/src/test/java/pl/mperor/lab/TestUtils.java b/jdk/src/test/java/pl/mperor/lab/TestUtils.java similarity index 100% rename from src/test/java/pl/mperor/lab/TestUtils.java rename to jdk/src/test/java/pl/mperor/lab/TestUtils.java diff --git a/src/test/java/pl/mperor/lab/java/Java1.java b/jdk/src/test/java/pl/mperor/lab/java/Java1.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java1.java rename to jdk/src/test/java/pl/mperor/lab/java/Java1.java diff --git a/src/test/java/pl/mperor/lab/java/Java10.java b/jdk/src/test/java/pl/mperor/lab/java/Java10.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java10.java rename to jdk/src/test/java/pl/mperor/lab/java/Java10.java diff --git a/src/test/java/pl/mperor/lab/java/Java11.java b/jdk/src/test/java/pl/mperor/lab/java/Java11.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java11.java rename to jdk/src/test/java/pl/mperor/lab/java/Java11.java diff --git a/src/test/java/pl/mperor/lab/java/Java12.java b/jdk/src/test/java/pl/mperor/lab/java/Java12.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java12.java rename to jdk/src/test/java/pl/mperor/lab/java/Java12.java diff --git a/src/test/java/pl/mperor/lab/java/Java13.java b/jdk/src/test/java/pl/mperor/lab/java/Java13.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java13.java rename to jdk/src/test/java/pl/mperor/lab/java/Java13.java diff --git a/src/test/java/pl/mperor/lab/java/Java14.java b/jdk/src/test/java/pl/mperor/lab/java/Java14.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java14.java rename to jdk/src/test/java/pl/mperor/lab/java/Java14.java diff --git a/src/test/java/pl/mperor/lab/java/Java15.java b/jdk/src/test/java/pl/mperor/lab/java/Java15.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java15.java rename to jdk/src/test/java/pl/mperor/lab/java/Java15.java diff --git a/src/test/java/pl/mperor/lab/java/Java16.java b/jdk/src/test/java/pl/mperor/lab/java/Java16.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java16.java rename to jdk/src/test/java/pl/mperor/lab/java/Java16.java diff --git a/src/test/java/pl/mperor/lab/java/Java17.java b/jdk/src/test/java/pl/mperor/lab/java/Java17.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java17.java rename to jdk/src/test/java/pl/mperor/lab/java/Java17.java diff --git a/src/test/java/pl/mperor/lab/java/Java18.java b/jdk/src/test/java/pl/mperor/lab/java/Java18.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java18.java rename to jdk/src/test/java/pl/mperor/lab/java/Java18.java diff --git a/src/test/java/pl/mperor/lab/java/Java19.java b/jdk/src/test/java/pl/mperor/lab/java/Java19.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java19.java rename to jdk/src/test/java/pl/mperor/lab/java/Java19.java diff --git a/src/test/java/pl/mperor/lab/java/Java2.java b/jdk/src/test/java/pl/mperor/lab/java/Java2.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java2.java rename to jdk/src/test/java/pl/mperor/lab/java/Java2.java diff --git a/src/test/java/pl/mperor/lab/java/Java20.java b/jdk/src/test/java/pl/mperor/lab/java/Java20.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java20.java rename to jdk/src/test/java/pl/mperor/lab/java/Java20.java diff --git a/src/test/java/pl/mperor/lab/java/Java21.java b/jdk/src/test/java/pl/mperor/lab/java/Java21.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java21.java rename to jdk/src/test/java/pl/mperor/lab/java/Java21.java diff --git a/src/test/java/pl/mperor/lab/java/Java22.java b/jdk/src/test/java/pl/mperor/lab/java/Java22.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java22.java rename to jdk/src/test/java/pl/mperor/lab/java/Java22.java diff --git a/src/test/java/pl/mperor/lab/java/Java23.java b/jdk/src/test/java/pl/mperor/lab/java/Java23.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java23.java rename to jdk/src/test/java/pl/mperor/lab/java/Java23.java diff --git a/src/test/java/pl/mperor/lab/java/Java3.java b/jdk/src/test/java/pl/mperor/lab/java/Java3.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java3.java rename to jdk/src/test/java/pl/mperor/lab/java/Java3.java diff --git a/src/test/java/pl/mperor/lab/java/Java4.java b/jdk/src/test/java/pl/mperor/lab/java/Java4.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java4.java rename to jdk/src/test/java/pl/mperor/lab/java/Java4.java diff --git a/src/test/java/pl/mperor/lab/java/Java5.java b/jdk/src/test/java/pl/mperor/lab/java/Java5.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java5.java rename to jdk/src/test/java/pl/mperor/lab/java/Java5.java diff --git a/src/test/java/pl/mperor/lab/java/Java6.java b/jdk/src/test/java/pl/mperor/lab/java/Java6.java similarity index 95% rename from src/test/java/pl/mperor/lab/java/Java6.java rename to jdk/src/test/java/pl/mperor/lab/java/Java6.java index 3fb7529..50d9a03 100644 --- a/src/test/java/pl/mperor/lab/java/Java6.java +++ b/jdk/src/test/java/pl/mperor/lab/java/Java6.java @@ -49,6 +49,7 @@ public static void main(String[] args) { int compilationResult = compiler.run(null, null, null, sourceFile.getAbsolutePath()); Assertions.assertEquals(0, compilationResult, "Compilation should succeed with result 0!"); Assertions.assertTrue(sourceFile.delete(), "Source file should be deleted after compilation"); + Assertions.assertTrue(new File("./HelloWorld.class").delete(), "Now compilation result can be deleted!"); } @Test diff --git a/src/test/java/pl/mperor/lab/java/Java7.java b/jdk/src/test/java/pl/mperor/lab/java/Java7.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java7.java rename to jdk/src/test/java/pl/mperor/lab/java/Java7.java diff --git a/src/test/java/pl/mperor/lab/java/Java8.java b/jdk/src/test/java/pl/mperor/lab/java/Java8.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java8.java rename to jdk/src/test/java/pl/mperor/lab/java/Java8.java diff --git a/src/test/java/pl/mperor/lab/java/Java9.java b/jdk/src/test/java/pl/mperor/lab/java/Java9.java similarity index 100% rename from src/test/java/pl/mperor/lab/java/Java9.java rename to jdk/src/test/java/pl/mperor/lab/java/Java9.java diff --git a/src/test/resources/bean b/jdk/src/test/resources/bean similarity index 100% rename from src/test/resources/bean rename to jdk/src/test/resources/bean diff --git a/src/test/resources/beep.wav b/jdk/src/test/resources/beep.wav similarity index 100% rename from src/test/resources/beep.wav rename to jdk/src/test/resources/beep.wav diff --git a/src/test/resources/encoding/fileUTF8.txt b/jdk/src/test/resources/encoding/fileUTF8.txt similarity index 100% rename from src/test/resources/encoding/fileUTF8.txt rename to jdk/src/test/resources/encoding/fileUTF8.txt diff --git a/src/test/resources/encoding/fileWin1250.txt b/jdk/src/test/resources/encoding/fileWin1250.txt similarity index 100% rename from src/test/resources/encoding/fileWin1250.txt rename to jdk/src/test/resources/encoding/fileWin1250.txt diff --git a/src/test/resources/imageio.png b/jdk/src/test/resources/imageio.png similarity index 100% rename from src/test/resources/imageio.png rename to jdk/src/test/resources/imageio.png diff --git a/src/test/resources/nio.txt b/jdk/src/test/resources/nio.txt similarity index 100% rename from src/test/resources/nio.txt rename to jdk/src/test/resources/nio.txt diff --git a/src/test/resources/nio2.txt b/jdk/src/test/resources/nio2.txt similarity index 100% rename from src/test/resources/nio2.txt rename to jdk/src/test/resources/nio2.txt diff --git a/settings.gradle b/settings.gradle index af1d506..a54067f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ rootProject.name = 'JavaLab' - +include 'jdk', 'basics'