flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject git commit: [flex-falcon] [refs/heads/develop] - - Continued making the Unit-Tests use the TestAdapters
Date Tue, 12 Apr 2016 08:42:31 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop 17a315a36 -> 913814690


- Continued making the Unit-Tests use the TestAdapters


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/91381469
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/91381469
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/91381469

Branch: refs/heads/develop
Commit: 91381469077ee8abbb61f77c012590d50904bdcf
Parents: 17a315a
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Tue Apr 12 10:42:24 2016 +0200
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Tue Apr 12 10:42:24 2016 +0200

----------------------------------------------------------------------
 .../flex/compiler/internal/test/ASTestBase.java       | 14 ++++++++------
 .../apache/flex/compiler/internal/test/TestBase.java  |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/91381469/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java
b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java
index 8cb7b11..a5dbc93 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java
@@ -36,17 +36,23 @@ import org.apache.flex.compiler.tree.as.INamespaceAccessExpressionNode;
 import org.apache.flex.compiler.tree.as.IUnaryOperatorNode;
 import org.apache.flex.compiler.tree.as.IVariableNode;
 import org.apache.flex.utils.FilenameNormalization;
+import org.apache.flex.utils.ITestAdapter;
+import org.apache.flex.utils.TestAdapterFactory;
 import org.junit.Ignore;
 
 @Ignore
 public class ASTestBase extends TestBase
 {
 
+    protected ITestAdapter testAdapter;
+
     @Override
     public void setUp()
     {
         super.setUp();
 
+        testAdapter = TestAdapterFactory.getTestAdapter();
+
         asEmitter = backend.createEmitter(writer);
         asBlockWalker = backend.createWalker(project, errors, asEmitter);
     }
@@ -54,12 +60,8 @@ public class ASTestBase extends TestBase
     @Override
     protected void addLibraries(List<File> libraries)
     {
-        libraries.add(new File(FilenameNormalization.normalize(env.FPSDK
-                + "/" + env.FPVER + "/playerglobal.swc")));
-//        libraries.add(new File(FilenameNormalization.normalize(env.SDK
-//                + "/frameworks/libs/framework.swc")));
-//        libraries.add(new File(FilenameNormalization.normalize(env.SDK
-//                + "/frameworks/libs/spark.swc")));
+        libraries.addAll(testAdapter.getLibraries(false));
+        // TODO: Make this use the test-adapter
         libraries.add(new File(FilenameNormalization.normalize(
                 "../externs/GCL/out/bin/GCL.swc")));
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/91381469/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java
index d8d6e36..64a73f7 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java
@@ -221,7 +221,7 @@ public class TestBase implements ITestBase
             String inputDir, boolean useTempFile)
     {
         File tempFile = (useTempFile) ? writeCodeToTempFile(input, isFileName, inputDir)
:
-                new File(inputDir + "/" + input + inputFileExtension);
+                new File(inputDir + File.separator + input + inputFileExtension);
 
         addDependencies();
 


Mime
View raw message