-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from xdev-software/develop
Release
- Loading branch information
Showing
15 changed files
with
346 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # 1.0.0 | ||
| _Initial release_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
testcontainers-java-junit4-mock-demo/src/main/java/software/xdev/Application.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package software.xdev; | ||
|
|
||
| import org.slf4j.LoggerFactory; | ||
| import org.testcontainers.containers.GenericContainer; | ||
| import org.testcontainers.containers.output.Slf4jLogConsumer; | ||
|
|
||
|
|
||
| public final class Application | ||
| { | ||
| @SuppressWarnings({"rawtypes", "resouce"}) | ||
| public static void main(final String[] args) | ||
| { | ||
| try(final GenericContainer container = new GenericContainer("alpine:3") | ||
| .withCommand("/bin/sh", "-c", "echo \"I don't need JUnit 4 to run\"") | ||
| .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("container.demo")))) | ||
| { | ||
| container.start(); | ||
| } | ||
| } | ||
|
|
||
| private Application() | ||
| { | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
testcontainers-java-junit4-mock/src/main/java/org/junit/package-info.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * Copyright © 2024 XDEV Software (https://xdev.software) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| /** | ||
| * This package mocks the few classes that Testcontainers needs from junit 4, so that the lib can be excluded. | ||
| * <p> | ||
| * <a href="https://github.com/testcontainers/testcontainers-java/issues/970">testcontainers-java#970</a> | ||
| * </p> | ||
| */ | ||
| package org.junit; |
77 changes: 77 additions & 0 deletions
77
testcontainers-java-junit4-mock/src/main/java/org/junit/rules/ExternalResource.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * Copyright © 2024 XDEV Software (https://xdev.software) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.junit.rules; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import org.junit.runner.Description; | ||
| import org.junit.runners.model.Statement; | ||
|
|
||
|
|
||
| @Deprecated | ||
| @SuppressWarnings("all") | ||
| public abstract class ExternalResource implements TestRule | ||
| { | ||
| @Override | ||
| public Statement apply(final Statement base, final Description description) | ||
| { | ||
| return this.statement(base); | ||
| } | ||
|
|
||
| private Statement statement(final Statement base) | ||
| { | ||
| return new Statement() | ||
| { | ||
| @Override | ||
| public void evaluate() throws Throwable | ||
| { | ||
| ExternalResource.this.before(); | ||
|
|
||
| final List<Throwable> errors = new ArrayList<>(); | ||
| try | ||
| { | ||
| base.evaluate(); | ||
| } | ||
| catch(final Throwable t) | ||
| { | ||
| errors.add(t); | ||
| } | ||
| finally | ||
| { | ||
| try | ||
| { | ||
| ExternalResource.this.after(); | ||
| } | ||
| catch(final Throwable t) | ||
| { | ||
| errors.add(t); | ||
| } | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| protected void before() throws Throwable | ||
| { | ||
| // do nothing | ||
| } | ||
|
|
||
| protected void after() | ||
| { | ||
| // do nothing | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
testcontainers-java-junit4-mock/src/main/java/org/junit/rules/TestRule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /* | ||
| * Copyright © 2024 XDEV Software (https://xdev.software) | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.junit.rules; | ||
|
|
||
| import org.junit.runner.Description; | ||
| import org.junit.runners.model.Statement; | ||
|
|
||
|
|
||
| @Deprecated | ||
| @SuppressWarnings("all") | ||
| public interface TestRule | ||
| { | ||
| Statement apply(Statement base, Description description); | ||
| } |
Oops, something went wrong.