commit 62e099314bb1831035083a50616024ffa6253bde
author Jean-Luc Brouillet <jeanluc@google.com> Sun Mar 22 11:14:07 2015 -0700
committer Jean-Luc Brouillet <jeanluc@google.com> Sun Mar 22 11:14:07 2015 -0700
tree 0dd993f69f2b87983477b247cbb025d92d05beb2
parent 876cc6f86de3fc4f55cd99579ea6561ac0ea1f43

Shorten the generated test file names.

Also place the generated files in their own directories.

Change-Id: I51c1acf15810ec199d17cc2d6e63adebdc0fc3c9

api/GenerateTestFiles.cpp

diff --git a/api/GenerateTestFiles.cpp b/api/GenerateTestFiles.cpp
index 7cf1099..f70c444 100644
--- a/api/GenerateTestFiles.cpp
+++ b/api/GenerateTestFiles.cpp
@@ -894,10 +894,10 @@
 }
 
 // Open the mJavaFile and writes the header.
-static bool startJavaFile(GeneratedFile* file, const Function& function, const string& testName,
-                          const string& relaxedTestName) {
+static bool startJavaFile(GeneratedFile* file, const Function& function, const string& directory,
+                          const string& testName, const string& relaxedTestName) {
     const string fileName = testName + ".java";
-    if (!file->start(fileName)) {
+    if (!file->start(directory, fileName)) {
         return false;
     }
     file->writeNotices();
@@ -942,9 +942,10 @@
 }
 
 // Open the script file and write its header.
-static bool startRsFile(GeneratedFile* file, const Function& function, const string& testName) {
+static bool startRsFile(GeneratedFile* file, const Function& function, const string& directory,
+                        const string& testName) {
     string fileName = testName + ".rs";
-    if (!file->start(fileName)) {
+    if (!file->start(directory, fileName)) {
         return false;
     }
     file->writeNotices();
@@ -955,12 +956,12 @@
 }
 
 // Write the entire *Relaxed.rs test file, as it only depends on the name.
-static bool writeRelaxedRsFile(const Function& function, const string& testName,
-                               const string& relaxedTestName) {
+static bool writeRelaxedRsFile(const Function& function, const string& directory,
+                               const string& testName, const string& relaxedTestName) {
     string name = relaxedTestName + ".rs";
 
     GeneratedFile file;
-    if (!file.start(name)) {
+    if (!file.start(directory, name)) {
         return false;
     }
     file.writeNotices();
@@ -974,26 +975,27 @@
 /* Write the .java and the two .rs test files.  versionOfTestFiles is used to restrict which API
  * to test.
  */
-static bool writeTestFilesForFunction(const Function& function, int versionOfTestFiles) {
+static bool writeTestFilesForFunction(const Function& function, const string& directory,
+                                      int versionOfTestFiles) {
     // Avoid creating empty files if we're not testing this function.
     if (!needTestFiles(function, versionOfTestFiles)) {
         return true;
     }
 
-    const string testName = "GeneratedTest" + function.getCapitalizedName();
+    const string testName = "Test" + function.getCapitalizedName();
     const string relaxedTestName = testName + "Relaxed";
 
-    if (!writeRelaxedRsFile(function, testName, relaxedTestName)) {
+    if (!writeRelaxedRsFile(function, directory, testName, relaxedTestName)) {
         return false;
     }
 
     GeneratedFile rsFile;    // The Renderscript test file we're generating.
     GeneratedFile javaFile;  // The Jave test file we're generating.
-    if (!startRsFile(&rsFile, function, testName)) {
+    if (!startRsFile(&rsFile, function, directory, testName)) {
         return false;
     }
 
-    if (!startJavaFile(&javaFile, function, testName, relaxedTestName)) {
+    if (!startJavaFile(&javaFile, function, directory, testName, relaxedTestName)) {
         return false;
     }
 
@@ -1026,11 +1028,11 @@
     return true;
 }
 
-bool GenerateTestFiles(int versionOfTestFiles) {
+bool GenerateTestFiles(const string& directory, int versionOfTestFiles) {
     bool success = true;
     for (auto specFile : systemSpecification.getSpecFiles()) {
         for (auto f : specFile->getFunctionsMap()) {
-            if (!writeTestFilesForFunction(*f.second, versionOfTestFiles)) {
+            if (!writeTestFilesForFunction(*f.second, directory, versionOfTestFiles)) {
                 success = false;
             }
         }