#23507 Fixed admin-tests

- now they detect bugs, see next commits - 2 tests are reproducers of bugs I could not fix easily - new test dependency - ShrinkWrap Signed-off-by: David Matějček <dmatej@seznam.cz>
eclipse-ee4j · Apr 12, 2022 · eb3c95f · eb3c95f
1 parent 72b6570
commit eb3c95f
Show file tree

Hide file tree

Showing 52 changed files with 812 additions and 855 deletions.
diff --git a/appserver/tests/admin/admin-extension/pom.xml b/appserver/tests/admin/admin-extension/pom.xml
@@ -25,31 +25,33 @@
         <version>7.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>test-progress-admin-extension</artifactId>
-    <name>GlassFish Admin Tests - Progress Admin Extension</name>
     <packaging>glassfish-jar</packaging>
+
+    <name>GlassFish Admin Tests - Progress Admin Extension</name>
+
     <dependencies>
         <dependency>
             <groupId>org.glassfish.main.common</groupId>
             <artifactId>glassfish-api</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.main.common</groupId>
             <artifactId>common-util</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.admin</groupId>
-            <artifactId>config-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+
         <dependency>
             <groupId>org.glassfish.hk2</groupId>
-            <artifactId>hk2</artifactId>
+            <artifactId>hk2-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.hk2</groupId>
-            <artifactId>hk2-junitrunner</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

diff --git a/...min-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressComplexCommand.java b/...min-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressComplexCommand.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -16,24 +17,22 @@
 
 package com.sun.enterprise.tests.progress;
 
-import com.sun.enterprise.config.serverbeans.Domain;
 import com.sun.logging.LogDomains;
-import java.util.logging.Level;
+
 import java.util.logging.Logger;
+
 import org.glassfish.api.I18n;
-import org.glassfish.api.Param;
 import org.glassfish.api.admin.AdminCommand;
 import org.glassfish.api.admin.AdminCommandContext;
 import org.glassfish.api.admin.CommandLock;
 import org.glassfish.api.admin.ManagedJob;
 import org.glassfish.api.admin.Progress;
 import org.glassfish.api.admin.ProgressStatus;
-import org.glassfish.api.admin.RestEndpoint;
-import org.glassfish.api.admin.RestEndpoints;
 import org.glassfish.hk2.api.PerLookup;
 import org.jvnet.hk2.annotations.Service;
 
-/** Basic progress status example.
+/**
+ * Basic progress status example.
  * Contains 10 steps
  *
  * @author mmares
@@ -137,6 +136,7 @@ public ProgressRunnable(ProgressStatus ps, int count, long interval, String mess
             this.message = message;
         }
 
+        @Override
         public void run() {
             doProgress(ps, count, interval, message);
         }

diff --git a/...dmin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressCustomCommand.java b/...dmin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressCustomCommand.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -19,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.regex.Pattern;
+
 import org.glassfish.api.ActionReport;
 import org.glassfish.api.I18n;
 import org.glassfish.api.Param;
@@ -31,7 +33,6 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- *
  * @author mmares
  */
 @Service(name = "progress-custom")
@@ -51,14 +52,14 @@ public class ProgressCustomCommand implements AdminCommand {
     private static class Interval {
 
         private boolean valid = true;
-        private String origInteval;
+        private String origInterval;
         private int multiplicator = 1;
         private int minSec = -1;
         private int maxSec = 0;
         private boolean spin = false;
 
         private Interval(String interval) {
-            origInteval = interval;
+            origInterval = interval;
             try {
                 if (!keyPattern.matcher(interval).matches()) {
                     valid = false;
@@ -99,13 +100,8 @@ public boolean isSpin() {
         public int getMultiplicator() {
             if (valid) {
                 return multiplicator;
-            } else {
-                return 1;
             }
-        }
-
-        public String getOrigInteval() {
-            return origInteval;
+            return 1;
         }
 
         public boolean isValid() {
@@ -128,7 +124,7 @@ public long getMilis() {
 
         @Override
         public String toString() {
-            return origInteval;
+            return origInterval;
         }
 
     }
@@ -149,7 +145,7 @@ private int getStepCount() {
     @Override
     public void execute(AdminCommandContext context) {
         ProgressStatus ps = context.getProgressStatus();
-        parsedIntervals = new ArrayList<Interval>(intervals != null ? intervals.length : 0);
+        parsedIntervals = new ArrayList<>(intervals != null ? intervals.length : 0);
         ActionReport report = context.getActionReport();
         for (String interval : intervals) {
             parsedIntervals.add(new Interval(interval));

diff --git a/...xtension/src/main/java/com/sun/enterprise/tests/progress/ProgressDoubleTotalsCommand.java b/...xtension/src/main/java/com/sun/enterprise/tests/progress/ProgressDoubleTotalsCommand.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -26,7 +27,8 @@
 import org.glassfish.hk2.api.PerLookup;
 import org.jvnet.hk2.annotations.Service;
 
-/** Basic progress status example.
+/**
+ * Basic progress status example.
  * Contains 10 steps
  *
  * @author mmares

diff --git a/...n-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressExecOtherCommand.java b/...n-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressExecOtherCommand.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -55,15 +56,11 @@ public void execute(AdminCommandContext context) {
         }
 
         // Execute other command
-        commandRunner.getCommandInvocation(
-            "progress-simple",
-            context.getActionReport()
-                   .addSubActionsReport(),
+        // Number 20 is little bit tricky. Please see javadoc of ProgressStatus
+        commandRunner.getCommandInvocation("progress-simple",
+            context.getActionReport().addSubActionsReport(),
             context.getSubject())
-            .progressStatusChild(
-                 // Number 20 is little bit tricky. Please see javadoc of ProgressStatus
-                progressStatus.createChild("subcommand", 20))
-            .execute();
+        .progressStatusChild(progressStatus.createChild("subcommand", 20)).execute();
 
         // Do some after logic
         progressStatus.progress("Finishing outer command");
@@ -73,8 +70,6 @@ public void execute(AdminCommandContext context) {
         }
 
         progressStatus.complete("Finished outer command");
-
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
     }
 
     private void doSomeLogic() {

diff --git a/...-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressFailInHalfCommand.java b/...-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressFailInHalfCommand.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the

diff --git a/...n-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressFullAnnotCommand.java b/...n-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressFullAnnotCommand.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -42,5 +43,4 @@ public void execute(AdminCommandContext context) {
         cmd.noTotalSteps = true;
         cmd.execute(context);
     }
-
 }
diff --git a/...min-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java b/...min-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -18,10 +19,12 @@
 
 import com.sun.enterprise.util.StringUtils;
 import com.sun.logging.LogDomains;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.util.logging.Logger;
+
 import org.glassfish.api.ActionReport;
 import org.glassfish.api.I18n;
 import org.glassfish.api.Param;
@@ -35,7 +38,8 @@
 import org.glassfish.hk2.api.PerLookup;
 import org.jvnet.hk2.annotations.Service;
 
-/** Doing progress and send some payload.
+/**
+ * Doing progress and send some payload.
  *
  * @author mmares
  */
@@ -47,8 +51,7 @@
 @ManagedJob
 public class ProgressPayloadCommand implements AdminCommand {
 
-    private final static Logger logger =
-            LogDomains.getLogger(ProgressPayloadCommand.class, LogDomains.ADMIN_LOGGER);
+    private final static Logger logger = LogDomains.getLogger(ProgressPayloadCommand.class, LogDomains.ADMIN_LOGGER);
 
     @Param(name = "down", multiple = false, primary = true, optional = true)
     String down;

diff --git a/...dmin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressSimpleCommand.java b/...dmin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressSimpleCommand.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the

diff --git a/...in-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressStepBackCommand.java b/...in-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressStepBackCommand.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -26,7 +27,8 @@
 import org.glassfish.hk2.api.PerLookup;
 import org.jvnet.hk2.annotations.Service;
 
-/** Basic progress status example.
+/**
+ * Basic progress status example.
  * Contains 10 steps
  *
  * @author mmares

diff --git a/...ension/src/main/java/com/sun/enterprise/tests/progress/ProgressWithSupplementCommand.java b/...ension/src/main/java/com/sun/enterprise/tests/progress/ProgressWithSupplementCommand.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -16,7 +17,6 @@
 
 package com.sun.enterprise.tests.progress;
 
-import com.sun.enterprise.universal.i18n.LocalStringsImpl;
 import org.glassfish.api.I18n;
 import org.glassfish.api.admin.AdminCommand;
 import org.glassfish.api.admin.AdminCommandContext;
@@ -26,7 +26,8 @@
 import org.glassfish.hk2.api.PerLookup;
 import org.jvnet.hk2.annotations.Service;
 
-/** Same as {@code ProgressSimpleCommand} but this one has supplements.
+/**
+ * Same as {@code ProgressSimpleCommand} but this one has supplements.
  * It also does not specify totalStepCount in annotation but using API.
  * Percentage can be printed after {@code SupplementBefore} will be done.
  *
@@ -38,12 +39,9 @@
 @PerLookup
 @CommandLock(CommandLock.LockType.NONE)
 @I18n("progress")
-@Progress()
+@Progress
 public class ProgressWithSupplementCommand implements AdminCommand {
 
-    private static final LocalStringsImpl strings =
-            new LocalStringsImpl(ProgressWithSupplementCommand.class);
-
     @Override
     public void execute(AdminCommandContext context) {
         ProgressStatus ps = context.getProgressStatus();

diff --git a/...dmin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/SupplementAfter.java b/...dmin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/SupplementAfter.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the

diff --git a/...min/admin-extension/src/main/java/com/sun/enterprise/tests/progress/SupplementBefore.java b/...min/admin-extension/src/main/java/com/sun/enterprise/tests/progress/SupplementBefore.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the