SAK-31131 Update JUnit dependencies (sakaiproject#2448)

thakursir · May 4, 2016 · 15b0d28 · 15b0d28
1 parent 8da7549
commit 15b0d28
Show file tree

Hide file tree

Showing 105 changed files with 62 additions and 411 deletions.
diff --git a/basiclti/basiclti-common/pom.xml b/basiclti/basiclti-common/pom.xml
@@ -78,13 +78,6 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/basiclti/basiclti-impl/pom.xml b/basiclti/basiclti-impl/pom.xml
@@ -77,22 +77,6 @@
             <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
         </dependency>
-	<!--
-        <dependency>
-            <groupId>oracle.jdbc.driver.OracleDriver</groupId>
-            <artifactId>ojdbc6</artifactId>
-            <version>11.2.0.2.0</version>
-            <scope>test</scope>
-        </dependency>
-	-->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
     <build>
@@ -114,16 +98,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <!-- 
-                By default, the surefire plugin will automatically include 
-		    all test classes with the following wildcard patterns:
-                "**/Test*.java" - includes all of its subdirectory and all 
-		    java filenames that start with "Test".
-                "**/*Test.java" - includes all of its subdirectory and all 
-		    java filenames that end with "Test".
-                "**/*TestCase.java" - includes all of its subdirectory and 
-		    all java filenames that end with "TestCase".
-                    -->
           </plugin>
         </plugins>
     </build>

diff --git a/basiclti/pom.xml b/basiclti/pom.xml
@@ -167,13 +167,6 @@
                 <artifactId>profile2-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/basiclti/tsugi-util/pom-tsugi.xml b/basiclti/tsugi-util/pom-tsugi.xml
@@ -64,13 +64,6 @@
             <groupId>org.sakaiproject.kernel</groupId>
             <artifactId>sakai-component-manager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 

diff --git a/basiclti/tsugi-util/pom.xml b/basiclti/tsugi-util/pom.xml
@@ -48,13 +48,6 @@
             <groupId>org.sakaiproject.kernel</groupId>
             <artifactId>sakai-component-manager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/calendar/calendar-impl/impl/pom.xml b/calendar/calendar-impl/impl/pom.xml
@@ -110,12 +110,6 @@
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.9</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/cloud-content/impl/pom.xml b/cloud-content/impl/pom.xml
@@ -65,14 +65,6 @@
       <artifactId>aws-s3</artifactId>
       <version>${jclouds.version}</version>
     </dependency>
-
-    <!-- 3rd party dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.10</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/common/import-parsers/blackboard_5-5/pom.xml b/common/import-parsers/blackboard_5-5/pom.xml
@@ -23,39 +23,21 @@
 		<dependency>
 			<groupId>org.sakaiproject.common</groupId>
 			<artifactId>import-impl</artifactId>
-		<!--	<version>${sakai.version}</version> -->
 		</dependency>
-
 		<dependency>
 			<groupId>org.sakaiproject.common</groupId>
 			<artifactId>archive-api</artifactId>
-		<!--	<version>${sakai.version}</version> -->
 		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.1</version>
-		</dependency>
-	<!--	
-		<dependency>
-			<groupId>org.sakaiproject</groupId>
-			<artifactId>sakai-import-api</artifactId>
-			<version>${sakai.version}</version>
-		</dependency>
-	-->	
 		<dependency>
 			<groupId>jaxen</groupId>
 			<artifactId>jaxen</artifactId>
 			<version>1.0-FCS-full</version>
 		</dependency>
-
 		<dependency>
 			<groupId>saxpath</groupId>
 			<artifactId>saxpath</artifactId>
 			<version>1.0-FCS</version>
 		</dependency>
-
   </dependencies>
   <build>
     <resources>
@@ -69,6 +51,4 @@
     </resources>
 <!-- other resources for the jar - properties and xml files-->
   </build>
-
-
 </project>
diff --git a/common/import-parsers/blackboard_6/impl/pom.xml b/common/import-parsers/blackboard_6/impl/pom.xml
@@ -24,30 +24,10 @@
       <groupId>org.sakaiproject.common</groupId>
       <artifactId>import-impl</artifactId>
     </dependency>
-
                <dependency>
                         <groupId>org.sakaiproject.common</groupId>
                         <artifactId>archive-api</artifactId>
                 </dependency>
-<!--
-                <dependency>
-                        <groupId>org.sakaiproject</groupId>
-                        <artifactId>sakai-import-api</artifactId>
-                        <version>${sakai.version}</version>
-                </dependency>
-		<dependency>
-                        <groupId>org.sakaiproject</groupId>
-                        <artifactId>sakai-util</artifactId>
-                        <version>${sakai.version}</version>
-                </dependency>
- -->
-<!--
-                <dependency>
-                        <groupId>${sakai.spring.groupId}</groupId>
-                        <artifactId>${sakai.spring.artifactId}</artifactId>
-                        <version>${sakai.spring.version}</version>
-                </dependency>
--->             
                 <dependency>
 		  <groupId>org.sakaiproject.kernel</groupId>
 		  <artifactId>sakai-kernel-util</artifactId>
@@ -70,18 +50,11 @@
                         <artifactId>jaxen</artifactId>
                         <version>1.0-FCS-full</version>
                 </dependency>
-
                 <dependency>
                         <groupId>saxpath</groupId>
                         <artifactId>saxpath</artifactId>
                         <version>1.0-FCS</version>
                 </dependency>
-
-                <dependency>
-                        <groupId>junit</groupId>
-                        <artifactId>junit</artifactId>
-                        <version>3.8.1</version>
-                </dependency>
 	</dependencies>
   <build>
     <resources>
@@ -95,6 +68,4 @@
     </resources>
 <!-- other resources for the jar - properties and xml files-->
   </build>
-
-
 </project>
diff --git a/common/import-parsers/common-cartridge/pom.xml b/common/import-parsers/common-cartridge/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>common</artifactId>
     <groupId>org.sakaiproject.common</groupId>
-    <version>12-SNAPSHOT</version><!-- ProjectVersion -->
+    <version>12-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <name>Sakai Import Common Cartridge</name>
@@ -28,11 +28,6 @@
       <groupId>org.sakaiproject.common</groupId>
       <artifactId>archive-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-    </dependency>
     <dependency>
       <groupId>jaxen</groupId>
       <artifactId>jaxen</artifactId>
@@ -54,6 +49,7 @@
         </includes>
       </resource>
     </resources>
+    <testSourceDirectory>src/test/java</testSourceDirectory>
 <!-- other resources for the jar - properties and xml files-->
   </build>
 </project>
diff --git a/...ct/importer/impl/CommonCartridgeTest.java → ...ct/importer/impl/CommonCartridgeTest.java b/...ct/importer/impl/CommonCartridgeTest.java → ...ct/importer/impl/CommonCartridgeTest.java
@@ -28,35 +28,39 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
 import org.sakaiproject.importer.api.ImportDataSource;
 import org.sakaiproject.importer.api.ImportFileParser;
 import org.sakaiproject.importer.impl.importables.Assessment;
 import org.sakaiproject.importer.impl.importables.HtmlDocument;
 
-import junit.framework.TestCase;
+public class CommonCartridgeTest {
+	private static ImportFileParser parser = null;
+	private InputStream archiveStream = null;
 
-public class CommonCartridgeTest extends TestCase {
-	private static ImportFileParser parser;
-	private InputStream archiveStream;
-
+	@Before
 	public void setUp() {
-		System.out.println("doing setUp()");
 		try {
 			parser = new CommonCartridgeFileParser();
-			FileInputStream archiveStream = new FileInputStream(new File("/Users/zach/psychology.zip"));
-//			archiveData = new byte[archiveStream.available()];
-//			archiveStream.read(archiveData,0,archiveStream.available());
-//			archiveStream.close();
+			FileInputStream archiveStream = new FileInputStream(new File("psychology.zip"));
 		} catch (IOException e) {
-
+			e.printStackTrace();
 		}
 	}
+
+	@Ignore
+	@Test
 	public void testIsValidArchive() {
-		assertTrue(parser.isValidArchive(archiveStream));
+		Assert.assertTrue(parser.isValidArchive(archiveStream));
 	}
-
+
+	@Ignore
+	@Test
 	public void testCanGetQti() {
-		ImportDataSource ids = parser.parse(archiveStream, "/Users/zach/Desktop/psychology");
+		ImportDataSource ids = parser.parse(archiveStream, "psychology");
 		Collection importables = ids.getItemsForCategories(ids.getItemCategories());
 		int numberOfAssessments = 0;
 		int numberOfWebContent = 0;
@@ -72,7 +76,7 @@ public void testCanGetQti() {
 		System.out.println(importables.size() + " importables");
 		System.out.println(numberOfAssessments + " assessments");
 		System.out.println(numberOfWebContent + " webcontent");
-		assertTrue("Why no assessments?", numberOfAssessments > 0);
+		Assert.assertTrue("Why no assessments?", numberOfAssessments > 0);
 	}
 
 }
diff --git a/common/import-parsers/sakai-archive/pom.xml b/common/import-parsers/sakai-archive/pom.xml
@@ -28,12 +28,6 @@
       <groupId>org.sakaiproject.common</groupId>
       <artifactId>archive-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-    </dependency>
-
   </dependencies>
   <build>
     <resources>
@@ -45,6 +39,7 @@
         </includes>
       </resource>
     </resources>
+    <testSourceDirectory>src/test/java</testSourceDirectory>
 <!-- other resources for the jar - properties and xml files-->
   </build>
 </project>