Parse off parentheses from psu name (#1093)

Author: CarolynRountree

core/src/main/java/oracle/weblogic/deploy/util/XPathUtil.java

@@ -37,6 +37,9 @@ public XPathUtil(String oracle_home){
         this.oracle_home = oracle_home;
         patches_home = Paths.get(oracle_home, "inventory", "patches").toString();
     }
+    public XPathUtil() {
+        // for testing only
+    }
     private static XPathFactory factory = null;
 
     private static synchronized XPathFactory factory() {
@@ -64,15 +67,24 @@ public String getPSU() {
             LOGGER.fine("Description {0}", descrip);
             if (descrip != null && descrip.startsWith("WLS PATCH SET UPDATE")) {
                 int idx = descrip.lastIndexOf('.');
-                String psu = descrip.substring(idx+1);
-                 list.add(psu);
+                String psu  = descrip.substring(idx+1).split("[\\d]+")[0];
+                list.add(psu);
                 Collections.sort(list);
                 return list.get(list.size() -1);
             }
         }
         return null;
     }
 
+    public String extractPsu(String descrip) {
+        int idx = descrip.lastIndexOf('.') + 1;
+        int endIdx = descrip.length() - 1;
+        if (descrip.charAt(endIdx) == ')') {
+            endIdx--;
+        }
+        return descrip.substring(idx, endIdx+1);
+    }
+
     /**
      * Locate the patch files in the Oracle home
      * @return list of patch file names.

core/src/test/java/oracle/weblogic/deploy/util/XPathUtilTest.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.
+ * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+ */
+package oracle.weblogic.deploy.util;
+
+import org.junit.jupiter.api.Test;
+
+import oracle.weblogic.deploy.util.XPathUtil;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class XPathUtilTest {
+
+    @Test
+    void testPSUWithParen() {
+        XPathUtil util = new XPathUtil();
+        String tester = new String(".2145)");
+        String expected = new String("2145");
+        String actual = util.extractPsu(tester);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    void testPSU() {
+        XPathUtil util = new XPathUtil();
+        String tester = new String(".2145");
+        String expected = new String("2145");
+        String actual = util.extractPsu(tester);
+        assertEquals(expected, actual);
+    }
+}