adjust test

daileyet · daileyet · commit d0af89257695 · 2015-07-27T16:25:47.000+08:00
diff --git a/.classpath b/.classpath
@@ -7,5 +7,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/openlibs.utilities"/>
 	<classpathentry kind="lib" path="lib/apache-log4j-1.2.16/log4j-1.2.16.jar"/>
 	<classpathentry kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
+	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.14.jar"/>
+	<classpathentry kind="lib" path="lib/sqlserverjdbc.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bin/.gitignore b/bin/.gitignore
@@ -1,2 +1 @@
-/sql/
 /openthinks/
diff --git a/bin/dbconfig.properties b/bin/dbconfig.properties
@@ -0,0 +1,12 @@
+#driver name
+#DRIVER=com.microsoft.sqlserver.jdbc.SQLServerDriver
+DRIVER=com.mysql.jdbc.Driver
+#database url
+#URL=jdbc:sqlserver://119.119.114.88:1433;databasename=DaileyAskProd
+URL=jdbc:mysql://localhost:3306/opendb
+#database user
+#USERNAME=sa
+USERNAME=root
+#database pass
+#USERPWD=P@ssw0rd
+USERPWD=123456
diff --git a/bin/log4j.properties b/bin/log4j.properties
@@ -0,0 +1,13 @@
+log4j.appender.std=org.apache.log4j.ConsoleAppender
+log4j.appender.std.Target=System.out
+log4j.appender.std.layout=org.apache.log4j.PatternLayout
+log4j.appender.std.layout.ConversionPattern=%d{yyyy-mm-dd HH:MM} %l%m%n
+
+
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=djlib.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{yyyy-mm-dd HH:MM} %m%n
+
+
+log4j.rootLogger=debug,std
diff --git a/lib/mysql-connector-java-5.1.14.jar b/lib/mysql-connector-java-5.1.14.jar
diff --git a/lib/sqlserverjdbc.jar b/lib/sqlserverjdbc.jar
diff --git a/src/dbconfig.properties b/src/dbconfig.properties
@@ -0,0 +1,12 @@
+#driver name
+#DRIVER=com.microsoft.sqlserver.jdbc.SQLServerDriver
+DRIVER=com.mysql.jdbc.Driver
+#database url
+#URL=jdbc:sqlserver://119.119.114.88:1433;databasename=DaileyAskProd
+URL=jdbc:mysql://localhost:3306/opendb
+#database user
+#USERNAME=sa
+USERNAME=root
+#database pass
+#USERPWD=P@ssw0rd
+USERPWD=123456
diff --git a/src/log4j.properties b/src/log4j.properties
@@ -0,0 +1,13 @@
+log4j.appender.std=org.apache.log4j.ConsoleAppender
+log4j.appender.std.Target=System.out
+log4j.appender.std.layout=org.apache.log4j.PatternLayout
+log4j.appender.std.layout.ConversionPattern=%d{yyyy-mm-dd HH:MM} %l%m%n
+
+
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=djlib.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{yyyy-mm-dd HH:MM} %m%n
+
+
+log4j.rootLogger=debug,std
diff --git a/test/openthinks/libs/sql/LoadTest.java b/test/openthinks/libs/sql/LoadTest.java
@@ -38,7 +38,7 @@
  */
 public class LoadTest {
 
-//	@Test
+	//	@Test
 	public void testListEntity() {
 		Session session = SessionFactory.getSession();
 		List<MessageE> list = session.list(MessageE.class, "SELECT * FROM message");
@@ -49,7 +49,7 @@ public void testListEntity() {
 
 	}
 
-//	@Test
+	//	@Test
 	public void testJPAList() {
 		Session session = SessionFactory.getSession();
 		List<Message> list = session.list(Message.class, "SELECT * FROM message");
@@ -59,7 +59,7 @@ public void testJPAList() {
 		session.close();
 	}
 
-//	@Test
+	//	@Test
 	public void testListByClass() {
 		Session session = SessionFactory.getSession();
 		List<Message> list = session.list(Message.class);
@@ -76,6 +76,5 @@ public void testGetById() {
 		System.out.println(message);
 		session.close();
 	}
-	
-	
+
 }
diff --git a/test/openthinks/libs/sql/Message.java b/test/openthinks/libs/sql/Message.java
@@ -13,11 +13,11 @@ public class Message {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
-	@Column(name = "messageid_column")
+	@Column(name = "message_id")
 	private String messageId;
-	@Column(name = "locale_column")
+	@Column(name = "message_locale")
 	private String locale;
-	@Column(name = "content_column")
+	@Column(name = "message_content")
 	private String content;
 
 	/*
@@ -76,7 +76,6 @@ public void setContent(String content) {
 	 */
 	@Override
 	public String toString() {
-		return "Message [messageId=" + messageId + ", locale=" + locale
-				+ ", content=" + content + "]";
+		return "Message [messageId=" + messageId + ", locale=" + locale + ", content=" + content + "]";
 	}
 }
diff --git a/test/openthinks/libs/sql/MessageE.java b/test/openthinks/libs/sql/MessageE.java
@@ -1,59 +1,58 @@
 package openthinks.libs.sql;
 
+public class MessageE extends openthinks.libs.sql.entity.Entity {
 
-public class MessageE extends openthinks.libs.sql.entity.Entity{
-
-	private String messageId;
-	private String locale;
-	private String content;
+	private String message_id;
+	private String message_locale;
+	private String message_content;
 
 	/* (non-Javadoc)
 	 * @see i18n.IMessage#getContent()
 	 */
 	public String getContent() {
-		return content;
+		return message_content;
 	}
 
 	/* (non-Javadoc)
 	 * @see i18n.IMessage#getLocale()
 	 */
 	public String getLocale() {
-		return locale;
+		return message_locale;
 	}
 
 	/**
 	 * @return the messageId
 	 */
 	public String getMessageId() {
-		return messageId;
+		return message_id;
 	}
 
 	/**
 	 * @param messageId the messageId to set
 	 */
 	public void setMessageId(String messageId) {
-		this.messageId = messageId;
+		this.message_id = messageId;
 	}
 
 	/**
 	 * @param locale the locale to set
 	 */
 	public void setLocale(String locale) {
-		this.locale = locale;
+		this.message_locale = locale;
 	}
 
 	/**
 	 * @param content the content to set
 	 */
 	public void setContent(String content) {
-		this.content = content;
+		this.message_content = content;
 	}
 
 	/* (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
 	public String toString() {
-		return "MessageE [messageId=" + messageId + ", locale=" + locale + ", content=" + content + "]";
+		return "MessageE [messageId=" + message_id + ", locale=" + message_locale + ", content=" + message_content + "]";
 	}
 }
