@@ -1,7 +1,7 @@

 Package: flowWorkspace

 Type: Package

 Title: Infrastructure for representing and interacting with the gated cytometry

-Version: 3.27.24

+Version: 3.27.25

 Date: 2011-06-10

 Author: Greg Finak, Mike Jiang

 Maintainer: Greg Finak <gfinak@fhcrc.org>,Mike Jiang <wjiang2@fhcrc.org>

@@ -209,11 +209,12 @@ test_that("keyword",{

       #skip flowCore_R keys due to the historical archived results do not have this info up to date

       thisRes <- thisRes[!grepl("(flowCore_\\$P)|(transformation)",names(thisRes))]

       expectRes <- expectRes[!grepl("(flowCore_\\$P)|(transformation)",names(expectRes))]

+      #fix legacy result

+      expectRes[paste0("$P",5:11, "N")] <- paste0("<", expectRes[paste0("$P",5:11, "N")], ">")

       expect_equal(thisRes, expectRes)

-      

       expect_equal(keyword(gh, 'P11DISPLAY'), "LOG")

-      expect_equal(keyword(gh, '$P8N'), "V450-A")

+      expect_equal(keyword(gh, '$P8N'), "<V450-A>")

     })

 test_that("getParent",{

@@ -318,7 +318,12 @@ test_that("keyword",{

             thisResult[["ORIGINALGUID"]] <-thisResult[["GUID"]] <- basename(thisResult[["FILENAME"]])

             #skip flowCore_R keys due to the historical archived results do not have this info up to date

             ind <- !grepl("(flowCore_\\$P)|(transformation)",names(thisResult))

-            thisResult[ind]

+            thisResult <- thisResult[ind]

+            

+            #fix legacy result

+            if(!islegacyArchivedGS)

+              thisResult[paste0("$P",5:11, "N")] <- paste0("<", thisResult[paste0("$P",5:11, "N")], ">")

+            thisResult

           })

       thisRes <- lapply(thisRes, function(thisResult){

             thisResult[["FILENAME"]] <- basename(thisResult[["FILENAME"]])

@@ -326,7 +331,6 @@ test_that("keyword",{

             ind <- !grepl("(flowCore_\\$P)|(transformation)",names(thisResult))

             thisResult[ind]

           })

-       

       expect_equal(thisRes,expectRes)

       thisRes <- keyword(gs, "$P1N")

@@ -2,7 +2,6 @@ context("GatingSet archive")

 gs <- NULL

 isCpStaticGate <<- TRUE

-

 test_that("load GatingSet from archive",

 {

   suppressWarnings(suppressMessages(gs <<- load_gs(list.files(dataDir, pattern = "gs_manual",full = TRUE))))

@@ -100,6 +99,7 @@ test_that("formatAxis",{

     })

+islegacyArchivedGS <<- TRUE

 source("GatingSetList-testSuite.R", local = TRUE)

@@ -134,6 +134,7 @@ test_that("Construct new GatingSet based on the existing gating hierarchy",

      expect_that(gs, is_a("GatingSet"))

    })

 isCpStaticGate <<- TRUE

+islegacyArchivedGS <<- FALSE

 source("GatingSet-testSuite.R", local = TRUE)

 gh <- NULL

@@ -137,6 +137,7 @@ test_that("getTransformations ",{

     })

 isCpStaticGate <<- TRUE

+islegacyArchivedGS <<- FALSE

 source("GatingHierarchy-testSuite.R", local = TRUE)

 source("GatingSet-testSuite.R", local = TRUE)