#58: fixed failing tests

pongasoft · Jul 15, 2013 · 57ebe4d · 57ebe4d
1 parent dbe8bec
commit 57ebe4d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/...vy/org/pongasoft/glu/provisioner/core/metamodel/impl/ZooKeeperClusterMetaModelImpl.groovy b/...vy/org/pongasoft/glu/provisioner/core/metamodel/impl/ZooKeeperClusterMetaModelImpl.groovy
@@ -50,7 +50,6 @@ public class ZooKeeperClusterMetaModelImpl implements ZooKeeperClusterMetaModel
   {
     def res = [
       name: name,
-      fabrics: fabrics.keySet().collect { it },
       zooKeepers: zooKeepers.collect { it.toExternalRepresentation() }
     ]
 

diff --git a/...glu.provisioner-core/src/test/groovy/test/provisioner/core/metamodel/TestMetaModel.groovy b/...glu.provisioner-core/src/test/groovy/test/provisioner/core/metamodel/TestMetaModel.groovy
@@ -17,6 +17,8 @@
 package test.provisioner.core.metamodel
 
 import org.linkedin.util.io.ram.RAMDirectory
+import org.linkedin.util.io.resource.FileResource
+import org.linkedin.util.io.resource.Resource
 import org.pongasoft.glu.provisioner.core.metamodel.AgentMetaModel
 import org.pongasoft.glu.provisioner.core.metamodel.ConsoleMetaModel
 import org.pongasoft.glu.provisioner.core.metamodel.GluMetaModel
@@ -106,7 +108,7 @@ public class TestMetaModel extends GroovyTestCase
    */
   public void testTutorialGluMetaModel()
   {
-    def model = new File("../../packaging/org.linkedin.glu.packaging-all/src/cmdline/resources/models/tutorial/glu-meta-model.json.groovy").text
+    def model = FileResource.create("../../packaging/org.linkedin.glu.packaging-all/src/cmdline/resources/models/tutorial/glu-meta-model.json.groovy")
 
     def expectedModel = """
 {
@@ -457,13 +459,18 @@ public class TestMetaModel extends GroovyTestCase
     checkJson(model, expectedModel)
   }
 
+  private GluMetaModel checkJson(Resource model, String expectedModel)
+  {
+    JsonMetaModelSerializerImpl serializer = new JsonMetaModelSerializerImpl()
+    def metaModel = serializer.deserialize([model])
+    assertEquals((expectedModel ?: model.file.text).trim(), serializer.serialize(metaModel, true))
+    return metaModel
+  }
+
   private GluMetaModel checkJson(String model, String expectedModel)
   {
     RAMDirectory ram = new RAMDirectory()
     ram.add('model', model)
-    JsonMetaModelSerializerImpl serializer = new JsonMetaModelSerializerImpl()
-    def metaModel = serializer.deserialize([ram.toResource().createRelative('/model')])
-    assertEquals((expectedModel ?: model).trim(), serializer.serialize(metaModel, true))
-    return metaModel
+    checkJson(ram.toResource().createRelative('/model'), expectedModel)
   }
 }