From cd4fa11543c80924ccf3e365e10077c6ecc9f519 Mon Sep 17 00:00:00 2001 From: paz-capgemini Date: Mon, 10 Mar 2025 15:51:53 +0100 Subject: [PATCH 1/2] #1110: skip upgrade check if offline --- .../ide/commandlet/StatusCommandlet.java | 8 +++++++ .../ide/commandlet/StatusCommandletTest.java | 24 +++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/commandlet/StatusCommandlet.java b/cli/src/main/java/com/devonfw/tools/ide/commandlet/StatusCommandlet.java index 30311337f..147008935 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/commandlet/StatusCommandlet.java +++ b/cli/src/main/java/com/devonfw/tools/ide/commandlet/StatusCommandlet.java @@ -42,6 +42,14 @@ public void run() { logSettingsLegacyStatus(); logMigrationStatus(); } + checkForUpdate(); + } + + private void checkForUpdate() { + if (!this.context.isOnline()) { + this.context.warning("Check for newer version of IDEasy is skipped due to no network connectivity."); + return; + } new IdeasyCommandlet(this.context, null).checkIfUpdateIsAvailable(); } diff --git a/cli/src/test/java/com/devonfw/tools/ide/commandlet/StatusCommandletTest.java b/cli/src/test/java/com/devonfw/tools/ide/commandlet/StatusCommandletTest.java index e746aea92..77e37752f 100644 --- a/cli/src/test/java/com/devonfw/tools/ide/commandlet/StatusCommandletTest.java +++ b/cli/src/test/java/com/devonfw/tools/ide/commandlet/StatusCommandletTest.java @@ -2,7 +2,6 @@ import org.junit.jupiter.api.Test; -import com.devonfw.tools.ide.cli.CliArguments; import com.devonfw.tools.ide.context.AbstractIdeContextTest; import com.devonfw.tools.ide.context.IdeTestContext; @@ -17,13 +16,30 @@ public class StatusCommandletTest extends AbstractIdeContextTest { public void testStatusOutsideOfHome() { //arrange IdeTestContext context = new IdeTestContext(); - CliArguments args = new CliArguments("status"); - args.next(); + StatusCommandlet status = context.getCommandletManager().getCommandlet(StatusCommandlet.class); //act - context.run(args); + status.run(); //assert assertThat(context).logAtWarning().hasMessageContaining("You are not inside an IDE project: "); } + + /** + * Tests the output if {@link StatusCommandlet} is run without internet connection. + */ + @Test + public void testStatusWhenOffline() { + + // arrange + IdeTestContext context = new IdeTestContext(); + context.setOnline(false); + StatusCommandlet status = context.getCommandletManager().getCommandlet(StatusCommandlet.class); + + // act + status.run(); + + // assert + assertThat(context).logAtWarning().hasMessage("Check for newer version of IDEasy is skipped due to no network connectivity."); + } } From 529cda876a85b202da868ee68dd508727ea1654f Mon Sep 17 00:00:00 2001 From: paz-capgemini Date: Tue, 11 Mar 2025 14:20:50 +0100 Subject: [PATCH 2/2] #298: remove obsolete file --- cli/awstest | 1 - 1 file changed, 1 deletion(-) delete mode 100644 cli/awstest diff --git a/cli/awstest b/cli/awstest deleted file mode 100644 index 5630d951d..000000000 --- a/cli/awstest +++ /dev/null @@ -1 +0,0 @@ -aws linux -i C:\projects\IDEasy\workspaces\main\IDEasy\cli\target\test-projects\aws\_ide\software\default\aws\aws\2.24.15 -b C:\projects\IDEasy\workspaces\main\IDEasy\cli\target\test-projects\aws\_ide\software\default\aws\aws\2.24.15