svn commit: r665887 - in /maven/archetype/trunk/archetype-common/src/test: java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java resources/projects/roundtrip-1-project/src/main/java/org/apache/maven/test/App.java

[rafale]

Author: rafale
Date: Mon Jun  9 13:50:22 2008
New Revision: 665887

URL: http://svn.apache.org/viewvc?rev=665887&view=rev
Log:
modified test case to assert archetype-180 archetype-183 fix

Modified:
    
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
    
maven/archetype/trunk/archetype-common/src/test/resources/projects/roundtrip-1-project/src/main/java/org/apache/maven/test/App.java

Modified: 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java?rev=665887&r1=665886&r2=665887&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/test/ArchetyperRoundtripTest.java
 Mon Jun  9 13:50:22 2008
@@ -188,6 +188,26 @@
             fail( generationResult.getCause().getMessage() );
         }
 
+        //ASSERT symbol_pound replacement (archetype-180 archetype-183)
+        String content = FileUtils.fileRead(
+                outputDirectory + File.separator + "myapp" + File.separator + 
+                "src" + File.separator + "main" + File.separator + "java" + 
+                File.separator + "com" + File.separator + "mycompany" + 
+                File.separator + "myapp" + File.separator + "App.java");
+        System.err.println("content="+content);
+        assertTrue(content.indexOf("//A   #\\{some}")>0);
+        assertTrue(content.indexOf("//B   #{some}")>0);
+        assertTrue(content.indexOf("//F   {some}")>0);
+        assertTrue(content.indexOf("//C   #{some other}")>0);
+        assertTrue(content.indexOf("//D   ${symbol_pound}{some other}")>0);
+        assertTrue(content.indexOf("//E   #{}")>0);
+        assertTrue(content.indexOf("/*")>0);
+        assertTrue(content.indexOf("  A   #\\{some}")>0);
+        assertTrue(content.indexOf("  B   #{some}")>0);
+        assertTrue(content.indexOf("  F   {some}")>0);
+        assertTrue(content.indexOf("  C   #{some other}")>0);
+        assertTrue(content.indexOf("  D   ${symbol_pound}{some other}")>0);
+        assertTrue(content.indexOf("  E   #{}") > 0);
     }
 
     public void setUp()

Modified: 
maven/archetype/trunk/archetype-common/src/test/resources/projects/roundtrip-1-project/src/main/java/org/apache/maven/test/App.java
URL: 
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/resources/projects/roundtrip-1-project/src/main/java/org/apache/maven/test/App.java?rev=665887&r1=665886&r2=665887&view=diff
==============================================================================
--- 
maven/archetype/trunk/archetype-common/src/test/resources/projects/roundtrip-1-project/src/main/java/org/apache/maven/test/App.java
 (original)
+++ 
maven/archetype/trunk/archetype-common/src/test/resources/projects/roundtrip-1-project/src/main/java/org/apache/maven/test/App.java
 Mon Jun  9 13:50:22 2008
@@ -15,7 +15,6 @@
         //C   #{some other}
         //D   \#{some other}
         //E   #{}
-        
         /*
         A   #\{some}
         B   #{some}