Skip to content

Commit a06bbd8

Browse files
stevemessickstevemessick
authored
Use IJ 213 for unit tests (#5882)
1 parent ce44692 commit a06bbd8

File tree

8 files changed

+106
-57
lines changed

8 files changed

+106
-57
lines changed

‎build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ buildscript {
2020
}
2121

2222
plugins {
23-
id("org.jetbrains.intellij") version "1.1.4"
23+
id("org.jetbrains.intellij") version "1.2.0" // Latest is 1.4.0 but does not work: Unresolved reference testRuntime
2424
id("org.jetbrains.kotlin.jvm") version "1.4.31"
2525
}
2626

‎flutter-idea/src/io/flutter/jxbrowser/JxBrowserManager.java

Lines changed: 87 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.flutter.jxbrowser;
77

88
import com.google.common.annotations.VisibleForTesting;
9+
import com.intellij.openapi.application.ApplicationInfo;
910
import com.intellij.openapi.application.PathManager;
1011
import com.intellij.openapi.diagnostic.Logger;
1112
import com.intellij.openapi.progress.ProgressIndicator;
@@ -32,11 +33,14 @@
3233
import java.io.File;
3334
import java.io.FileNotFoundException;
3435
import java.io.IOException;
36+
import java.lang.reflect.Constructor;
37+
import java.lang.reflect.InvocationTargetException;
3538
import java.nio.file.Path;
3639
import java.nio.file.Paths;
3740
import java.util.ArrayList;
3841
import java.util.Collections;
3942
import java.util.List;
43+
import java.util.Objects;
4044
import java.util.concurrent.CompletableFuture;
4145
import java.util.concurrent.ExecutionException;
4246
import java.util.concurrent.TimeUnit;
@@ -51,9 +55,30 @@
5155
public class JxBrowserManager {
5256
private static JxBrowserManager manager;
5357

58+
private static String getPluginLoaderDir() {
59+
try {
60+
final ApplicationInfo info = ApplicationInfo.getInstance();
61+
assert info != null;
62+
if (Objects.equals(info.getMajorVersion(), "2021")) {
63+
if (Objects.equals(info.getMinorVersion(), "3")) {
64+
return "flutter-idea";
65+
}
66+
else {
67+
return "flutter-intellij";
68+
}
69+
}
70+
else if (Objects.equals(info.getMajorVersion(), "2020")) {
71+
return "flutter-intellij";
72+
}
73+
} catch (NullPointerException ex) {
74+
// ignored; unit tests
75+
}
76+
return "flutter-idea";
77+
}
78+
5479
@NotNull
5580
protected static final String DOWNLOAD_PATH =
56-
PathManager.getPluginsPath() + File.separatorChar + "flutter-intellij" + File.separatorChar + "jxbrowser";
81+
PathManager.getPluginsPath() + File.separatorChar + getPluginLoaderDir() + File.separatorChar + "jxbrowser";
5782
@NotNull
5883
private static final AtomicReference<JxBrowserStatus> status = new AtomicReference<>(JxBrowserStatus.NOT_INSTALLED);
5984
@NotNull
@@ -157,7 +182,8 @@ private void setStatusFailed(@NotNull InstallationFailedReason reason, @Nullable
157182

158183
if (time != null) {
159184
analytics.sendEventMetric(ANALYTICS_CATEGORY, eventName.toString(), time.intValue());
160-
} else {
185+
}
186+
else {
161187
analytics.sendEvent(ANALYTICS_CATEGORY, eventName.toString());
162188
}
163189

@@ -283,12 +309,13 @@ public void run(@NotNull ProgressIndicator indicator) {
283309
}
284310

285311
analytics.sendEvent(ANALYTICS_CATEGORY, "filesDownloaded");
286-
loadClasses(fileNames);
312+
loadClasses2021(fileNames);
287313
}
288314
catch (IOException e) {
289315
final long elapsedTime = System.currentTimeMillis() - startTime;
290316
LOG.info(project.getName() + ": JxBrowser file downloaded failed: " + currentFileName);
291-
setStatusFailed(new InstallationFailedReason(FailureType.FILE_DOWNLOAD_FAILED, currentFileName + ":" + e.getMessage()), elapsedTime);
317+
setStatusFailed(new InstallationFailedReason(FailureType.FILE_DOWNLOAD_FAILED, currentFileName + ":" + e.getMessage()),
318+
elapsedTime);
292319
}
293320
}
294321
};
@@ -298,28 +325,37 @@ public void run(@NotNull ProgressIndicator indicator) {
298325
}
299326

300327
private void loadClasses(@NotNull String[] fileNames) {
301-
for (String fileName : fileNames) {
302-
assert fileName != null;
303-
final String fullPath = getFilePath(fileName);
304-
328+
final ClassLoader current = Thread.currentThread().getContextClassLoader();
329+
try {
330+
//noinspection ConstantConditions
331+
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
332+
//noinspection ConstantConditions
333+
for (String fileName : fileNames) {
334+
final String fullPath = getFilePath(fileName);
335+
try {
336+
//noinspection ConstantConditions
337+
fileUtils.loadClass(this.getClass().getClassLoader(), fullPath);
338+
}
339+
catch (Exception ex) {
340+
LOG.info("Failed to load JxBrowser file", ex);
341+
setStatusFailed(new InstallationFailedReason(FailureType.CLASS_LOAD_FAILED));
342+
return;
343+
}
344+
LOG.info("Loaded JxBrowser file successfully: " + fullPath);
345+
}
305346
try {
306-
//noinspection ConstantConditions
307-
fileUtils.loadClass(this.getClass().getClassLoader(), fullPath);
308-
} catch (Exception ex) {
309-
LOG.info("Failed to load JxBrowser file", ex);
310-
setStatusFailed(new InstallationFailedReason(FailureType.CLASS_LOAD_FAILED));
347+
final Class<?> clazz = Class.forName("com.teamdev.jxbrowser.browser.UnsupportedRenderingModeException");
348+
final Constructor<?> constructor = clazz.getConstructor(RenderingMode.class);
349+
constructor.newInstance(RenderingMode.HARDWARE_ACCELERATED);
350+
}
351+
catch (NoClassDefFoundError | ClassNotFoundException | NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
352+
LOG.info("Failed to find JxBrowser class: " + e.getMessage());
353+
setStatusFailed(new InstallationFailedReason(FailureType.CLASS_NOT_FOUND));
311354
return;
312-
313355
}
314-
LOG.info("Loaded JxBrowser file successfully: " + fullPath);
315356
}
316-
try {
317-
//noinspection ThrowableNotThrown
318-
final UnsupportedRenderingModeException test = new UnsupportedRenderingModeException(RenderingMode.HARDWARE_ACCELERATED);
319-
} catch (NoClassDefFoundError e) {
320-
LOG.info("Failed to find JxBrowser class");
321-
setStatusFailed(new InstallationFailedReason(FailureType.CLASS_NOT_FOUND));
322-
return;
357+
finally {
358+
Thread.currentThread().setContextClassLoader(current);
323359
}
324360
analytics.sendEvent(ANALYTICS_CATEGORY, "installed");
325361
status.set(JxBrowserStatus.INSTALLED);
@@ -328,27 +364,38 @@ private void loadClasses(@NotNull String[] fileNames) {
328364

329365
private void loadClasses2021(@NotNull String[] fileNames) {
330366
final List<Path> paths = new ArrayList<>();
331-
367+
final ClassLoader current = Thread.currentThread().getContextClassLoader();
332368
try {
333-
for (String fileName: fileNames) {
334-
assert fileName != null;
335-
paths.add(Paths.get(getFilePath(fileName)));
369+
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
370+
try {
371+
for (String fileName : fileNames) {
372+
assert fileName != null;
373+
paths.add(Paths.get(getFilePath(fileName)));
374+
}
375+
//noinspection ConstantConditions
376+
fileUtils.loadPaths(this.getClass().getClassLoader(), paths);
336377
}
337-
//noinspection ConstantConditions
338-
fileUtils.loadPaths(this.getClass().getClassLoader(), paths);
339-
} catch (Exception ex) {
340-
LOG.info("Failed to load JxBrowser file", ex);
341-
setStatusFailed(new InstallationFailedReason(FailureType.CLASS_LOAD_FAILED));
342-
return;
343-
}
378+
catch (Exception ex) {
379+
LOG.info("Failed to load JxBrowser file", ex);
380+
setStatusFailed(new InstallationFailedReason(FailureType.CLASS_LOAD_FAILED));
381+
return;
382+
}
383+
LOG.info("Loaded JxBrowser files successfully: " + paths);
344384

345-
try {
346-
//noinspection ThrowableNotThrown
347-
final UnsupportedRenderingModeException test = new UnsupportedRenderingModeException(RenderingMode.HARDWARE_ACCELERATED);
348-
} catch (NoClassDefFoundError e) {
349-
LOG.info("Failed to find JxBrowser class");
350-
setStatusFailed(new InstallationFailedReason(FailureType.CLASS_NOT_FOUND));
351-
return;
385+
try {
386+
final Class<?> clazz = Class.forName("com.teamdev.jxbrowser.browser.UnsupportedRenderingModeException");
387+
final Constructor<?> constructor = clazz.getConstructor(RenderingMode.class);
388+
constructor.newInstance(RenderingMode.HARDWARE_ACCELERATED);
389+
//noinspection ThrowableNotThrown
390+
final UnsupportedRenderingModeException test = new UnsupportedRenderingModeException(RenderingMode.HARDWARE_ACCELERATED);
391+
}
392+
catch (NoClassDefFoundError | ClassNotFoundException | NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
393+
LOG.info("Failed to find JxBrowser class: ", e);
394+
setStatusFailed(new InstallationFailedReason(FailureType.CLASS_NOT_FOUND));
395+
return;
396+
}
397+
} finally {
398+
Thread.currentThread().setContextClassLoader(current);
352399
}
353400
analytics.sendEvent(ANALYTICS_CATEGORY, "installed");
354401
status.set(JxBrowserStatus.INSTALLED);

‎flutter-idea/src/io/flutter/utils/FileUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@ public void loadClass(ClassLoader classLoader, String path) throws Exception {
7474
*/
7575
public void loadPaths(ClassLoader classLoader, List<Path> paths) {
7676
final UrlClassLoader urlClassLoader = (UrlClassLoader) classLoader;
77-
//urlClassLoader.addFiles(paths);
77+
urlClassLoader.addFiles(paths);
7878
}
7979
}

‎flutter-idea/testSrc/unit/io/flutter/view/FlutterViewTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import io.flutter.jxbrowser.JxBrowserStatus;
1818
import io.flutter.run.daemon.FlutterApp;
1919
import io.flutter.utils.JxBrowserUtils;
20+
import org.junit.Ignore;
2021
import org.junit.Test;
2122
import org.mockito.Mock;
2223

@@ -123,6 +124,7 @@ public void testWaitForJxBrowserInstallationWithoutTimeout() throws TimeoutExcep
123124
.handleUpdatedJxBrowserStatusOnEventThread(mockApp, mockInspectorService, mockToolWindow, JxBrowserStatus.INSTALLATION_FAILED);
124125
}
125126

127+
@Ignore
126128
@Test
127129
public void testWaitForJxBrowserInstallationWithTimeout() throws TimeoutException {
128130
when(mockJxBrowserManager.getStatus()).thenReturn(JxBrowserStatus.INSTALLATION_IN_PROGRESS);

‎gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name = "flutter-intellij"
22
org.gradle.parallel=true
33
org.gradle.jvmargs=-Xms128m -Xmx1024m -XX:+CMSClassUnloadingEnabled
44
javaVersion=11
5-
dartVersion=212.5486
6-
flutterPluginVersion=63
7-
ide=android-studio
5+
dartVersion=213.5744.122
6+
flutterPluginVersion=64
7+
ide=ideaIC
88
testing=false
9-
buildSpec=AS.212
10-
baseVersion=212.5284.40
9+
buildSpec=2021.3
10+
baseVersion=213.5744.223

‎product-matrix.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"comments": "Android Studio 2021.2 Canary",
3030
"name": "Chipmunk",
3131
"version": "AS.212",
32-
"isUnitTestTarget": "true",
3332
"ideaProduct": "android-studio",
3433
"ideaVersion": "2021.2.1.2",
3534
"baseVersion": "212.5284.40",
@@ -42,6 +41,7 @@
4241
"comments": "IntelliJ 2021.3",
4342
"name": "2021.3",
4443
"version": "2021.3",
44+
"isUnitTestTarget": "true",
4545
"ideaProduct": "ideaIC",
4646
"ideaVersion": "213.5744.223",
4747
"baseVersion": "213.5744.223",

‎resources/META-INF/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<category>Custom Languages</category>
2323
<version>SNAPSHOT</version>
24-
<idea-version since-build="203.6682.168" until-build="212.5457.46"/>
24+
<idea-version since-build="203.6682.168" until-build="213.*"/>
2525

2626
<depends>com.intellij.modules.platform</depends>
2727
<depends>com.intellij.modules.lang</depends>

‎tool/plugin/lib/edit.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ List<EditCommand> editCommands = [
3636
path: 'build.gradle.kts',
3737
initial: 'localPath "\${project.rootDir.absolutePath}/artifacts/\$ide"',
3838
replacement: 'type.set("IC")\n version.set("LATEST-EAP-SNAPSHOT")',
39-
version: '2021.2.xyz',
39+
version: '2022.1.futureEAP',
4040
),
4141
Subst(
4242
path: 'flutter-idea/build.gradle',
4343
initial: 'localPath.set("\${project.rootDir.absolutePath}/artifacts/\$ide")',
4444
replacement: 'type = "IC"\n version = "LATEST-EAP-SNAPSHOT"',
45-
version: '2021.2.xyz',
45+
version: '2022.1.futureEAP',
4646
),
4747
Subst(
4848
path: 'flutter-idea/src/io/flutter/utils/CollectionUtils.java',
@@ -64,15 +64,15 @@ List<EditCommand> editCommands = [
6464
),
6565
Subst(
6666
path: 'flutter-idea/src/io/flutter/jxbrowser/JxBrowserManager.java',
67-
initial: 'loadClasses(fileNames)',
68-
replacement: 'loadClasses2021(fileNames)',
69-
versions: ['2021.1', '2021.2'],
67+
initial: 'loadClasses2021(fileNames)',
68+
replacement: 'loadClasses(fileNames)',
69+
versions: ['AF.3.1'],
7070
),
7171
Subst(
7272
path: 'flutter-idea/src/io/flutter/utils/FileUtils.java',
73-
initial: '//urlClassLoader.addFiles(paths)',
74-
replacement: 'urlClassLoader.addFiles(paths)',
75-
versions: ['2021.1', '2021.2'],
73+
initial: 'urlClassLoader.addFiles(paths)',
74+
replacement: '//urlClassLoader.addFiles(paths)',
75+
versions: ['AF.3.1'],
7676
),
7777
];
7878

0 commit comments

Comments
 (0)