test: remove universality tests

Author: ChristianMurphy

resource-server-core/src/test/java/org/jasig/resource/aggr/ResourcesAggregatorImplTest.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 /**
- * 
+ *
  */
 package org.jasig.resource.aggr;
 
@@ -38,7 +38,7 @@
 
 /**
  * Test harness for {@link ResourcesAggregatorImpl}.
- * 
+ *
  * @author Nicholas Blair, npblair@wisc.edu
  *
  */
@@ -61,9 +61,9 @@ public void testControl() throws Exception {
 
 		ResourcesAggregatorImpl impl = new ResourcesAggregatorImpl();
 		impl.aggregate(skinXml, outputDirectory);
-		
+
 		Diff d = new Diff(
-		        new FileReader(new ClassPathResource("skin-test1/skin.aggr.xml").getFile()), 
+		        new FileReader(new ClassPathResource("skin-test1/skin.aggr.xml").getFile()),
 		        new FileReader(new File(outputDirectory, "skin.aggr.xml")));
         assertTrue(d.toString(), d.similar());
 	}
@@ -81,17 +81,17 @@ public void testAllAbsolute() throws Exception {
 
 		ResourcesAggregatorImpl impl = new ResourcesAggregatorImpl();
 		impl.aggregate(skinXml, outputDirectory);
-		
+
 		Diff d = new Diff(
-                new FileReader(new ClassPathResource("skin-testAllAbsolute/skin.aggr.xml").getFile()), 
+                new FileReader(new ClassPathResource("skin-testAllAbsolute/skin.aggr.xml").getFile()),
                 new FileReader(new File(outputDirectory, "skin.aggr.xml")));
         assertTrue(d.toString(), d.similar());
 	}
 
 	@Test
 	public void testComplex() throws Exception {
 		String tempPath = getTestOutputRoot() + "/skin-complex/superskin";
-		
+
 		File outputDirectory = new File(tempPath);
 		outputDirectory.mkdirs();
 		Assert.assertTrue(outputDirectory.exists());
@@ -101,65 +101,21 @@ public void testComplex() throws Exception {
 
 		ResourcesAggregatorImpl impl = new ResourcesAggregatorImpl();
 		impl.aggregate(skinXml, outputDirectory);
-        
-        Diff d = new Diff(
-                new FileReader(new ClassPathResource("skin-complex/superskin/skin.aggr.xml").getFile()), 
-                new FileReader(new File(outputDirectory, "skin.aggr.xml")));
-        assertTrue(d.toString(), d.similar());
-	}
-
-    @Test
-    public void testUniversalityCommonJavaScript() throws Exception {
-        final String testOutputRoot = getTestOutputRoot();
-        String tempPath = testOutputRoot + "/skin-universality-commonjs/uportal3";
-        
-        File outputDirectory = new File(tempPath);
-        outputDirectory.mkdirs();
-        Assert.assertTrue(outputDirectory.exists());
-        
-        String jsPath = testOutputRoot + "/skin-universality-commonjs/common/javascript";
-        File jsOutputDirectory = new File(jsPath);
-
-        File skinXml = new ClassPathResource("skin-universality-commonjs/uportal3/skin.xml").getFile();
-        Assert.assertTrue(skinXml.exists());
 
-        ResourcesAggregatorImpl impl = new ResourcesAggregatorImpl();
-        impl.aggregate(skinXml, outputDirectory, jsOutputDirectory);
-        
         Diff d = new Diff(
-                new FileReader(new ClassPathResource("skin-universality-commonjs/uportal3/skin.aggr.xml").getFile()), 
-                new FileReader(new File(outputDirectory, "skin.aggr.xml")));
-        assertTrue(d.toString(), d.similar());
-    }
-
-	@Test
-	public void testUniversality() throws Exception {
-		String tempPath = getTestOutputRoot() + "/skin-universality/uportal3";
-		
-		File outputDirectory = new File(tempPath);
-		outputDirectory.mkdirs();
-		Assert.assertTrue(outputDirectory.exists());
-
-		File skinXml = new ClassPathResource("skin-universality/uportal3/skin.xml").getFile();
-		Assert.assertTrue(skinXml.exists());
-
-        ResourcesAggregatorImpl impl = new ResourcesAggregatorImpl();
-        impl.aggregate(skinXml, outputDirectory);
-        
-        Diff d = new Diff(
-                new FileReader(new ClassPathResource("skin-universality/uportal3/skin.aggr.xml").getFile()), 
+                new FileReader(new ClassPathResource("skin-complex/superskin/skin.aggr.xml").getFile()),
                 new FileReader(new File(outputDirectory, "skin.aggr.xml")));
         assertTrue(d.toString(), d.similar());
 	}
 
     @Test
     public void testIncludeOverlay() throws Exception {
         String tempPath = getTestOutputRoot() + "/skin-test-incl-overlay";
-        
+
         File outputDirectory = new File(tempPath);
         outputDirectory.mkdirs();
         Assert.assertTrue(outputDirectory.exists());
-        
+
         FileUtils.copyFileToDirectory(new ClassPathResource("skin-test-incl-overlay/overlay/overlay.css").getFile(), outputDirectory);
         FileUtils.copyFileToDirectory(new ClassPathResource("skin-test-incl-overlay/overlay/overlay.js").getFile(), outputDirectory);
 
@@ -171,21 +127,21 @@ public void testIncludeOverlay() throws Exception {
             .setResourcesXml(skinXml)
             .setOutputBaseDirectory(outputDirectory)
             .addAdditionalSourceDirectory(outputDirectory));
-        
+
         Diff d = new Diff(
-                new FileReader(new ClassPathResource("skin-test-incl-overlay/skin.aggr.xml").getFile()), 
+                new FileReader(new ClassPathResource("skin-test-incl-overlay/skin.aggr.xml").getFile()),
                 new FileReader(new File(outputDirectory, "skin.aggr.xml")));
         assertTrue(d.toString(), d.similar());
     }
 
     @Test(expected=IOException.class)
     public void testMissingIncludeOverlay() throws Exception {
         String tempPath = getTestOutputRoot() + "/skin-test-incl-overlay";
-        
+
         File outputDirectory = new File(tempPath);
         outputDirectory.mkdirs();
         Assert.assertTrue(outputDirectory.exists());
-        
+
         File skinXml = new ClassPathResource("skin-test-incl-overlay/skin.xml").getFile();
         Assert.assertTrue(skinXml.exists());
 
@@ -196,26 +152,6 @@ public void testMissingIncludeOverlay() throws Exception {
             .addAdditionalSourceDirectory(outputDirectory));
     }
 
-    @Test
-    public void testUniversalityImports() throws Exception {
-        String tempPath = getTestOutputRoot() + "/skin-universality-imports/uportal3";
-        
-        File outputDirectory = new File(tempPath);
-        outputDirectory.mkdirs();
-        Assert.assertTrue(outputDirectory.exists());
-
-        File skinXml = new ClassPathResource("skin-universality-imports/uportal3/skin.xml").getFile();
-        Assert.assertTrue(skinXml.exists());
-
-        ResourcesAggregatorImpl impl = new ResourcesAggregatorImpl();
-        impl.aggregate(skinXml, outputDirectory);
-        
-        Diff d = new Diff(
-                new FileReader(new ClassPathResource("skin-universality-imports/uportal3/skin.aggr.xml").getFile()), 
-                new FileReader(new File(outputDirectory, "skin.aggr.xml")));
-        assertTrue(d.toString(), d.similar());
-    }
-
 	/**
 	 * Delete our temp directory after test execution.
 	 * @throws Exception
@@ -228,7 +164,7 @@ public void cleanupTempDir() throws Exception {
 		FileUtils.cleanDirectory(testOutputDirectory);
 		FileUtils.deleteDirectory(testOutputDirectory);
 	}
-	
+
 	private final ThreadLocal<String> tempDirLocal = new ThreadLocal<String>();
 
 	/**
@@ -239,14 +175,14 @@ private String getTestOutputRoot() throws IOException {
 	    if (testOutputDirectoryName != null) {
 	        return testOutputDirectoryName;
 	    }
-	    
+
 		final File tmpDir = File.createTempFile("resources-aggregator-impl-", "-test-output");
 		tmpDir.delete();
 		tmpDir.mkdirs();
 		tmpDir.deleteOnExit();
 		testOutputDirectoryName = tmpDir.getCanonicalPath();
 		tempDirLocal.set(testOutputDirectoryName);
-		
+
 		return testOutputDirectoryName;
 	}
 }