Update copyright

Signed-off-by: Adam Wisniewski <[email protected]>
OpenLiberty · Sep 19, 2023 · eda08f1 · eda08f1
1 parent 91f6fef
commit eda08f1
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 6 deletions.
diff --git a/releng/io.openliberty.tools.update/category.xml b/releng/io.openliberty.tools.update/category.xml
@@ -19,7 +19,6 @@
     <category-def name="io.openliberty.tools.eclipse" label="Liberty Tools" />
 
     <repository-reference location="https://download.eclipse.org/lsp4e/releases/0.23.0/" enabled="true" />
-    <repository-reference location="https://download.eclipse.org/jdtls/milestones/1.25.0/repository" enabled="true" />
     <repository-reference location="https://download.eclipse.org/lsp4mp/releases/0.7.0/repository" enabled="true" />
     <repository-reference location="https://download.eclipse.org/lsp4jakarta/releases/0.1.1/repository" enabled="true" />
 

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -26,7 +26,7 @@
     <properties>
         <testAppImportWait>60000</testAppImportWait>
     </properties>
-
+    
     <build>
         <plugins>
             <plugin>
@@ -100,6 +100,16 @@
                                 <id>org.eclipse.lsp4e.jdt</id>
                                 <versionRange>0.0.0</versionRange>
                             </requirement>
+                            <requirement>
+		                        <type>p2-installable-unit</type>
+		               			<id>org.eclipse.lsp4jakarta.jdt.core</id>
+		               			<versionRange>0.0.0</versionRange>
+		            		</requirement>
+		            		<requirement>
+		               			<type>p2-installable-unit</type>
+		               			<id>org.eclipse.jdt.ls.core</id>
+		               			<versionRange>0.0.0</versionRange>
+		            		</requirement>
                         </extraRequirements>
                     </dependency-resolution>
                 </configuration>

diff --git a/tests/resources/applications/maven/liberty-maven-test-app/src/main/liberty/config/server.xml b/tests/resources/applications/maven/liberty-maven-test-app/src/main/liberty/config/server.xml
@@ -13,7 +13,7 @@
 -->
 <server description="Sample Servlet server">
     <featureManager>
-        <feature>jakartaee-10.0</feature>
+        <feature>jsp-3.1</feature>
     </featureManager>
 
     <httpEndpoint  host="*" httpPort="9080" httpsPort="9443" id="defaultHttpEndpoint" />

diff --git a/...rces/applications/maven/liberty-maven-test-wrapper-app/src/main/liberty/config/server.xml b/...rces/applications/maven/liberty-maven-test-wrapper-app/src/main/liberty/config/server.xml
@@ -13,7 +13,7 @@
 -->
 <server description="Sample Servlet server">
     <featureManager>
-        <feature>jakartaee-10.0</feature>
+        <feature>jsp-3.1</feature>
     </featureManager>
 
     <httpEndpoint  host="*" httpPort="9080" httpsPort="9443" id="defaultHttpEndpoint" />

diff --git a/...rc/main/java/io/openliberty/tools/eclipse/test/it/LibertyPluginSWTBotLSP4JakartaTest.java b/...rc/main/java/io/openliberty/tools/eclipse/test/it/LibertyPluginSWTBotLSP4JakartaTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2022, 2023 IBM Corporation and others.
+* Copyright (c) 2023 IBM Corporation and others.
 *
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,6 +13,7 @@
 package io.openliberty.tools.eclipse.test.it;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -74,9 +75,11 @@ public class LibertyPluginSWTBotLSP4JakartaTest extends AbstractLibertyPluginSWT
 
     /**
      * Setup.
+     * 
+     * @throws Exception
      */
     @BeforeAll
-    public static void setup() {
+    public static void setup() throws Exception {
 
         commonSetup();
 
@@ -111,6 +114,7 @@ public void testClassLevelSnippets() {
 
             // Get type-ahead list
             List<String> typeAheadOptions = SWTBotPluginOperations.getTypeAheadList(bot, "MyClass.java", "", 0, 0);
+            System.out.println("INFO: Type-ahead options found = " + Arrays.toString(typeAheadOptions.toArray()));
 
             boolean allFound = true;
             List<String> missingOptions = new ArrayList<String>();
@@ -123,10 +127,14 @@ public void testClassLevelSnippets() {
 
             assertTrue(allFound, "Missing type-ahead options: " + Arrays.toString(missingOptions.toArray()));
 
+        } catch (Exception e) {
+            fail("Unexpected exception was thrown: " + e);
         } finally {
 
             // Delete new file
+            System.out.println("INFO: Deleting MyClass.java file");
             LibertyPluginTestUtils.deleteFile(new File(wrapperProjectPath + "/src/main/java/test/maven/liberty/web/app/MyClass.java"));
+
         }
     }
 
@@ -142,6 +150,7 @@ public void testInClassSnippets() {
 
             // Get type-ahead list
             List<String> typeAheadOptions = SWTBotPluginOperations.getTypeAheadList(bot, "MyClass.java", "", 3, 0);
+            System.out.println("INFO: Type-ahead options found = " + Arrays.toString(typeAheadOptions.toArray()));
 
             boolean allFound = true;
             List<String> missingOptions = new ArrayList<String>();
@@ -154,9 +163,12 @@ public void testInClassSnippets() {
 
             assertTrue(allFound, "Missing type-ahead options: " + Arrays.toString(missingOptions.toArray()));
 
+        } catch (Exception e) {
+            fail("Unexpected exception was thrown: " + e);
         } finally {
 
             // Delete new file
+            System.out.println("INFO: Deleting MyClass.java file");
             LibertyPluginTestUtils.deleteFile(new File(wrapperProjectPath + "/src/main/java/test/maven/liberty/web/app/MyClass.java"));
         }
     }
@@ -193,9 +205,12 @@ public void testDiagnosticsAndQuickFixes() {
 
             assertTrue(allFound, "Missing quick-fixes: " + Arrays.toString(missingFixes.toArray()));
 
+        } catch (Exception e) {
+            fail("Unexpected exception was thrown: " + e);
         } finally {
 
             // Delete new file
+            System.out.println("INFO: Deleting MyClass.java file");
             LibertyPluginTestUtils.deleteFile(new File(wrapperProjectPath + "/src/main/java/test/maven/liberty/web/app/MyClass.java"));
         }
     }

diff --git a/tests/src/main/java/io/openliberty/tools/eclipse/test/it/utils/SWTBotPluginOperations.java b/tests/src/main/java/io/openliberty/tools/eclipse/test/it/utils/SWTBotPluginOperations.java
@@ -934,6 +934,8 @@ public boolean matches(Object object) {
      */
     public static void createNewClass(SWTWorkbenchBot bot, String appName, String className, boolean clearContent) {
 
+        System.out.println("INFO: Creating new Java class: " + className);
+
         Object project = getAppInPackageExplorerTree(appName);
         context(project, "New", "Class");
 
@@ -967,6 +969,9 @@ public static void createNewClass(SWTWorkbenchBot bot, String appName, String cl
      */
     public static List<String> getTypeAheadList(SWTWorkbenchBot bot, String editorFileName, String insertText, int cursorRow,
             int cursorColumn) {
+
+        System.out.println("INFO: Getting type-ahead list");
+
         SWTBotPreferences.PLAYBACK_DELAY = 1000;
 
         SWTBotEditor editor = searchForEditor(bot, editorFileName);
@@ -992,6 +997,9 @@ public static List<String> getTypeAheadList(SWTWorkbenchBot bot, String editorFi
      */
     public static void selectTypeAheadOption(SWTWorkbenchBot bot, String editorFileName, String option, int cursorRow,
             int cursorColumn) {
+
+        System.out.println("INFO: Selecting type-ahead option: " + option);
+
         SWTBotPreferences.PLAYBACK_DELAY = 1000;
         SWTBotEditor editor = searchForEditor(bot, editorFileName);
         SWTBotEclipseEditor e = editor.toTextEditor();
@@ -1009,6 +1017,8 @@ public static void selectTypeAheadOption(SWTWorkbenchBot bot, String editorFileN
      * @return
      */
     public static List<String> getQuickFixList(SWTWorkbenchBot bot, String editorFileName) {
+        System.out.println("INFO: Getting quick-fix list for class: " + editorFileName);
+
         SWTBotPreferences.PLAYBACK_DELAY = 1000;
 
         SWTBotEditor editor = searchForEditor(bot, editorFileName);