[Profit-devs] SF.net SVN: profit: [76]

[<yz...@us...>]

Revision: 76
          http://svn.sourceforge.net/profit/?rev=76&view=rev
Author:   yzhou12
Date:     2006-10-18 04:15:19 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
Fixed package name of toJava, e.g. "package simple.math.DivisionColumnFixtureTestCase1".

Modified Paths:
--------------
    src/com/thoughtworks/tools/profit/tojava/TestTable.java
    test/com/thoughtworks/tools/profit/tojava/TestTableTests.java

Modified: src/com/thoughtworks/tools/profit/tojava/TestTable.java
===================================================================
--- src/com/thoughtworks/tools/profit/tojava/TestTable.java	2006-10-18 03:54:03 UTC (rev 75)
+++ src/com/thoughtworks/tools/profit/tojava/TestTable.java	2006-10-18 11:15:19 UTC (rev 76)
@@ -67,7 +67,9 @@
 
         JavaSourceFactory factory = new JavaSourceFactory();
         String className = TestTable.getClassName(fixtureClass, tableNumber);
-        JavaSource javaSource = factory.newJavaSource(JavaQNameImpl.getInstance(className), JavaSource.PUBLIC);
+        JavaSource javaSource = factory.newJavaSource(JavaQNameImpl
+                .getInstance(getJavaClassFullName(fixtureClass, className)),
+                JavaSource.PUBLIC);
         javaSource.addExtends(TestCase.class);
         
         if (leadingComment != null) {         
@@ -94,6 +96,11 @@
         return javaSource;
     }
 
+    private String getJavaClassFullName(Class fixtureClass, String className) {        
+        String packageName = fixtureClass.getPackage() == null ? null : fixtureClass.getPackage().getName();
+        return (packageName == null || packageName.length() == 0) ? className : packageName + "." + className;
+    }
+
     private void addTestMethodsForRowFixture(Class fixtureClass, JavaSource javaSource) {
         RowFixture rowFixture = instantiateRowFixture(fixtureClass);
         Class targetClass = rowFixture.getTargetClass();

Modified: test/com/thoughtworks/tools/profit/tojava/TestTableTests.java
===================================================================
--- test/com/thoughtworks/tools/profit/tojava/TestTableTests.java	2006-10-18 03:54:03 UTC (rev 75)
+++ test/com/thoughtworks/tools/profit/tojava/TestTableTests.java	2006-10-18 11:15:19 UTC (rev 76)
@@ -158,7 +158,7 @@
         JavaSource actual = table.toJava();
         assertEquals("!|com.thoughtworks.tools.profit.fixtures.MyColumnFixture|\n||\n", table.toFitnesseSource());
 
-        JavaSource expectedClass = createJavaSource("MyColumnFixtureTestCase1");
+        JavaSource expectedClass = createJavaSource("com.thoughtworks.tools.profit.fixtures.MyColumnFixtureTestCase1");
         expectedClass.addRawJavaSource(leadingComment);
         expectedClass.addRawJavaSource(trailingComment);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.