Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#689: Added url and removed try-catch-block #698

Merged
merged 18 commits into from
Nov 20, 2024
Merged

#689: Added url and removed try-catch-block #698

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3a512af
#689: Added url and removed try-catch-block
leonrohne27 Oct 16, 2024
28e23e1
Merge branch 'main' into fix/689-added-urls-to-tests2
jan-vcapgemini Oct 21, 2024
d133804
Update urls: example for suggested URL format.
hohwille Oct 21, 2024
96f82d6
#689: Prepared URLs for WireMock
leonrohne27 Nov 4, 2024
98de8a3
Merge branch 'main' into fix/689-added-urls-to-tests2
leonrohne27 Nov 4, 2024
8a21b92
Merge branch 'main' into fix/689-added-urls-to-tests2
jan-vcapgemini Nov 5, 2024
81f5618
Merge branch 'main' into fix/689-added-urls-to-tests2
jan-vcapgemini Nov 18, 2024
683038d
Merge branch 'main' into fix/689-added-urls-to-tests2
hohwille Nov 20, 2024
3bbdf82
fix URL
hohwille Nov 20, 2024
5b25d63
fix URL
hohwille Nov 20, 2024
42672db
fix URL
hohwille Nov 20, 2024
92e9932
fix URL
hohwille Nov 20, 2024
104aae5
fix URL
hohwille Nov 20, 2024
ddbaf99
fix URL
hohwille Nov 20, 2024
b0793cf
fix URL
hohwille Nov 20, 2024
74bb0db
fix URL
hohwille Nov 20, 2024
8064dfe
fix URL
hohwille Nov 20, 2024
e7e79ed
fix URL
hohwille Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions cli/src/test/java/com/devonfw/tools/ide/repo/ToolRepositoryMock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import java.util.Iterator;
import java.util.stream.Stream;

import com.devonfw.tools.ide.cli.CliException;
import com.devonfw.tools.ide.context.IdeContext;
import com.devonfw.tools.ide.version.GenericVersionRange;
import com.devonfw.tools.ide.version.VersionIdentifier;
Expand All @@ -33,12 +32,8 @@ public ToolRepositoryMock(IdeContext context, Path repositoryFolder) {
@Override
public VersionIdentifier resolveVersion(String tool, String edition, GenericVersionRange version) {

try {
return super.resolveVersion(tool, edition, version);
} catch (CliException e) {
this.context.error(e, "Invalid test project using version {} that cannot be resolved in urls folder", version);
return version.getMax();
}
return super.resolveVersion(tool, edition, version);

}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...urces/ide-projects/android-studio/_ide/urls/android-studio/android-studio/2024.1.1.1/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://adoptium.net/download/dummytest
${testbaseurl}/download/android-studio/android-studio/2024.1.1.1/android-studio-2024.1.1.1.tgz
1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/build/_ide/urls/gradle/gradle/8.7/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/gradle/gradle/8.7/gradle-8.7.tgz
1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/build/_ide/urls/java/java/17.0.10_7/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/java/java/17.0.10_7/java-17.0.10_7.jar
1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/build/_ide/urls/mvn/mvn/3.9.6/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/mvn/mvn/3.9.6/mvn-3.9.6.tgz
1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/build/_ide/urls/node/node/v18.19.1/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/node/node/v18.19.1/node-v18.19.1.tgz
1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/build/_ide/urls/npm/npm/9.9.2/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/npm/npm/9.9.2/npm-9.9.2.tgz
1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/dotnet/_ide/urls/dotnet/dotnet/6.0.419/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/dotnet/dotnet/6.0.419/dotnet-6.0.419.tgz
1 change: 0 additions & 1 deletion cli/src/test/resources/ide-projects/dotnet/_ide/urls/dotnet/dotnet/6.0.419/urls.txt
View file
Open in desktop
jan-vcapgemini marked this conversation as resolved.
Show resolved Hide resolved

This file was deleted.

2 changes: 1 addition & 1 deletion cli/src/test/resources/ide-projects/eclipse/_ide/urls/eclipse/eclipse/2024-09/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://downloads.eclipse.org/dummytest
${testbaseurl}/download/eclipse/eclipse/2024-09/eclipse-2024-09.tgz
2 changes: 1 addition & 1 deletion cli/src/test/resources/ide-projects/eclipse/_ide/urls/java/java/17.0.10_7/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://adoptium.net/download/dummytest
${testbaseurl}/download/java/java/17.0.10_7/java-17.0.10_7.jar
1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/graalvm/_ide/urls/graalvm/graalvm/22.3.3/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/graalvm/graalvm/22.3.3/graalvm-22.3.3.tgz
1 change: 0 additions & 1 deletion cli/src/test/resources/ide-projects/graalvm/_ide/urls/graalvm/graalvm/22.3.3/urls.txt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cli/src/test/resources/ide-projects/intellij/_ide/urls/intellij/intellij/2023.3.3/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://download.jetbrains.com/idea/ideaC-2023.3.3.win.zip
${testbaseurl}/download/intellij/intellij/2023.3.3/intellij-2023.3.3.tgz
1 change: 0 additions & 1 deletion cli/src/test/resources/ide-projects/intellij/_ide/urls/intellij/intellij/2023.3.3/urls.txt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cli/src/test/resources/ide-projects/intellij/_ide/urls/java/java/17.0.10_7/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://adoptium.net/download/dummytest
${testbaseurl}/download/java/java/17.0.10_7/java-17.0.10_7.jar
1 change: 0 additions & 1 deletion cli/src/test/resources/ide-projects/intellij/_ide/urls/java/java/17.0.10_7/urls.txt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/jasypt/_ide/urls/jasypt/jasypt/1.9.3/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/jasypt/jasypt/1.9.3/jasypt-1.9.3.tgz
1 change: 0 additions & 1 deletion cli/src/test/resources/ide-projects/jasypt/_ide/urls/jasypt/jasypt/1.9.3/urls.txt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/jasypt/_ide/urls/java/java/17.0.10_7/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/java/java/17.0.10_7/java-17.0.10_7.jar
1 change: 0 additions & 1 deletion cli/src/test/resources/ide-projects/jasypt/_ide/urls/java/java/17.0.10_7/urls.txt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/jmc/_ide/urls/java/java/17.0.10_7/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/java/java/17.0.10_7/java-17.0.10_7.jar
1 change: 0 additions & 1 deletion cli/src/test/resources/ide-projects/jmc/_ide/urls/java/java/17.0.10_7/urls.txt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/jmc/_ide/urls/jmc/jmc/8.3.0/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/jmc/jmc/8.3.0/jmc-8.3.0.tgz
1 change: 0 additions & 1 deletion cli/src/test/resources/ide-projects/jmc/_ide/urls/jmc/jmc/8.3.0/urls.txt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/mvn/_ide/urls/java/java/17.0.10_7/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/java/java/17.0.10_7/java-17.0.10_7.jar
1 change: 0 additions & 1 deletion cli/src/test/resources/ide-projects/mvn/_ide/urls/java/java/17.0.10_7/urls.txt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/mvn/_ide/urls/mvn/mvn/3.9.7/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/mvn/mvn/3.9.7/mvn-3.9.7.tgz
1 change: 0 additions & 1 deletion cli/src/test/resources/ide-projects/mvn/_ide/urls/mvn/mvn/3.9.7/urls.txt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/npm/_ide/urls/node/node/v18.19.1/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/node/node/v18.19.1/node-v18.19.1.tgz
1 change: 0 additions & 1 deletion cli/src/test/resources/ide-projects/npm/_ide/urls/node/node/v18.19.1/urls.txt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/npm/_ide/urls/npm/npm/9.9.2/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/npm/npm/9.9.2/npm-9.9.2.tgz
1 change: 0 additions & 1 deletion cli/src/test/resources/ide-projects/npm/_ide/urls/npm/npm/9.9.2/urls.txt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cli/src/test/resources/ide-projects/tomcat/_ide/urls/java/java/17.0.10_7/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://adoptium.net/download/dummytest
${testbaseurl}/download/java/java/17.0.10_7/java-17.0.10_7.jar
2 changes: 1 addition & 1 deletion cli/src/test/resources/ide-projects/tomcat/_ide/urls/java/java/21_35/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://adoptium.net/download/dummytest
${testbaseurl}/download/java/java/21_35/java-21_35.jar
2 changes: 1 addition & 1 deletion cli/src/test/resources/ide-projects/tomcat/_ide/urls/java/java/8u402b06/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://adoptium.net/download/dummytest
${testbaseurl}/download/java/java/8u402b06/java-8u402b06.jar
2 changes: 1 addition & 1 deletion cli/src/test/resources/ide-projects/tomcat/_ide/urls/tomcat/tomcat/10.1.14/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://dlcdn.apache.org/tomcat/tomcat-10/v10.1.14/bin/apache-tomcat-10.1.14.zip
${testbaseurl}/download/tomcat/tomcat/10.1.14/tomcat-10.1.14.tgz
1 change: 0 additions & 1 deletion cli/src/test/resources/ide-projects/update/_ide/urls/java/java/17.0.6/readme
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/update/_ide/urls/java/java/17.0.6/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/java/java/17.0.6/java-17.0.6.jar
1 change: 0 additions & 1 deletion cli/src/test/resources/ide-projects/update/_ide/urls/mvn/mvn/3.2.1/readme
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/update/_ide/urls/mvn/mvn/3.2.1/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/mvn/mvn/3.2.1/mvn-3.2.1.tgz
1 change: 1 addition & 0 deletions cli/src/test/resources/ide-projects/vscode/_ide/urls/vscode/vscode/1.92.1/urls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
${testbaseurl}/download/vscode/vscode/1.92.1/vscode-1.92.1.tgz
1 change: 0 additions & 1 deletion cli/src/test/resources/ide-projects/vscode/_ide/urls/vscode/vscode/1.92.1/urls.txt
View file
Open in desktop

This file was deleted.

Loading