Fixes 984 and 992

cruise.umple/src/UmpleInternalParser_CodeClass.ump

@@ -1567,9 +1567,7 @@ private Boolean checkIsDistributed(UmpleInterface uInterface)
       }
     }
     for(UmpleClass uClass: getModel().getUmpleClasses()) {
-      for (UmpleInterface uInterface : getAllParentInterface(uClass)) {
-        addImplementedMethodsFromInterface(uInterface, uClass);
-      }
+        addImplementedMethodsFromInterface(getAllParentInterface(uClass), uClass);
     }
   }  
 
@@ -1593,20 +1591,36 @@ private Boolean checkIsDistributed(UmpleInterface uInterface)
     return temp;
   }
 
-  private void addImplementedMethodsFromInterface(UmpleInterface parentInterface, UmpleClass uClass)
+  private void addImplementedMethodsFromInterface(List<UmpleInterface> parentInterfaces, UmpleClass uClass)
   {
     //GET AND SET METHODS CHECK?
-    if (parentInterface.hasMethods())
+    // Fix issue 992
+    List<UmpleInterface> ancestorInterfaces = new Vector<UmpleInterface>();
+    Stack<UmpleInterface> toProcess = new Stack<UmpleInterface>();
+    toProcess.addAll(parentInterfaces);
+    ancestorInterfaces.addAll(parentInterfaces);
+
+    while(!toProcess.isEmpty())
     {
-      for (Method aMethod : parentInterface.getMethods())
+    	parentInterfaces  = toProcess.pop().getExtendsInterface();
+    	toProcess.addAll(parentInterfaces);
+    	ancestorInterfaces.addAll(parentInterfaces);
+    }
+
+    for (UmpleInterface pi : ancestorInterfaces)
+    {
+      if (pi.hasMethods())
       {
-        boolean shouldAddMethod = verifyIfMethodIsConstructorOrGetSet(uClass, aMethod, true);
-        if (!(uClass.hasImplementedMethodIncludingWithinParentClasses(aMethod))
-        && !(uClass.hasMethodInTraits(aMethod)) && !(uClass.isIsAbstract()) && shouldAddMethod)
+        for (Method aMethod : pi.getMethods())
         {
-          aMethod.setIsImplemented("".equals(aMethod.getMethodBody().getExtraCode("")));
-          aMethod.setSource(Method.Source.fAuto);
-          uClass.addMethod(aMethod);
+          boolean shouldAddMethod = verifyIfMethodIsConstructorOrGetSet(uClass, aMethod, true);
+          if (!(uClass.hasImplementedMethodIncludingWithinParentClasses(aMethod))
+          && !(uClass.hasMethodInTraits(aMethod)) && !(uClass.isIsAbstract()) && shouldAddMethod)
+          {
+            aMethod.setIsImplemented("".equals(aMethod.getMethodBody().getExtraCode("")));
+            aMethod.setSource(Method.Source.fAuto);
+            uClass.addMethod(aMethod);
+          }
         }
       }
     }

cruise.umple/src/util/SampleFileWriter_Code.ump

@@ -180,18 +180,23 @@ class SampleFileWriter
       String actualLine = null;
 
       int line = 0;
-      do 
+    do 
       {
         actualLine = actualReader.readLine();
+        expectedLine = expectedReader.readLine();
         if (ignoreLineComments)
         {
           // HACK: To deal with // line # comments
           while (actualLine != null && actualLine.indexOf("// line") != -1)
           { //Ignore the line, go to next
             actualLine = actualReader.readLine();
           }
-        }
-        expectedLine = expectedReader.readLine();
+
+          while (expectedLine != null && expectedLine.indexOf("// line") != -1)
+          { 
+        	  expectedLine = expectedReader.readLine();
+          }
+        } 
 
         line++;
 
@@ -202,6 +207,11 @@ class SampleFileWriter
         }
       } 
       while (expectedLine != null && actualLine != null);
+
+      if(expectedLine == null && line == 1)
+      {
+      	Assert.fail(("Expected output file is empty."));
+      }
     }
     catch (Exception e)
     {

cruise.umple/test/cruise/umple/implementation/InterfaceTemplateTest.ump

@@ -40,4 +40,8 @@ interface IFirstChild{
 
 interface ISecondChild{
 	isA ISomething, IGarbage;
+}
+
+class A{
+	isA ISecondChild;
 }

cruise.umple/test/cruise/umple/implementation/InterfaceTemplateTest2.ump

@@ -0,0 +1,51 @@
+namespace example;
+
+interface ISomething
+{
+  constant String aVariable = aValue;
+  constant Integer MAX = 3;
+
+  String getCode (String[] aParam, Integer anotherParam);
+  String isValid();
+}
+
+interface IGarbage
+{
+}
+
+interface ICodeTranslator
+{
+   String translate(String id, Attribute attribute);
+   String translate(String id, AssociationVariable associationVariable);
+}
+
+class CodeTranslator
+{
+  isA ICodeTranslator;
+}
+
+class Something
+{
+  isA ISomething;
+}
+
+class Garbage
+{
+  isA ISomething, IGarbage;
+}
+
+interface IFirstChild{
+	isA ISomething;
+}
+
+interface ISecondChild{
+	isA ISomething, IGarbage;
+}
+
+class A{
+	isA ISecondChild;
+}
+
+class B{
+	isA A;
+}

cruise.umple/test/cruise/umple/implementation/InterfaceTemplateTest3.ump

@@ -0,0 +1,16 @@
+namespace example;
+
+interface I{
+  void test();
+}
+interface I2{
+  isA I;
+  void test2();
+}
+interface I3{
+  isA I2;
+  void test3();
+}
+class A{
+  isA I3;
+}

cruise.umple/test/cruise/umple/implementation/alloy/AlloyTemplateTest.java

@@ -47,14 +47,7 @@ public void tearDown()
 	    SampleFileWriter.destroy(pathToInput + "/alloy/ExampleFile.als");
 	    SampleFileWriter.destroy(pathToInput + "/alloy/BankingSystem.als");
 	  }
-
-	  @Test //@Ignore
-	  public void ExampleFile()
-	  {
-		assertUmpleTemplateFor("alloy/ExampleFile.ump","alloy/ExampleFile.alloy.txt");
-		Assert.assertEquals(true, (new File(pathToInput + "/alloy/ExampleFile.als")).exists());
-	  }
-
+
 	  @Test //@Ignore
 	  public void BankingSystem()
 	  {