From 195ca9b2a1b88018442cafb83a52e7a3598124f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Wed, 9 Apr 2014 09:22:47 +0200 Subject: [PATCH] TestFramework: cleanup, copyrights, use org.junit.Assert --- .../intellij/debugger/impl/OutputChecker.java | 4 ++-- .../com/intellij/find/FindManagerTestUtils.java | 4 ++-- .../impl/JavaCodeInsightTestFixtureImpl.java | 5 +++-- .../conversion/ProjectConversionTestUtil.java | 17 ++++++++++++++++- .../projectView/TestProjectTreeStructure.java | 4 ++-- .../testFramework/EditorListenerTracker.java | 4 ++-- .../intellij/testFramework/EditorTestUtil.java | 6 ++---- .../testFramework/ExpectedHighlightingData.java | 11 +++++------ .../testFramework/FileStructureTestBase.java | 6 +++--- .../testFramework/InspectionTestUtil.java | 4 ++-- .../testFramework/PlatformTestUtil.java | 4 ++-- .../testFramework/ProjectViewTestUtil.java | 8 ++++---- .../com/intellij/testFramework/PsiTestUtil.java | 4 ++-- .../intellij/testFramework/ThreadTracker.java | 4 ++-- .../intellij/testFramework/UsefulTestCase.java | 6 +++++- .../com/intellij/testFramework/VfsTestUtil.java | 10 +++++----- .../fixtures/impl/BaseFixture.java | 11 +++++------ .../intellij/util/io/TestFileSystemItem.java | 17 ++++++++++++++++- .../src/com/intellij/util/xml/CallRegistry.java | 17 ++++++++++++++++- 19 files changed, 96 insertions(+), 50 deletions(-) diff --git a/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java b/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java index a391c969376c..df5817e226c9 100644 --- a/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java +++ b/java/testFramework/src/com/intellij/debugger/impl/OutputChecker.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtilRt; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.util.containers.HashMap; -import junit.framework.Assert; +import org.junit.Assert; import java.io.File; import java.io.FileOutputStream; diff --git a/java/testFramework/src/com/intellij/find/FindManagerTestUtils.java b/java/testFramework/src/com/intellij/find/FindManagerTestUtils.java index 89b2578390f7..087180bbc9a3 100644 --- a/java/testFramework/src/com/intellij/find/FindManagerTestUtils.java +++ b/java/testFramework/src/com/intellij/find/FindManagerTestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ package com.intellij.find; import com.intellij.testFramework.LightVirtualFile; -import junit.framework.Assert; +import org.junit.Assert; public class FindManagerTestUtils { static void runFindInCommentsAndLiterals(FindManager findManager, FindModel findModel, String text) { diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaCodeInsightTestFixtureImpl.java b/java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaCodeInsightTestFixtureImpl.java index 525df5c02fea..d348a5e450b8 100644 --- a/java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaCodeInsightTestFixtureImpl.java +++ b/java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaCodeInsightTestFixtureImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,13 +27,14 @@ import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture; import com.intellij.testFramework.fixtures.TempDirTestFixture; import com.intellij.util.ui.UIUtil; -import junit.framework.Assert; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import org.junit.Assert; /** * @author yole */ +@SuppressWarnings("TestOnlyProblems") public class JavaCodeInsightTestFixtureImpl extends CodeInsightTestFixtureImpl implements JavaCodeInsightTestFixture { public JavaCodeInsightTestFixtureImpl(IdeaProjectTestFixture projectFixture, TempDirTestFixture tempDirFixture) { super(projectFixture, tempDirFixture); diff --git a/platform/testFramework/src/com/intellij/conversion/ProjectConversionTestUtil.java b/platform/testFramework/src/com/intellij/conversion/ProjectConversionTestUtil.java index 0300a8f61103..e7b5172ac14d 100644 --- a/platform/testFramework/src/com/intellij/conversion/ProjectConversionTestUtil.java +++ b/platform/testFramework/src/com/intellij/conversion/ProjectConversionTestUtil.java @@ -1,6 +1,21 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.conversion; -import junit.framework.Assert; +import org.junit.Assert; import java.io.File; import java.util.List; diff --git a/platform/testFramework/src/com/intellij/projectView/TestProjectTreeStructure.java b/platform/testFramework/src/com/intellij/projectView/TestProjectTreeStructure.java index e6b8dee21ce2..95a7b8b6b9e9 100644 --- a/platform/testFramework/src/com/intellij/projectView/TestProjectTreeStructure.java +++ b/platform/testFramework/src/com/intellij/projectView/TestProjectTreeStructure.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.testFramework.ProjectViewTestUtil; -import junit.framework.Assert; +import org.junit.Assert; public class TestProjectTreeStructure extends AbstractProjectTreeStructure implements Disposable { protected boolean myShowMembers = false; diff --git a/platform/testFramework/src/com/intellij/testFramework/EditorListenerTracker.java b/platform/testFramework/src/com/intellij/testFramework/EditorListenerTracker.java index bccea8e89f71..f09f2ca98f2f 100644 --- a/platform/testFramework/src/com/intellij/testFramework/EditorListenerTracker.java +++ b/platform/testFramework/src/com/intellij/testFramework/EditorListenerTracker.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.project.impl.ProjectManagerImpl; import com.intellij.openapi.vfs.encoding.EncodingManager; import com.intellij.util.containers.hash.LinkedHashMap; -import junit.framework.Assert; +import org.junit.Assert; import java.util.List; import java.util.Map; diff --git a/platform/testFramework/src/com/intellij/testFramework/EditorTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/EditorTestUtil.java index 3ae9b8d1c69b..41057aacf23f 100644 --- a/platform/testFramework/src/com/intellij/testFramework/EditorTestUtil.java +++ b/platform/testFramework/src/com/intellij/testFramework/EditorTestUtil.java @@ -34,7 +34,7 @@ import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.tree.IElementType; -import junit.framework.Assert; +import org.junit.Assert; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -46,9 +46,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; /** - * User: Maxim.Mossienko - * Date: 15.03.2010 - * Time: 21:00:49 + * @author Maxim.Mossienko */ public class EditorTestUtil { public static final String CARET_TAG = ""; diff --git a/platform/testFramework/src/com/intellij/testFramework/ExpectedHighlightingData.java b/platform/testFramework/src/com/intellij/testFramework/ExpectedHighlightingData.java index 93de7cc42f88..6c6c3fff7ff4 100644 --- a/platform/testFramework/src/com/intellij/testFramework/ExpectedHighlightingData.java +++ b/platform/testFramework/src/com/intellij/testFramework/ExpectedHighlightingData.java @@ -13,10 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/** - * @author cdr - */ package com.intellij.testFramework; import com.intellij.codeHighlighting.Pass; @@ -51,7 +47,7 @@ import com.intellij.util.NullableFunction; import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashMap; import gnu.trove.THashSet; -import junit.framework.Assert; +import org.junit.Assert; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -63,6 +59,9 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +/** + * @author cdr + */ public class ExpectedHighlightingData { private static final Logger LOG = Logger.getInstance("#com.intellij.testFramework.ExpectedHighlightingData"); @@ -99,7 +98,7 @@ public class ExpectedHighlightingData { public void init() { new WriteCommandAction(null){ @Override - protected void run(Result result) throws Throwable { + protected void run(@NotNull Result result) throws Throwable { extractExpectedLineMarkerSet(myDocument); extractExpectedHighlightsSet(myDocument); refreshLineMarkers(); diff --git a/platform/testFramework/src/com/intellij/testFramework/FileStructureTestBase.java b/platform/testFramework/src/com/intellij/testFramework/FileStructureTestBase.java index e31569a394a6..9b65d910cc9b 100644 --- a/platform/testFramework/src/com/intellij/testFramework/FileStructureTestBase.java +++ b/platform/testFramework/src/com/intellij/testFramework/FileStructureTestBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import com.intellij.ui.treeStructure.Tree; import com.intellij.ui.treeStructure.filtered.FilteringTreeBuilder; import com.intellij.ui.treeStructure.filtered.FilteringTreeStructure; import com.intellij.util.ui.tree.TreeUtil; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Before; import javax.swing.tree.TreePath; @@ -120,7 +120,7 @@ public abstract class FileStructureTestBase extends CodeInsightFixtureTestCase { } protected FilteringTreeStructure.FilteringNode getRootNode() { - return (FilteringTreeStructure.FilteringNode)getStructure().getRootElement(); + return getStructure().getRootElement(); } protected void updateRecursively(final FilteringTreeStructure.FilteringNode node) { diff --git a/platform/testFramework/src/com/intellij/testFramework/InspectionTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/InspectionTestUtil.java index e1ff63327454..12989d102dd9 100644 --- a/platform/testFramework/src/com/intellij/testFramework/InspectionTestUtil.java +++ b/platform/testFramework/src/com/intellij/testFramework/InspectionTestUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import com.intellij.codeInspection.ex.InspectionToolWrapper; import com.intellij.codeInspection.ui.InspectionToolPresentation; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.JDOMUtil; -import junit.framework.Assert; +import org.junit.Assert; import org.jdom.Document; import org.jdom.Element; import org.jetbrains.annotations.NotNull; diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java index 18b2e54f32a9..94e86e1ed74a 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java +++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java @@ -471,7 +471,7 @@ public class PlatformTestUtil { public void assertTiming() { assert expectedMs != 0 : "Must call .expect() before run test"; if (COVERAGE_ENABLED_BUILD) return; - Timings.getStatistics(); // warmup, measure + Timings.getStatistics(); // warm-up, measure while (true) { attempts--; @@ -747,7 +747,7 @@ public class PlatformTestUtil { public static void assertElementsEqual(final Element expected, final Element actual) throws IOException { if (!JDOMUtil.areElementsEqual(expected, actual)) { - junit.framework.Assert.assertEquals(printElement(expected), printElement(actual)); + assertEquals(printElement(expected), printElement(actual)); } } diff --git a/platform/testFramework/src/com/intellij/testFramework/ProjectViewTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/ProjectViewTestUtil.java index 681a5c7e5626..66b59d06d200 100644 --- a/platform/testFramework/src/com/intellij/testFramework/ProjectViewTestUtil.java +++ b/platform/testFramework/src/com/intellij/testFramework/ProjectViewTestUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,10 +24,10 @@ import com.intellij.openapi.ui.Queryable; import com.intellij.openapi.util.MultiValuesMap; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.Function; -import junit.framework.Assert; import org.jetbrains.annotations.Nullable; +import org.junit.Assert; import javax.swing.*; import javax.swing.tree.DefaultMutableTreeNode; @@ -40,7 +40,7 @@ public class ProjectViewTestUtil { public static VirtualFile[] getFiles(AbstractTreeNode kid, Function converterFunction) { if (kid instanceof BasePsiNode) { Object value = kid.getValue(); - VirtualFile virtualFile = PsiUtilBase.getVirtualFile((PsiElement)value); + VirtualFile virtualFile = PsiUtilCore.getVirtualFile((PsiElement)value); return new VirtualFile[]{virtualFile}; } if (converterFunction != null) { diff --git a/platform/testFramework/src/com/intellij/testFramework/PsiTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/PsiTestUtil.java index a5df309d22a0..44d3019dcbe8 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PsiTestUtil.java +++ b/platform/testFramework/src/com/intellij/testFramework/PsiTestUtil.java @@ -39,13 +39,13 @@ import com.intellij.psi.impl.DebugUtil; import com.intellij.util.Consumer; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; -import junit.framework.Assert; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.model.JpsElement; import org.jetbrains.jps.model.java.JavaSourceRootType; import org.jetbrains.jps.model.module.JpsModuleSourceRootType; +import org.junit.Assert; import java.io.File; import java.util.ArrayList; @@ -350,7 +350,7 @@ public class PsiTestUtil { public static Module addModule(final Project project, final ModuleType type, final String name, final VirtualFile root) { return new WriteCommandAction(project) { @Override - protected void run(Result result) throws Throwable { + protected void run(@NotNull Result result) throws Throwable { String moduleName; ModifiableModuleModel moduleModel = ModuleManager.getInstance(project).getModifiableModel(); try { diff --git a/platform/testFramework/src/com/intellij/testFramework/ThreadTracker.java b/platform/testFramework/src/com/intellij/testFramework/ThreadTracker.java index 5b0d0050b93a..1a44743d6611 100644 --- a/platform/testFramework/src/com/intellij/testFramework/ThreadTracker.java +++ b/platform/testFramework/src/com/intellij/testFramework/ThreadTracker.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ package com.intellij.testFramework; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.project.impl.ProjectManagerImpl; import gnu.trove.THashSet; -import junit.framework.Assert; +import org.junit.Assert; import java.util.Collection; import java.util.Collections; diff --git a/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java b/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java index 960964fac7af..d8a5f0fb9408 100644 --- a/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java @@ -46,12 +46,16 @@ import com.intellij.util.*; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; import gnu.trove.THashSet; -import junit.framework.*; +import junit.framework.AssertionFailedError; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; import org.intellij.lang.annotations.RegExp; import org.jdom.Element; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.junit.Assert; import java.awt.*; import java.io.File; diff --git a/platform/testFramework/src/com/intellij/testFramework/VfsTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/VfsTestUtil.java index 6670a27f2fb2..986ba6e6a9d8 100644 --- a/platform/testFramework/src/com/intellij/testFramework/VfsTestUtil.java +++ b/platform/testFramework/src/com/intellij/testFramework/VfsTestUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.PathUtil; import com.intellij.util.text.StringTokenizer; -import junit.framework.Assert; +import org.junit.Assert; import java.io.File; import java.io.IOException; @@ -50,9 +50,9 @@ public class VfsTestUtil { } private static VirtualFile createFileOrDir(final VirtualFile root, - final String relativePath, - final String text, - final boolean dir) { + final String relativePath, + final String text, + final boolean dir) { try { AccessToken token = WriteAction.start(); try { diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/BaseFixture.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/BaseFixture.java index 7213b94402bd..28051d09d492 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/BaseFixture.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/BaseFixture.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,18 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/* - * @author max - */ package com.intellij.testFramework.fixtures.impl; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; import com.intellij.testFramework.UsefulTestCase; import com.intellij.testFramework.fixtures.IdeaTestFixture; -import junit.framework.Assert; +import org.junit.Assert; +/* + * @author max + */ public class BaseFixture implements IdeaTestFixture { private boolean myDisposed; private boolean myInitialized; diff --git a/platform/testFramework/src/com/intellij/util/io/TestFileSystemItem.java b/platform/testFramework/src/com/intellij/util/io/TestFileSystemItem.java index cd68c079536d..0d54e19b0253 100644 --- a/platform/testFramework/src/com/intellij/util/io/TestFileSystemItem.java +++ b/platform/testFramework/src/com/intellij/util/io/TestFileSystemItem.java @@ -1,8 +1,23 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.util.io; import com.intellij.openapi.util.io.FileUtil; -import junit.framework.Assert; import org.jetbrains.annotations.Nullable; +import org.junit.Assert; import java.io.File; import java.io.IOException; diff --git a/platform/testFramework/src/com/intellij/util/xml/CallRegistry.java b/platform/testFramework/src/com/intellij/util/xml/CallRegistry.java index 5353c8543099..88a075debd53 100644 --- a/platform/testFramework/src/com/intellij/util/xml/CallRegistry.java +++ b/platform/testFramework/src/com/intellij/util/xml/CallRegistry.java @@ -1,6 +1,21 @@ +/* + * Copyright 2000-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.intellij.util.xml; -import junit.framework.Assert; +import org.junit.Assert; import java.util.ArrayList; import java.util.List;