Skip to content

Commit

Permalink
Update copyright
Browse files Browse the repository at this point in the history 
Signed-off-by: Adam Wisniewski <[email protected]>
  • Loading branch information
Adam Wisniewski authored and Adam Wisniewski committed Jun 28, 2023
1 parent 622404c commit 4a540f6
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 14 deletions.
81 changes: 68 additions & 13 deletions ...rc/main/java/io/openliberty/tools/eclipse/test/it/LibertyPluginSWTBotLSP4JakartaTest.java
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,6 +12,8 @@
*******************************************************************************/
package io.openliberty.tools.eclipse.test.it;

import static io.openliberty.tools.eclipse.test.it.utils.MagicWidgetFinder.goGlobal;
import static io.openliberty.tools.eclipse.test.it.utils.SWTBotPluginOperations.launchDashboardAction;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.io.File;
Expand All @@ -29,6 +31,7 @@

import io.openliberty.tools.eclipse.test.it.utils.LibertyPluginTestUtils;
import io.openliberty.tools.eclipse.test.it.utils.SWTBotPluginOperations;
import io.openliberty.tools.eclipse.ui.dashboard.DashboardView;

/**
* Tests LSP4Jakarta functionality within Liberty Tools for Eclipse
Expand Down Expand Up @@ -106,27 +109,52 @@ public static void cleanup() {
public void testClassLevelSnippets() {

try {
// Start dev mode.
launchDashboardAction(MVN_WRAPPER_APP_NAME, DashboardView.APP_MENU_ACTION_START);

goGlobal("Terminal");

// Validate application is up and running.
LibertyPluginTestUtils.validateApplicationOutcome(MVN_WRAPPER_APP_NAME, true,
wrapperProjectPath.toAbsolutePath().toString() + "/target/liberty");

// Open new class file
SWTBotPluginOperations.createNewClass(bot, MVN_WRAPPER_APP_NAME, "MyClass", true);

// Get type-ahead list
List<String> typeAheadOptions = SWTBotPluginOperations.getTypeAheadList(bot, "MyClass.java", "", 0, 0);

boolean allFound = true;
List<String> missingOptions = new ArrayList<String>();
for (String option : typeAheadOptions_classLevel) {
if (!typeAheadOptions.contains(option)) {
allFound = false;
missingOptions.add(option);

int i = 0;
while (i < 3) {
List<String> typeAheadOptions = SWTBotPluginOperations.getTypeAheadList(bot, "MyClass.java", "", 0, 0);
System.out.println("INFO: Type-ahead options found = " + Arrays.toString(typeAheadOptions.toArray()));

allFound = true;
missingOptions = new ArrayList<String>();
for (String option : typeAheadOptions_classLevel) {
if (!typeAheadOptions.contains(option)) {
allFound = false;
missingOptions.add(option);
}
}
i++;
}

assertTrue(allFound, "Missing type-ahead options: " + Arrays.toString(missingOptions.toArray()));

} catch (Exception e) {
System.out.println("Caught exception: " + e);
} finally {

// Delete new file
LibertyPluginTestUtils.deleteFile(new File(wrapperProjectPath + "/src/main/java/test/maven/liberty/web/app/MyClass.java"));

// Stop dev mode.
launchDashboardAction(MVN_WRAPPER_APP_NAME, DashboardView.APP_MENU_ACTION_STOP);

// Validate application stopped.
LibertyPluginTestUtils.validateLibertyServerStopped(wrapperProjectPath.toAbsolutePath().toString() + "/target/liberty");
}
}

Expand All @@ -137,27 +165,52 @@ public void testClassLevelSnippets() {
public void testInClassSnippets() {

try {
// Start dev mode.
launchDashboardAction(MVN_WRAPPER_APP_NAME, DashboardView.APP_MENU_ACTION_START);

goGlobal("Terminal");

// Validate application is up and running.
LibertyPluginTestUtils.validateApplicationOutcome(MVN_WRAPPER_APP_NAME, true,
wrapperProjectPath.toAbsolutePath().toString() + "/target/liberty");

// Open new class file
SWTBotPluginOperations.createNewClass(bot, MVN_WRAPPER_APP_NAME, "MyClass", false);

// Get type-ahead list
List<String> typeAheadOptions = SWTBotPluginOperations.getTypeAheadList(bot, "MyClass.java", "", 3, 0);

boolean allFound = true;
List<String> missingOptions = new ArrayList<String>();
for (String option : typeAheadOptions_inClass) {
if (!typeAheadOptions.contains(option)) {
allFound = false;
missingOptions.add(option);

int i = 0;
while (i < 3) {
List<String> typeAheadOptions = SWTBotPluginOperations.getTypeAheadList(bot, "MyClass.java", "", 3, 0);
System.out.println("INFO: Type-ahead options found = " + Arrays.toString(typeAheadOptions.toArray()));

allFound = true;
missingOptions = new ArrayList<String>();
for (String option : typeAheadOptions_inClass) {
if (!typeAheadOptions.contains(option)) {
allFound = false;
missingOptions.add(option);
}
}
i++;
}

assertTrue(allFound, "Missing type-ahead options: " + Arrays.toString(missingOptions.toArray()));

} catch (Exception e) {
System.out.println("Caught exception: " + e);
} finally {

// Delete new file
LibertyPluginTestUtils.deleteFile(new File(wrapperProjectPath + "/src/main/java/test/maven/liberty/web/app/MyClass.java"));

// Stop dev mode.
launchDashboardAction(MVN_WRAPPER_APP_NAME, DashboardView.APP_MENU_ACTION_STOP);

// Validate application stopped.
LibertyPluginTestUtils.validateLibertyServerStopped(wrapperProjectPath.toAbsolutePath().toString() + "/target/liberty");
}
}

Expand Down Expand Up @@ -193,6 +246,8 @@ public void testDiagnosticsAndQuickFixes() {

assertTrue(allFound, "Missing quick-fixes: " + Arrays.toString(missingFixes.toArray()));

} catch (Exception e) {
System.out.println("Caught exception: " + e);
} finally {

// Delete new file
Expand Down
12 changes: 11 additions & 1 deletion tests/src/main/java/io/openliberty/tools/eclipse/test/it/utils/SWTBotPluginOperations.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,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");

Expand Down Expand Up @@ -966,7 +968,10 @@ 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) {
SWTBotPreferences.PLAYBACK_DELAY = 1000;

System.out.println("INFO: Getting type-ahead list");

SWTBotPreferences.PLAYBACK_DELAY = 10000;

SWTBotEditor editor = searchForEditor(bot, editorFileName);
SWTBotEclipseEditor e = editor.toTextEditor();
Expand All @@ -991,6 +996,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();
Expand All @@ -1008,6 +1016,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);
Expand Down

0 comments on commit 4a540f6

Please sign in to comment.