db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henn...@apache.org
Subject cvs commit: db-torque/src/test/org/apache/torque/util QueryTest.java SqlExpressionTest.java
Date Wed, 01 Dec 2004 15:29:10 GMT
henning     2004/12/01 07:29:10

  Modified:    src/generator/src/java/org/apache/torque/engine/database/transform
                        Tag: TORQUE_3_1_BRANCH XmlToAppData.java
                        XmlToData.java
               src/generator/src/test/org/apache/torque/engine/database/model
                        Tag: TORQUE_3_1_BRANCH TableTest.java
               src/java/org/apache/torque/dsfactory Tag: TORQUE_3_1_BRANCH
                        JndiDataSourceFactory.java
               src/java/org/apache/torque/util Tag: TORQUE_3_1_BRANCH
                        BasePeer.java LimitHelper.java
               src/rttest/org/apache/torque/util Tag: TORQUE_3_1_BRANCH
                        CopyTest.java
               src/test/org/apache/torque/om Tag: TORQUE_3_1_BRANCH
                        ComboKeyTest.java
               src/test/org/apache/torque/util Tag: TORQUE_3_1_BRANCH
                        QueryTest.java SqlExpressionTest.java
  Log:
  Remove Tabs
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.8.2.3   +9 -9      db-torque/src/generator/src/java/org/apache/torque/engine/database/transform/XmlToAppData.java
  
  Index: XmlToAppData.java
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/src/java/org/apache/torque/engine/database/transform/XmlToAppData.java,v
  retrieving revision 1.8.2.2
  retrieving revision 1.8.2.3
  diff -u -r1.8.2.2 -r1.8.2.3
  --- XmlToAppData.java	20 May 2004 04:34:17 -0000	1.8.2.2
  +++ XmlToAppData.java	1 Dec 2004 15:29:09 -0000	1.8.2.3
  @@ -180,14 +180,14 @@
       public InputSource resolveEntity(String publicId, String systemId)
               throws SAXException
       {
  -		try 
  -		{
  -			return new DTDResolver().resolveEntity(publicId, systemId);
  -		} 
  -		catch (Exception e) 
  -		{
  -			throw new SAXException(e);
  -		}
  +                try 
  +                {
  +                        return new DTDResolver().resolveEntity(publicId, systemId);
  +                } 
  +                catch (Exception e) 
  +                {
  +                        throw new SAXException(e);
  +                }
       }
   
   
  
  
  
  1.10.2.3  +18 -18    db-torque/src/generator/src/java/org/apache/torque/engine/database/transform/XmlToData.java
  
  Index: XmlToData.java
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/src/java/org/apache/torque/engine/database/transform/XmlToData.java,v
  retrieving revision 1.10.2.2
  retrieving revision 1.10.2.3
  diff -u -r1.10.2.2 -r1.10.2.3
  --- XmlToData.java	20 May 2004 04:34:17 -0000	1.10.2.2
  +++ XmlToData.java	1 Dec 2004 15:29:09 -0000	1.10.2.3
  @@ -159,23 +159,23 @@
       public InputSource resolveEntity(String publicId, String systemId)
               throws SAXException
       {
  -		try 
  -		{
  -			if (dataDTD != null && dtdFileName.equals(systemId))
  -			{
  -			    log.info("Resolver: used " + dtdFile.getPath());
  -			    return dataDTD;
  -			}
  -			else
  -			{
  -			    log.info("Resolver: used " + systemId);
  -			    return getInputSource(systemId);
  -			}
  -		} 
  -		catch (IOException e) 
  -		{
  -			throw new SAXException(e);
  -		}
  +                try 
  +                {
  +                        if (dataDTD != null && dtdFileName.equals(systemId))
  +                        {
  +                            log.info("Resolver: used " + dtdFile.getPath());
  +                            return dataDTD;
  +                        }
  +                        else
  +                        {
  +                            log.info("Resolver: used " + systemId);
  +                            return getInputSource(systemId);
  +                        }
  +                } 
  +                catch (IOException e) 
  +                {
  +                        throw new SAXException(e);
  +                }
       }
   
       /**
  
  
  
  No                   revision
  No                   revision
  1.1.2.3   +3 -3      db-torque/src/generator/src/test/org/apache/torque/engine/database/model/TableTest.java
  
  Index: TableTest.java
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/src/test/org/apache/torque/engine/database/model/TableTest.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- TableTest.java	20 May 2004 04:35:16 -0000	1.1.2.2
  +++ TableTest.java	1 Dec 2004 15:29:09 -0000	1.1.2.3
  @@ -60,7 +60,7 @@
           assertEquals(IDMethod.ID_BROKER, db.getDefaultIdMethod());
           Table table = db.getTable("table_idbroker");
           assertEquals(IDMethod.ID_BROKER, table.getIdMethod());
  -		Table table2 = db.getTable("table_native");
  -		assertEquals(IDMethod.NATIVE, table2.getIdMethod());
  +                Table table2 = db.getTable("table_native");
  +                assertEquals(IDMethod.NATIVE, table2.getIdMethod());
       }
   }
  
  
  
  No                   revision
  No                   revision
  1.6.2.4   +11 -11    db-torque/src/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java
  
  Index: JndiDataSourceFactory.java
  ===================================================================
  RCS file: /home/cvs/db-torque/src/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java,v
  retrieving revision 1.6.2.3
  retrieving revision 1.6.2.4
  diff -u -r1.6.2.3 -r1.6.2.4
  --- JndiDataSourceFactory.java	20 Oct 2004 14:13:58 -0000	1.6.2.3
  +++ JndiDataSourceFactory.java	1 Dec 2004 15:29:10 -0000	1.6.2.4
  @@ -73,22 +73,22 @@
        */
       public DataSource getDataSource() throws TorqueException
       {
  -    	long time = System.currentTimeMillis();
  -    	
  -    	if (ds == null || time - lastLookup > ttl)
  -    	{
  +        long time = System.currentTimeMillis();
  +        
  +        if (ds == null || time - lastLookup > ttl)
  +        {
               try
               {
                   ds = ((DataSource) ctx.lookup(path));
  -	        lastLookup = time;
  +                lastLookup = time;
               }
               catch (Exception e)
               {
                   throw new TorqueException(e);
               }
  -    	}
  +        }
   
  -   	return ds;
  +        return ds;
       }
   
       /**
  @@ -136,10 +136,10 @@
                       log.debug("JNDI path: " + path);
                   }
                   else if (key.equals("ttl"))
  -		{
  -		    ttl = c.getLong(key, ttl);
  +                {
  +                    ttl = c.getLong(key, ttl);
                       log.debug("Time between context lookups: " + ttl);
  -		}
  +                }
                   else
                   {
                       if (env == null)
  
  
  
  No                   revision
  No                   revision
  1.76.2.8  +4 -4      db-torque/src/java/org/apache/torque/util/BasePeer.java
  
  Index: BasePeer.java
  ===================================================================
  RCS file: /home/cvs/db-torque/src/java/org/apache/torque/util/BasePeer.java,v
  retrieving revision 1.76.2.7
  retrieving revision 1.76.2.8
  diff -u -r1.76.2.7 -r1.76.2.8
  --- BasePeer.java	30 Nov 2004 18:41:17 -0000	1.76.2.7
  +++ BasePeer.java	1 Dec 2004 15:29:10 -0000	1.76.2.8
  @@ -374,7 +374,7 @@
           {
               processTables(criteria, tables, con, new ProcessCallback() {
                       public void process (String table, Record rec)
  -                    	throws Exception
  +                        throws Exception
                       {
                           rec.markToBeDeleted();
                           rec.save();
  @@ -1210,7 +1210,7 @@
           {
               processTables(criteria, tables, con, new ProcessCallback() {
                       public void process (String table, Record rec)
  -                    	throws Exception
  +                        throws Exception
                       {
                           BasePeer.insertOrUpdateRecord(rec, table, updateValues);
                       }
  @@ -1623,6 +1623,6 @@
       protected interface ProcessCallback
       {
           void process (String table, Record rec)
  -        	throws Exception;
  +                throws Exception;
       }
   }
  
  
  
  1.1.2.4   +2 -2      db-torque/src/java/org/apache/torque/util/Attic/LimitHelper.java
  
  Index: LimitHelper.java
  ===================================================================
  RCS file: /home/cvs/db-torque/src/java/org/apache/torque/util/Attic/LimitHelper.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- LimitHelper.java	23 Oct 2004 10:55:06 -0000	1.1.2.3
  +++ LimitHelper.java	1 Dec 2004 15:29:10 -0000	1.1.2.4
  @@ -40,7 +40,7 @@
        * @param query The query object to update
        */
       public static final void buildLimit(Criteria criteria, Query query)
  -    	throws TorqueException
  +        throws TorqueException
       {
           int limit = criteria.getLimit();
           int offset = criteria.getOffset();
  
  
  
  No                   revision
  No                   revision
  1.2.4.3   +18 -18    db-torque/src/rttest/org/apache/torque/util/CopyTest.java
  
  Index: CopyTest.java
  ===================================================================
  RCS file: /home/cvs/db-torque/src/rttest/org/apache/torque/util/CopyTest.java,v
  retrieving revision 1.2.4.2
  retrieving revision 1.2.4.3
  diff -u -r1.2.4.2 -r1.2.4.3
  --- CopyTest.java	20 May 2004 04:36:07 -0000	1.2.4.2
  +++ CopyTest.java	1 Dec 2004 15:29:10 -0000	1.2.4.3
  @@ -47,28 +47,28 @@
        */
       public void testCopyObject() throws Exception
       {
  -		Author author = new Author();
  -		author.setName("Author to be copied");
  -		author.save();
  +                Author author = new Author();
  +                author.setName("Author to be copied");
  +                author.save();
   
  -		for (int j = 1; j <= 10; j++)
  -		{
  -			Book book = new Book();
  -			book.setAuthor(author);
  -			book.setTitle("Book " + j + " - " + author.getName());
  -			book.setIsbn("unknown");
  -			book.save();
  -		}
  -		assertTrue("Number of books before copy should be 10, was "
  +                for (int j = 1; j <= 10; j++)
  +                {
  +                        Book book = new Book();
  +                        book.setAuthor(author);
  +                        book.setTitle("Book " + j + " - " + author.getName());
  +                        book.setIsbn("unknown");
  +                        book.save();
  +                }
  +                assertTrue("Number of books before copy should be 10, was "
                   + author.getBooks().size(), author.getBooks().size() == 10);
  -		Author authorCopy = author.copy();
  -		authorCopy.save();
  +                Author authorCopy = author.copy();
  +                authorCopy.save();
   
  -		author = AuthorPeer.retrieveByPK(author.getPrimaryKey());
  -		assertTrue("Number of books in original object should be 10, was "
  +                author = AuthorPeer.retrieveByPK(author.getPrimaryKey());
  +                assertTrue("Number of books in original object should be 10, was "
                   + author.getBooks().size(), author.getBooks().size() == 10);
   
  -		assertTrue("Number of books after copy should be 10, was "
  +                assertTrue("Number of books after copy should be 10, was "
                   + author.getBooks().size(), authorCopy.getBooks().size() == 10);
       }
   }
  
  
  
  No                   revision
  No                   revision
  1.4.2.3   +37 -37    db-torque/src/test/org/apache/torque/om/ComboKeyTest.java
  
  Index: ComboKeyTest.java
  ===================================================================
  RCS file: /home/cvs/db-torque/src/test/org/apache/torque/om/ComboKeyTest.java,v
  retrieving revision 1.4.2.2
  retrieving revision 1.4.2.3
  diff -u -r1.4.2.2 -r1.4.2.3
  --- ComboKeyTest.java	20 May 2004 04:36:07 -0000	1.4.2.2
  +++ ComboKeyTest.java	1 Dec 2004 15:29:10 -0000	1.4.2.3
  @@ -52,19 +52,19 @@
           super(name);
       }
   
  -	/**
  -	 * 
  -	 * @param args
  -	 */
  +        /**
  +         * 
  +         * @param args
  +         */
       public static void main(java.lang.String[] args)
       {
           junit.textui.TestRunner.run(suite());
       }
   
  -	/**
  -	 * 
  -	 * @return Test
  -	 */
  +        /**
  +         * 
  +         * @return Test
  +         */
       public static Test suite()
       {
           TestSuite suite = new TestSuite(ComboKeyTest.class);
  @@ -72,10 +72,10 @@
           return suite;
       }
   
  -	/**
  -	 * 
  -	 *
  -	 */
  +        /**
  +         * 
  +         *
  +         */
       public void testReflexive()
       {
           Assert.assertTrue(c1a.equals(c1a));
  @@ -85,38 +85,38 @@
           Assert.assertTrue(c3a.looseEquals(c3a));
       }
   
  -	/**
  -	 * 
  -	 *
  -	 */
  +        /**
  +         * 
  +         *
  +         */
       public void testSymmetric()
       {
           Assert.assertTrue(c1a.equals(c1b));
           Assert.assertTrue(c1b.equals(c1a));
       }
   
  -	/**
  -	 * 
  -	 *
  -	 */
  +        /**
  +         * 
  +         *
  +         */
       public void testNull()
       {
           Assert.assertTrue(!c1a.equals(null));
       }
   
  -	/**
  -	 * 
  -	 *
  -	 */
  +        /**
  +         * 
  +         *
  +         */
       public void testNotEqual()
       {
           Assert.assertTrue(!c1a.equals(c2a));
       }
   
  -	/**
  -	 * 
  -	 *
  -	 */
  +        /**
  +         * 
  +         *
  +         */
       public void testRoundTripWithStringKeys()
       {
           // two strings
  @@ -137,10 +137,10 @@
           Assert.assertEquals(oldKey,newKey);
       }
   
  -	/**
  -	 * 
  -	 *
  -	 */
  +        /**
  +         * 
  +         *
  +         */
       public void testRoundTripWithComplexKey()
       {
           // complex key
  @@ -162,10 +162,10 @@
           Assert.assertEquals(oldKey,newKey);
       }
   
  -	/**
  -	 * 
  -	 *
  -	 */
  +        /**
  +         * 
  +         *
  +         */
       public void testRoundTripWithNullKey()
       {
           // with null key
  
  
  
  No                   revision
  No                   revision
  1.4.2.4   +2 -2      db-torque/src/test/org/apache/torque/util/QueryTest.java
  
  Index: QueryTest.java
  ===================================================================
  RCS file: /home/cvs/db-torque/src/test/org/apache/torque/util/QueryTest.java,v
  retrieving revision 1.4.2.3
  retrieving revision 1.4.2.4
  diff -u -r1.4.2.3 -r1.4.2.4
  --- QueryTest.java	1 Dec 2004 15:03:39 -0000	1.4.2.3
  +++ QueryTest.java	1 Dec 2004 15:29:10 -0000	1.4.2.4
  @@ -60,7 +60,7 @@
        */
       public void testToString()
       {
  -        String expected	= "SELECT tableA.column1, tableA.column2, "
  +        String expected = "SELECT tableA.column1, tableA.column2, "
                   + "tableB.column1 FROM tableA, tableB WHERE tableA.A = tableB.A"
                   + " AND tableA.B = 1234";
           Query query = new Query();
  
  
  
  1.2.2.4   +27 -27    db-torque/src/test/org/apache/torque/util/SqlExpressionTest.java
  
  Index: SqlExpressionTest.java
  ===================================================================
  RCS file: /home/cvs/db-torque/src/test/org/apache/torque/util/SqlExpressionTest.java,v
  retrieving revision 1.2.2.3
  retrieving revision 1.2.2.4
  diff -u -r1.2.2.3 -r1.2.2.4
  --- SqlExpressionTest.java	20 May 2004 04:36:06 -0000	1.2.2.3
  +++ SqlExpressionTest.java	1 Dec 2004 15:29:10 -0000	1.2.2.4
  @@ -35,14 +35,14 @@
       private DB db = null;
       
   
  -	/**
  -	 * Constructor for SqlExpressionTest.
  -	 * @param arg0
  -	 */
  -	public SqlExpressionTest(String arg0)
  -	{
  -		super(arg0);
  -	}
  +        /**
  +         * Constructor for SqlExpressionTest.
  +         * @param arg0
  +         */
  +        public SqlExpressionTest(String arg0)
  +        {
  +                super(arg0);
  +        }
   
       /**
        * set up environment
  @@ -59,30 +59,30 @@
           }
       }
   
  -	/**
  -	 * Test for String buildInnerJoin(String, String)
  -	 */
  -	public void testBuildInnerJoinStringString()
  -	{
  +        /**
  +         * Test for String buildInnerJoin(String, String)
  +         */
  +        public void testBuildInnerJoinStringString()
  +        {
           String result = SqlExpression.buildInnerJoin("TA.COLA", "TB.COLB");
           assertEquals(result, "TA.COLA=TB.COLB");
  -	}
  +        }
   
  -	/**
  -	 * Test for String buildInnerJoin(String, String, boolean, DB)
  -	 */
  -	public void testBuildInnerJoinStringStringbooleanDB()
  -	{
  +        /**
  +         * Test for String buildInnerJoin(String, String, boolean, DB)
  +         */
  +        public void testBuildInnerJoinStringStringbooleanDB()
  +        {
           String result = SqlExpression.buildInnerJoin("TA.COLA", "TB.COLB", 
                   true, db);
           assertEquals(result, "TA.COLA=TB.COLB");
  -	}
  +        }
   
  -	/**
  -	 * Test for String buildIn(String, Object, SqlEnum, boolean, DB)
  -	 */
  -	public void testBuildInStringObjectSqlEnumbooleanDB()
  -	{
  +        /**
  +         * Test for String buildIn(String, Object, SqlEnum, boolean, DB)
  +         */
  +        public void testBuildInStringObjectSqlEnumbooleanDB()
  +        {
           String[] values = new String[] { "42", "43", "44" };
           String result = SqlExpression.buildIn("COL", values, SqlEnum.IN, 
                   true, db);
  @@ -98,7 +98,7 @@
               // jdk 1.3
               assertEquals(result, "COL IN ('43','44','42')");
           }
  -	}
  +        }
       
       public void testLargeBuildInStringObjectSqlEnumbooleanDB()
       {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message