Minor cleanup.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4525 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/resource/impl/PathPrefixSet.java b/dev/core/src/com/google/gwt/dev/resource/impl/PathPrefixSet.java
index c9c5b2d..92572a6 100644
--- a/dev/core/src/com/google/gwt/dev/resource/impl/PathPrefixSet.java
+++ b/dev/core/src/com/google/gwt/dev/resource/impl/PathPrefixSet.java
@@ -23,7 +23,6 @@
/**
* Combines the information conveyed about a set of path prefixes to quickly
* answer questions regarding an entire set of path prefixes.
- *
*/
public class PathPrefixSet {
/*
@@ -34,7 +33,7 @@
*
* (2) TODO(amitmanjhi): Improve the api of the PathPrefixSet so that with one
* trie-traversal, it could be found out which resources rooted at a directory
- * are allowed?
+ * are allowed?
*/
private static class TrieNode {
@@ -266,9 +265,7 @@
/**
* Returns true if the first pathPrefix is inserted into the PathPrefixSet
* after the second pathPrefix.
- *
*/
-
public boolean secondPrefixOverridesFirst(PathPrefix prefix1,
PathPrefix prefix2) {
int rank1 = prefixes.get(prefix1);
diff --git a/dev/core/test/com/google/gwt/dev/resource/impl/ResourceOracleImplTest.java b/dev/core/test/com/google/gwt/dev/resource/impl/ResourceOracleImplTest.java
index a4b1912..4625ee3 100644
--- a/dev/core/test/com/google/gwt/dev/resource/impl/ResourceOracleImplTest.java
+++ b/dev/core/test/com/google/gwt/dev/resource/impl/ResourceOracleImplTest.java
@@ -150,10 +150,10 @@
PathPrefix pathPrefixReroot = new PathPrefix("org/example/bar/client",
null, true);
- testClassPathOrderIsHonored(logger, resKeyNormal, cp12, pathPrefixNormal);
- testClassPathOrderIsHonored(logger, resKeyReroot, cp12, pathPrefixReroot);
- testClassPathOrderIsHonored(logger, resKeyNormal, cp21, pathPrefixNormal);
- testClassPathOrderIsHonored(logger, resKeyReroot, cp21, pathPrefixReroot);
+ testResourceInCPE(logger, resKeyNormal, cpe1jar, cp12, pathPrefixNormal);
+ testResourceInCPE(logger, resKeyReroot, cpe1jar, cp12, pathPrefixReroot);
+ testResourceInCPE(logger, resKeyNormal, cpe2jar, cp21, pathPrefixNormal);
+ testResourceInCPE(logger, resKeyReroot, cpe2jar, cp21, pathPrefixReroot);
}
public void testNoClassPathEntries() {
@@ -182,9 +182,7 @@
ClassPathEntry[] cp12 = new ClassPathEntry[] {cpe1jar, cpe2jar};
ClassPathEntry[] cp21 = new ClassPathEntry[] {cpe2jar, cpe1jar};
- String barKeyNormal = "org/example/bar/client/BarClient1.txt";
String keyReroot = "/BarClient1.txt";
- String fooKeyNormal = "org/example/foo/client/BarClient1.txt";
PathPrefix pathPrefix1Reroot = new PathPrefix("org/example/bar/client",
null, true);
@@ -203,20 +201,20 @@
* the keyReroot resource in cpe2 wins because pathPrefix2Reroot comes
* later.
*/
- testPathPrefixOrderPreferredOverClasspath(logger, keyReroot, cp12,
- pps12Reroot, 1);
+ testResourceInCPE(logger, keyReroot, cpe2jar, cp12, pathPrefix1Reroot,
+ pathPrefix2Reroot);
// order of specifying classpath is reversed, it still matches cpe2
- testPathPrefixOrderPreferredOverClasspath(logger, keyReroot, cp21,
- pps12Reroot, 0);
+ testResourceInCPE(logger, keyReroot, cpe2jar, cp21, pathPrefix1Reroot,
+ pathPrefix2Reroot);
/*
* the keyReroot resource in cpe2 wins because pathPrefix2Reroot comes
* later.
*/
- testPathPrefixOrderPreferredOverClasspath(logger, keyReroot, cp12,
- pps21Reroot, 0);
+ testResourceInCPE(logger, keyReroot, cpe1jar, cp12, pathPrefix2Reroot,
+ pathPrefix1Reroot);
// order of specifying classpath is reversed, it still matches cpe1
- testPathPrefixOrderPreferredOverClasspath(logger, keyReroot, cp21,
- pps21Reroot, 1);
+ testResourceInCPE(logger, keyReroot, cpe1jar, cp21, pathPrefix2Reroot,
+ pathPrefix1Reroot);
}
/**
@@ -329,7 +327,7 @@
oracle.setPathPrefixes(pps);
return oracle;
}
-
+
private ResourceOracleSnapshot refreshAndSnapshot(TreeLogger logger,
ResourceOracleImpl oracle) {
oracle.refresh(logger);
@@ -340,23 +338,17 @@
return snapshot1;
}
- private void testClassPathOrderIsHonored(TreeLogger logger,
- String resourceKey, ClassPathEntry[] classPath, PathPrefix pathPrefix) {
+ private void testResourceInCPE(TreeLogger logger, String resourceKey,
+ ClassPathEntry expectedCPE, ClassPathEntry[] classPath,
+ PathPrefix... pathPrefixes) {
+ ResourceOracleImpl oracle = new ResourceOracleImpl(Arrays.asList(classPath));
PathPrefixSet pps = new PathPrefixSet();
- pps.add(pathPrefix);
- ResourceOracleImpl oracle = new ResourceOracleImpl(Arrays.asList(classPath));
+ for (PathPrefix pathPrefix : pathPrefixes) {
+ pps.add(pathPrefix);
+ }
oracle.setPathPrefixes(pps);
ResourceOracleSnapshot s = refreshAndSnapshot(logger, oracle);
- s.assertPathIncluded(resourceKey, classPath[0]);
- }
-
- private void testPathPrefixOrderPreferredOverClasspath(TreeLogger logger,
- String resourceKey, ClassPathEntry[] classPath, PathPrefixSet pps,
- int index) {
- ResourceOracleImpl oracle = new ResourceOracleImpl(Arrays.asList(classPath));
- oracle.setPathPrefixes(pps);
- ResourceOracleSnapshot s = refreshAndSnapshot(logger, oracle);
- s.assertPathIncluded(resourceKey, classPath[index]);
+ s.assertPathIncluded(resourceKey, expectedCPE);
}
private void testReadingResource(ClassPathEntry cpe1, ClassPathEntry cpe2)
