| commit | 7137de6b19cd11630ee1ef29f7a9164166e35b10 | [log] [tgz] |
|---|---|---|
| author | Alex Harui <aharui@apache.org> | Mon Apr 24 00:17:35 2017 -0700 |
| committer | Alex Harui <aharui@apache.org> | Mon Apr 24 00:17:35 2017 -0700 |
| tree | 8cbec6c1516798d923ed8f53c980a779fc089a97 | |
| parent | 3f9ed83de08907a52392044be78ad324287c6662 [diff] |
hashmaps iterate in different orders on different Java versions, so sort the list so tests will ass
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java index 5c9c91c..0f1d0cd 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/PackageHeaderEmitter.java
@@ -154,8 +154,14 @@ HashMap<String, String> internalClasses = getEmitter().getModel().getInternalClasses(); if (internalClasses.size() > 0) { + ArrayList<String> classesInOrder = new ArrayList<String>(); for (String internalClass : internalClasses.keySet()) { + classesInOrder.add(internalClass); + } + Collections.sort(classesInOrder); + for (String internalClass : classesInOrder) + { /* goog.provide('x');\n\n */ write(JSGoogEmitterTokens.GOOG_PROVIDE); write(ASEmitterTokens.PAREN_OPEN);
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java index 01932d0..f9afc81 100644 --- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java +++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSPackage.java
@@ -1000,8 +1000,8 @@ " */\n" + "\n" + "goog.provide('foo.bar.baz.A');\n" + - "goog.provide('foo.bar.baz.A.InternalClass');\n" + "goog.provide('foo.bar.baz.A.ITestInterface');\n" + + "goog.provide('foo.bar.baz.A.InternalClass');\n" + "\n" + "\n" + "\n" +