Merge pull request #122 from ponder-lab/210-missing-cases-for-importi…

…ng-scripts-from-package-initialization-code

Add tests for wala#210.

com.ibm.wala.cast.python.ml.test/source/com/ibm/wala/cast/python/ml/test/TestTensorflow2Model.java

@@ -2865,6 +2865,76 @@ public void testModule69()
         new int[] {2});
   }
 
+  /** Test https://github.com/wala/ML/issues/210. */
+  @Test(expected = AssertionError.class)
+  public void testModule70()
+      throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
+    test(
+        new String[] {"proj65/src/__init__.py", "proj65/src/module.py", "proj65/client.py"},
+        "src/module.py",
+        "f",
+        "proj65",
+        1,
+        1,
+        new int[] {2});
+  }
+
+  /** Test https://github.com/wala/ML/issues/210. */
+  @Test(expected = AssertionError.class)
+  public void testModule71()
+      throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
+    test(
+        new String[] {"proj67/src/__init__.py", "proj67/src/module.py", "proj67/client.py"},
+        "src/module.py",
+        "f",
+        "proj67",
+        1,
+        1,
+        new int[] {2});
+  }
+
+  /** Test https://github.com/wala/ML/issues/210. */
+  @Test
+  public void testModule72()
+      throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
+    test(
+        new String[] {"proj68/src/__init__.py", "proj68/src/module.py", "proj68/client.py"},
+        "src/module.py",
+        "f",
+        "proj68",
+        1,
+        1,
+        new int[] {2});
+  }
+
+  /** Test https://github.com/wala/ML/issues/210. */
+  @Test
+  public void testModule73()
+      throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
+    test(
+        new String[] {"proj69/src/__init__.py", "proj69/src/module.py", "proj69/client.py"},
+        "src/module.py",
+        "f",
+        "proj69",
+        1,
+        1,
+        new int[] {2});
+  }
+
+  /** Test https://github.com/wala/ML/issues/210. */
+  @Test
+  public void testModule74()
+      throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
+    test(
+        new String[] {"proj70/src/__init__.py", "proj70/src/module.py", "proj70/client.py"},
+        "src/module.py",
+        "f",
+        "proj70",
+        1,
+        1,
+        new int[] {2});
+  }
+
   @Test
   public void testStaticMethod() throws ClassHierarchyException, CancelException, IOException {
     test("tf2_test_static_method.py", "MyClass.the_static_method", 1, 1, 2);

com.ibm.wala.cast.python.test/.pydevproject

@@ -21,5 +21,10 @@
     <path>/${PROJECT_DIR_NAME}/data/proj55</path>
     <path>/${PROJECT_DIR_NAME}/data/proj56</path>
     <path>/${PROJECT_DIR_NAME}/data/proj66</path>
+    <path>/${PROJECT_DIR_NAME}/data/proj65</path>
+    <path>/${PROJECT_DIR_NAME}/data/proj67</path>
+    <path>/${PROJECT_DIR_NAME}/data/proj68</path>
+    <path>/${PROJECT_DIR_NAME}/data/proj69</path>
+    <path>/${PROJECT_DIR_NAME}/data/proj70</path>
   </pydev_pathproperty>
 </pydev_project>

com.ibm.wala.cast.python.test/data/proj65/client.py

@@ -0,0 +1,6 @@
+# Test https://github.com/wala/ML/issues/210.
+
+from tensorflow import ones
+import src
+
+src.f(ones([1, 2]))

com.ibm.wala.cast.python.test/data/proj65/src/__init__.py

@@ -0,0 +1 @@
+from .module import *

com.ibm.wala.cast.python.test/data/proj65/src/module.py

@@ -0,0 +1,7 @@
+# Test https://github.com/wala/ML/issues/210.
+
+import tensorflow as tf
+
+
+def f(a):
+    assert isinstance(a, tf.Tensor)

com.ibm.wala.cast.python.test/data/proj67/client.py

@@ -0,0 +1,6 @@
+# Test https://github.com/wala/ML/issues/210.
+
+from tensorflow import ones
+import src
+
+src.f(ones([1, 2]))

com.ibm.wala.cast.python.test/data/proj67/src/__init__.py

@@ -0,0 +1 @@
+from .module import f

com.ibm.wala.cast.python.test/data/proj67/src/module.py

@@ -0,0 +1,7 @@
+# Test https://github.com/wala/ML/issues/210.
+
+import tensorflow as tf
+
+
+def f(a):
+    assert isinstance(a, tf.Tensor)

com.ibm.wala.cast.python.test/data/proj68/client.py

@@ -0,0 +1,6 @@
+# Test https://github.com/wala/ML/issues/210.
+
+from tensorflow import ones
+from src import f
+
+f(ones([1, 2]))

com.ibm.wala.cast.python.test/data/proj68/src/__init__.py

@@ -0,0 +1 @@
+from .module import *

com.ibm.wala.cast.python.test/data/proj68/src/module.py

@@ -0,0 +1,7 @@
+# Test https://github.com/wala/ML/issues/210.
+
+import tensorflow as tf
+
+
+def f(a):
+    assert isinstance(a, tf.Tensor)

com.ibm.wala.cast.python.test/data/proj69/client.py

@@ -0,0 +1,6 @@
+# Test https://github.com/wala/ML/issues/210.
+
+from tensorflow import ones
+from src import f
+
+f(ones([1, 2]))

com.ibm.wala.cast.python.test/data/proj69/src/__init__.py

@@ -0,0 +1 @@
+from .module import f

com.ibm.wala.cast.python.test/data/proj69/src/module.py

@@ -0,0 +1,7 @@
+# Test https://github.com/wala/ML/issues/210.
+
+import tensorflow as tf
+
+
+def f(a):
+    assert isinstance(a, tf.Tensor)

com.ibm.wala.cast.python.test/data/proj70/client.py

@@ -0,0 +1,6 @@
+# Test https://github.com/wala/ML/issues/210.
+
+from tensorflow import ones
+import src.module
+
+src.module.f(ones([1, 2]))

com.ibm.wala.cast.python.test/data/proj70/src/__init__.py

@@ -0,0 +1 @@
+

com.ibm.wala.cast.python.test/data/proj70/src/module.py

@@ -0,0 +1,7 @@
+# Test https://github.com/wala/ML/issues/210.
+
+import tensorflow as tf
+
+
+def f(a):
+    assert isinstance(a, tf.Tensor)