From e1871ab530b7ab4b11acdf66260aeeb5be889efc Mon Sep 17 00:00:00 2001
From: Regis Blanc <regwblanc@gmail.com>
Date: Wed, 3 Feb 2016 18:59:22 +0100
Subject: [PATCH] adapt tests to new array features

---
 .../resources/regression/xlang/error/Array2.scala  | 11 -----------
 .../resources/regression/xlang/error/Array3.scala  | 14 --------------
 .../resources/regression/xlang/error/Array4.scala  | 10 ----------
 .../resources/regression/xlang/error/Array5.scala  | 12 ------------
 .../resources/regression/xlang/error/Array6.scala  | 12 ------------
 .../resources/regression/xlang/error/Array7.scala  | 11 -----------
 .../error/{Array8.scala => ArrayAliasing6.scala}   |  2 +-
 .../regression/xlang/error/ArrayAliasing7.scala    | 10 ++++++++++
 .../error/{Array9.scala => ArrayAliasing8.scala}   |  2 +-
 .../error/{Array10.scala => ArrayAliasing9.scala}  |  2 +-
 10 files changed, 13 insertions(+), 73 deletions(-)
 delete mode 100644 src/test/resources/regression/xlang/error/Array2.scala
 delete mode 100644 src/test/resources/regression/xlang/error/Array3.scala
 delete mode 100644 src/test/resources/regression/xlang/error/Array4.scala
 delete mode 100644 src/test/resources/regression/xlang/error/Array5.scala
 delete mode 100644 src/test/resources/regression/xlang/error/Array6.scala
 delete mode 100644 src/test/resources/regression/xlang/error/Array7.scala
 rename src/test/resources/regression/xlang/error/{Array8.scala => ArrayAliasing6.scala} (80%)
 create mode 100644 src/test/resources/regression/xlang/error/ArrayAliasing7.scala
 rename src/test/resources/regression/xlang/error/{Array9.scala => ArrayAliasing8.scala} (86%)
 rename src/test/resources/regression/xlang/error/{Array10.scala => ArrayAliasing9.scala} (87%)

diff --git a/src/test/resources/regression/xlang/error/Array2.scala b/src/test/resources/regression/xlang/error/Array2.scala
deleted file mode 100644
index b1b370395..000000000
--- a/src/test/resources/regression/xlang/error/Array2.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
-
-object Array2 {
-
-  def foo(): Int = {
-    val a = Array.fill(5)(5)
-    val b = a
-    b(3)
-  }
-
-}
diff --git a/src/test/resources/regression/xlang/error/Array3.scala b/src/test/resources/regression/xlang/error/Array3.scala
deleted file mode 100644
index 14a851201..000000000
--- a/src/test/resources/regression/xlang/error/Array3.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
-
-object Array3 {
-
-  def foo(): Int = {
-    val a = Array.fill(5)(5)
-    if(a.length > 2)
-      a(1) = 2
-    else 
-      0
-    0
-  }
-
-}
diff --git a/src/test/resources/regression/xlang/error/Array4.scala b/src/test/resources/regression/xlang/error/Array4.scala
deleted file mode 100644
index e41535d6d..000000000
--- a/src/test/resources/regression/xlang/error/Array4.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
-
-object Array4 {
-
-  def foo(a: Array[Int]): Int = {
-    val b = a
-    b(3)
-  }
-
-}
diff --git a/src/test/resources/regression/xlang/error/Array5.scala b/src/test/resources/regression/xlang/error/Array5.scala
deleted file mode 100644
index 8b7254e94..000000000
--- a/src/test/resources/regression/xlang/error/Array5.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
-
-object Array5 {
-
-  def foo(a: Array[Int]): Int = {
-    a(2) = 4
-    a(2)
-  }
-
-}
-
-// vim: set ts=4 sw=4 et:
diff --git a/src/test/resources/regression/xlang/error/Array6.scala b/src/test/resources/regression/xlang/error/Array6.scala
deleted file mode 100644
index c4d0c0954..000000000
--- a/src/test/resources/regression/xlang/error/Array6.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
-
-
-object Array6 {
-
-  def foo(): Int = {
-    val a = Array.fill(5)(5)
-    var b = a
-    b(0)
-  }
-
-}
diff --git a/src/test/resources/regression/xlang/error/Array7.scala b/src/test/resources/regression/xlang/error/Array7.scala
deleted file mode 100644
index ab6f4c20d..000000000
--- a/src/test/resources/regression/xlang/error/Array7.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
-
-object Array7 {
-
-  def foo(): Int = {
-    val a = Array.fill(5)(5)
-    var b = a
-    b(0)
-  }
-
-}
diff --git a/src/test/resources/regression/xlang/error/Array8.scala b/src/test/resources/regression/xlang/error/ArrayAliasing6.scala
similarity index 80%
rename from src/test/resources/regression/xlang/error/Array8.scala
rename to src/test/resources/regression/xlang/error/ArrayAliasing6.scala
index bbe5bd5fd..963a134bf 100644
--- a/src/test/resources/regression/xlang/error/Array8.scala
+++ b/src/test/resources/regression/xlang/error/ArrayAliasing6.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-object Array8 {
+object ArrayAliasing6 {
 
   def foo(a: Array[Int]): Array[Int] = {
     a
diff --git a/src/test/resources/regression/xlang/error/ArrayAliasing7.scala b/src/test/resources/regression/xlang/error/ArrayAliasing7.scala
new file mode 100644
index 000000000..21bc94502
--- /dev/null
+++ b/src/test/resources/regression/xlang/error/ArrayAliasing7.scala
@@ -0,0 +1,10 @@
+/* Copyright 2009-2015 EPFL, Lausanne */
+
+object ArrayAliasing7 {
+
+  def foo(a: Array[Int]): Array[Int] = {
+    val b = a
+    b
+  }
+
+}
diff --git a/src/test/resources/regression/xlang/error/Array9.scala b/src/test/resources/regression/xlang/error/ArrayAliasing8.scala
similarity index 86%
rename from src/test/resources/regression/xlang/error/Array9.scala
rename to src/test/resources/regression/xlang/error/ArrayAliasing8.scala
index fbc7dd737..e7c27cc9c 100644
--- a/src/test/resources/regression/xlang/error/Array9.scala
+++ b/src/test/resources/regression/xlang/error/ArrayAliasing8.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-object Array9 {
+object ArrayAliasing8 {
 
   def foo(a: Array[Int]): Int = {
     def rec(): Array[Int] = {
diff --git a/src/test/resources/regression/xlang/error/Array10.scala b/src/test/resources/regression/xlang/error/ArrayAliasing9.scala
similarity index 87%
rename from src/test/resources/regression/xlang/error/Array10.scala
rename to src/test/resources/regression/xlang/error/ArrayAliasing9.scala
index 563cdacdf..c84d29c3f 100644
--- a/src/test/resources/regression/xlang/error/Array10.scala
+++ b/src/test/resources/regression/xlang/error/ArrayAliasing9.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-object Array10 {
+object ArrayAliasing9 {
 
   def foo(): Int = {
     val a = Array.fill(5)(0)
-- 
GitLab