Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSasikanth Bharadwaj2017-02-09 05:07:22 -0500
committerSasikanth Bharadwaj2017-02-09 05:07:22 -0500
commit5b985a80c268f70b5a6f9778d88c8c05a1714e21 (patch)
tree860fac658eeafc5610249190403271348f1753d7 /org.eclipse.jdt.apt.tests
parentb16bc9bf1bc92aae361b8d5f446a22319995126b (diff)
parenteb828564b2e82034e080c0c1c42a41a06935acee (diff)
downloadeclipse.jdt.core-5b985a80c268f70b5a6f9778d88c8c05a1714e21.tar.gz
eclipse.jdt.core-5b985a80c268f70b5a6f9778d88c8c05a1714e21.tar.xz
eclipse.jdt.core-5b985a80c268f70b5a6f9778d88c8c05a1714e21.zip
Merge remote-tracking branch 'origin/master' into BETA_JAVA9
Conflicts: org.eclipse.jdt.annotation/.settings/.api_filters org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/ClasspathJar.java org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/QualifiedAllocationExpression.java org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BlockScope.java org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/CompilationUnitScope.java org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/ClasspathJar.java org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/HandleFactory.java Change-Id: Ia914e62b1bc54dbbd439cd87d88eb0321fcb1ce4
Diffstat (limited to 'org.eclipse.jdt.apt.tests')
-rw-r--r--org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/FactoryPathTests.java124
-rw-r--r--org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/TestAll.java1
2 files changed, 125 insertions, 0 deletions
diff --git a/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/FactoryPathTests.java b/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/FactoryPathTests.java
new file mode 100644
index 0000000000..b92a4feca1
--- /dev/null
+++ b/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/FactoryPathTests.java
@@ -0,0 +1,124 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Google, Inc and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Stefan Xenos (Google) - Initial implementation
+ *******************************************************************************/
+package org.eclipse.jdt.apt.tests;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.apt.core.internal.VarJarFactoryContainer;
+import org.eclipse.jdt.apt.core.internal.WkspJarFactoryContainer;
+import org.eclipse.jdt.apt.core.internal.util.FactoryContainer;
+import org.eclipse.jdt.apt.core.internal.util.FactoryPath;
+import org.eclipse.jdt.apt.core.internal.util.FactoryPathUtil;
+import org.eclipse.jdt.apt.core.internal.util.FactoryPath.Attributes;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class FactoryPathTests extends TestCase {
+ private FactoryPath path;
+
+ private final String[] filesInPath = { "all/your.jar", "base.jar", "are.jar", "belong/to/us.jar",
+ "you/have/no/chance.jar", "to.jar", "survive.jar" };
+
+ public FactoryPathTests(String name) {
+ super(name);
+ }
+
+ public static Test suite() {
+ return new TestSuite(FactoryPathTests.class);
+ }
+
+ private static void assertExtJars(List<String> expected, Map<FactoryContainer, Attributes> actual) {
+ List<FactoryContainer> toIterate = new ArrayList<>();
+ toIterate.addAll(actual.keySet());
+ Collections.reverse(toIterate);
+ assertEquals("The size of the path list should match up", expected.size(), toIterate.size());
+ int index = 0;
+ for (FactoryContainer container : toIterate) {
+ FactoryContainer fc = FactoryPathUtil.newExtJarFactoryContainer(new File(expected.get(index++)));
+ assertEquals("Unexpected jar file", fc, container);
+ }
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ path = new FactoryPath();
+ for (String next : filesInPath) {
+ path.addExternalJar(new File(next));
+ }
+ super.setUp();
+ }
+
+ public void testGetAllContainers() throws Exception {
+ assertExtJars(Arrays.asList(filesInPath), path.getAllContainers());
+ }
+
+ public void testGetEnabledContainersOrder() throws Exception {
+ assertExtJars(Arrays.asList(filesInPath), path.getEnabledContainers());
+ }
+
+ public void testRemoveExternalJar() throws Exception {
+ File toRemove = new File(filesInPath[3]);
+ FactoryContainer fc = FactoryPathUtil.newExtJarFactoryContainer(toRemove);
+
+ assertTrue("Initial classpath should have contained jar", path.getAllContainers().containsKey(fc));
+
+ path.removeExternalJar(toRemove);
+
+ assertFalse("Final classpath should not have contained jar", path.getAllContainers().containsKey(fc));
+ final String[] expectedResult = { "all/your.jar", "base.jar", "are.jar", "you/have/no/chance.jar", "to.jar",
+ "survive.jar" };
+ assertExtJars(Arrays.asList(expectedResult), path.getAllContainers());
+ }
+
+ public void testAddRemoveVarJar() throws Exception {
+ IPath toAdd = new Path("/foo/bar/baz.jar");
+
+ path.addVarJar(toAdd);
+
+ // Will throw an exception if the newly added jar isn't first
+ VarJarFactoryContainer fc = (VarJarFactoryContainer) path.getAllContainers().keySet().iterator().next();
+ assertEquals(toAdd.toString(), fc.getId());
+
+ path.removeVarJar(toAdd);
+
+ assertFalse("Factory path should not contain the removed jar", path.getAllContainers().containsKey(fc));
+ }
+
+ public void testAddRemoveWorkspaceJar() throws Exception {
+ IPath toAdd = new Path("/foo/bar/baz.jar");
+
+ path.addWkspJar(toAdd);
+
+ // Will throw an exception if the newly added jar isn't first
+ WkspJarFactoryContainer fc = (WkspJarFactoryContainer) path.getAllContainers().keySet().iterator().next();
+ assertTrue(fc.getJarFile().toString().endsWith(toAdd.toString()));
+
+ path.removeWkspJar(toAdd);
+
+ assertFalse("Factory path should not contain the removed jar", path.getAllContainers().containsKey(fc));
+ }
+
+ public void testSetContainers() throws Exception {
+ FactoryPath newPath = new FactoryPath();
+ newPath.setContainers(path.getAllContainers());
+
+ assertExtJars(Arrays.asList(filesInPath), newPath.getAllContainers());
+ }
+}
diff --git a/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/TestAll.java b/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/TestAll.java
index 8298b12a5c..206ccd3853 100644
--- a/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/TestAll.java
+++ b/org.eclipse.jdt.apt.tests/src/org/eclipse/jdt/apt/tests/TestAll.java
@@ -50,6 +50,7 @@ public class TestAll extends TestCase {
suite.addTest(ReadAnnotationTests.suite());
suite.addTest(PreferencesTests.suite());
suite.addTest(FactoryLoaderTests.suite());
+ suite.addTest(FactoryPathTests.suite());
suite.addTest(ListenerTests.suite());
suite.addTest(MirrorDeclarationTests.suite());
suite.addTest(MirrorUtilTests.suite());

Back to the top