From 9054c76f9be677eff1b081764a642a54c5428e35 Mon Sep 17 00:00:00 2001
From: Jeremy Nguyen Xuan <jnguyenxuan@lbl.gov>
Date: Tue, 12 Apr 2016 13:04:53 -0700
Subject: [PATCH] setting all the properties

---
 .../org/phenopackets/pxftools/PhenoPacketGenerator.scala    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/scala/org/phenopackets/pxftools/PhenoPacketGenerator.scala b/src/test/scala/org/phenopackets/pxftools/PhenoPacketGenerator.scala
index 12a35d3..7981c84 100644
--- a/src/test/scala/org/phenopackets/pxftools/PhenoPacketGenerator.scala
+++ b/src/test/scala/org/phenopackets/pxftools/PhenoPacketGenerator.scala
@@ -194,11 +194,11 @@ object PhenoPacketGenerator {
       val builder = new PhenoPacket.Builder()
       builder.title(title)
       builder.addDisease(disease)
-      //builder.addDiseaseOccurrenceAssociation(diseaseOccurrenceAssociation) // TODO merge fails with this property set
-      //builder.addEnvironmentAssociation(environmentAssociation) // TODO merge fails with this property set
+      builder.addDiseaseOccurrenceAssociation(diseaseOccurrenceAssociation)
+      builder.addEnvironmentAssociation(environmentAssociation)
       builder.addOrganism(organism)
       builder.addPerson(person)
-      //builder.addPhenotypeAssociation(phenotypeAssociation)
+      builder.addPhenotypeAssociation(phenotypeAssociation)
       builder.addVariant(variant)
       builder.build()
     }