[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-schemafuzz] 02/02: Trying to work out db connection
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-schemafuzz] 02/02: Trying to work out db connection for Tests |
|
Date: |
Wed, 23 May 2018 20:58:38 +0200 |
This is an automated email from the git hooks/post-receive script.
erwan-ulrich pushed a commit to branch master
in repository schemafuzz.
commit fe3178b32f62958b03bc67638a9d631095674239
Author: Feideus <address@hidden>
AuthorDate: Wed May 23 20:58:26 2018 +0200
Trying to work out db connection for Tests
---
.gitignore | 4 +-
.../java/org/schemaspy/model/GenericTreeNode.java | 5 +-
src/main/java/org/schemaspy/model/Table.java | 12 ++++
src/main/java/org/schemaspy/model/TableColumn.java | 6 ++
.../org/schemaspy/model/GenericTreeNodeTest.java | 65 ++++++++++++++++++
.../compile/default-compile/inputFiles.lst | 78 ----------------------
.../testCompile/default-testCompile/inputFiles.lst | 52 ---------------
7 files changed, 89 insertions(+), 133 deletions(-)
diff --git a/.gitignore b/.gitignore
index bbd48fb..1d8edeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,5 @@ target/schemaspy-6.0.0-rc2.jar
target/schemaspy-6.0.0-rc2.jar.original
./Work_time.ods
.idea/
-target/failsafe-reports/
-target/maven-status/maven-compiler-plugin/
+target/failsafe-reports
+target/maven-status/maven-compiler-plugin
diff --git a/src/main/java/org/schemaspy/model/GenericTreeNode.java
b/src/main/java/org/schemaspy/model/GenericTreeNode.java
index d8442c5..bf65f0e 100644
--- a/src/main/java/org/schemaspy/model/GenericTreeNode.java
+++ b/src/main/java/org/schemaspy/model/GenericTreeNode.java
@@ -46,7 +46,6 @@ public class GenericTreeNode {
this.weight = 1;
this.id = id;
initDepth();
- initDepth();
this.initial_state_row = initial_state_row;
this.potential_changes = discoverMutationPossibilities(rootMutation);
}
@@ -226,8 +225,12 @@ public class GenericTreeNode {
{
ArrayList<SingleChange> oneChange = new ArrayList<SingleChange>();
+
+ System.out.println(tableColumn);
+
String typeName = tableColumn.getTypeName();
+
switch (typeName) {
case "int2":
int tmp =
Integer.parseInt(rootMutation.getInitial_state_row().getContent().get(tableColumn.getName()));
diff --git a/src/main/java/org/schemaspy/model/Table.java
b/src/main/java/org/schemaspy/model/Table.java
index ca265af..b44424b 100644
--- a/src/main/java/org/schemaspy/model/Table.java
+++ b/src/main/java/org/schemaspy/model/Table.java
@@ -76,6 +76,18 @@ public class Table implements Comparable<Table> {
setComments(comments);
}
+ public Table(String name, CaseInsensitiveMap<TableColumn> tableColumns) //
Test Purposes
+ {
+ this.catalog = null;
+ this.schema = null;
+ this.fullName = null;
+ this.container = null;
+ this.db = null;
+ this.name = name;
+ this.columns = tableColumns;
+ System.out.println(columns);
+ }
+
/**
* Get the foreign keys associated with this table
*
diff --git a/src/main/java/org/schemaspy/model/TableColumn.java
b/src/main/java/org/schemaspy/model/TableColumn.java
index 1df5766..a13a061 100644
--- a/src/main/java/org/schemaspy/model/TableColumn.java
+++ b/src/main/java/org/schemaspy/model/TableColumn.java
@@ -56,6 +56,12 @@ public class TableColumn {
public TableColumn() {
}
+
+ public TableColumn(String tableColumnName, String typeName) //Test purposes
+ {
+ this.name = tableColumnName;
+ this.typeName = typeName;
+ }
/**
* Create a column associated with a table.
*
diff --git a/src/test/java/org/schemaspy/model/GenericTreeNodeTest.java
b/src/test/java/org/schemaspy/model/GenericTreeNodeTest.java
index a1d8576..42dc0de 100644
--- a/src/test/java/org/schemaspy/model/GenericTreeNodeTest.java
+++ b/src/test/java/org/schemaspy/model/GenericTreeNodeTest.java
@@ -2,12 +2,20 @@ package org.schemaspy.model;
import nl.jqno.equalsverifier.internal.exceptions.AssertionException;
import org.junit.*;
+import org.schemaspy.Config;
+import org.schemaspy.service.SqlService;
+import org.schemaspy.util.CaseInsensitiveMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import java.sql.DatabaseMetaData;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Random;
public class GenericTreeNodeTest {
+ @Autowired
+ private SqlService sqlService;
@Test
@@ -69,4 +77,61 @@ public class GenericTreeNodeTest {
Assert.assertNotNull(gtn1.singleChangeBasedOnWeight());
}
+ @Test
+ public void singleChangeAttachedMutatationShouldMatch() // Not very Usefull
+ {
+ GenericTreeNode gtn1 = new GenericTreeNode(null,1,null,null);
+ SingleChange sg1 = new SingleChange(null,null,"1","2");
+
+ gtn1.setChosenChange(sg1);
+
+ Assert.assertEquals("Testing singleChange Attached Mutation
consistency",gtn1.getChosenChange().getattachedToMutation().getId(),gtn1.getId());
+
+ }
+
+// @Test
+// public void discoverMutationPossibilitiesTest()
+// {
+// HashMap<String,String> mapOfTheRow= new HashMap<String,String>();
+// mapOfTheRow.put("id","1");
+// mapOfTheRow.put("string","Loy");
+// mapOfTheRow.put("bool","f");
+//
+// CaseInsensitiveMap<TableColumn> tableColumns= new
CaseInsensitiveMap<TableColumn>();
+//
+// TableColumn testTableColumn1 = new TableColumn("id","int2");
+// TableColumn testTableColumn2 = new TableColumn("string","varchar");
+// TableColumn testTableColumn3 = new TableColumn("bool","bool");
+//
+// tableColumns.put("",testTableColumn1);
+// tableColumns.put("",testTableColumn2);
+// tableColumns.put("",testTableColumn3);
+//
+// Table testTable = new Table("test_table",tableColumns);
+// testTable.setColumns(tableColumns);
+//
+// Row row = new Row(testTable,mapOfTheRow,3);
+//
+// GenericTreeNode gtn1 = new GenericTreeNode(row,1,null,null);
+//
+// Assert.assertFalse("No null in a node
possibilities",gtn1.getPotential_changes().contains("null"));
+// }
+
+
+ @Test
+ public void discoverMutationPossibilitiesTest() throws Exception
+ {
+ String[] args = {
+ "-t", "src/test/resources/integrationTesting/dbTypes/h2memory",
+ "-db", "sample_database2",
+ "-s", "DATABASESERVICEIT",
+ "-o", "target/integrationtesting/databaseServiceIT",
+ "-u", "feideus"
+ "-p", "feideus"
+ };
+
+ Config config = new Config(args);
+ DatabaseMetaData databaseMetaData = sqlService.connect(config);
+ }
+
}
diff --git
a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index 711e407..0000000
---
a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,78 +0,0 @@
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/util/ResultSetDumper.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/LogicalRemoteTable.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/Row.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/util/DbSpecificConfig.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/ImpliedForeignKeyConstraint.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/util/ResourceFinder.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/db/exceptions/RuntimeIOException.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/util/DbSpecificOption.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/cli/PropertyFileDefaultProvider.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/Config.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/service/SqlService.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/SingleChange.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/util/PasswordReader.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/db/config/ResourceNotFoundException.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/service/TableService.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/cli/ConfigFileArgument.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/Main.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/service/InconsistencyException.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/xml/ForeignKeyMeta.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/Table.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/util/ConsolePasswordReader.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/ForeignKeyConstraint.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/DBFuzzer.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/QueryResponse.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/cli/PropertyFileDefaultProviderFactory.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/db/config/ResourceFinder.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/validator/NameValidator.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/cli/CommandLineArguments.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/service/DatabaseService.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/TableIndex.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/ForeignKey.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/logging/LogLevelConditionalThrowableProxyConverter.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/TableComment.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/Database.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/SchemaAnalyzer.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/DbAnalyzer.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/xml/SchemaMeta.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/DbDriverLoader.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/service/ViewService.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/LogicalTable.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/View.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/xml/TableColumnMeta.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/Catalog.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/TableColumn.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/ProcessExecutionException.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/QueryResponseParser.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/util/Markdown.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/service/ColumnInitializationFailure.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/RailsForeignKeyConstraint.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/SchemaSpyConfiguration.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/GenericTreeTraversalOrderEnum.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/TableOrderer.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/GenericTree.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/cli/ConfigFileArgumentParser.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/util/LineWriter.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/RemoteTable.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/cli/CommandLineArgumentParser.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/ConsoleProgressListener.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/GenericTreeNode.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/ConnectionFailure.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/EmptySchemaException.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/DatabaseObject.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/WiringConfiguration.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/Routine.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/InvalidConfigurationException.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/db/config/PropertiesResolver.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/db/config/PropertiesFinder.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/ProgressListener.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/xml/TableMeta.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/util/ResourceNotFoundException.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/CheckConstraint.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/util/CaseInsensitiveMap.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/Schema.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/service/helper/BasicTableMeta.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/util/ConnectionURLBuilder.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/db/config/ResolutionInfo.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/model/RoutineParameter.java
-/home/feideus/Work/BFHWork/schemafuzz/src/main/java/org/schemaspy/util/Inflection.java
diff --git
a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index ed8091a..0000000
---
a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ /dev/null
@@ -1,52 +0,0 @@
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/testing/Logger.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/integrationtesting/StackTraceLoggingIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/DbDriverLoaderTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/integrationtesting/SchemaMetaIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/model/TableColumnMetaTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/model/TableIndexTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/cli/CommandLineArgumentParserTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlXMLIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/model/RoutineTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/service/TableServiceTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/testcontainer/OracleIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlSpacesIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/integrationtesting/OracleSpacesIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/DbAnalyzerTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/util/DbSpecificOptionTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/util/CaseInsensitiveMapTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/db/config/PropertiesFinderTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/dummy/DummyDriverUnsatisfiedCtor.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/ConfigTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/model/GenericTreeNodeTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/service/DatabaseServiceIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/db/config/PropertiesResolverTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/testing/H2MemoryRule.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlSpacesNoDotsIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/testing/IgnoreUsingXPath.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlKeyWordTableIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/dummy/DummyDriver.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/testcontainers/containers/InformixContainer.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/cli/ConfigFileArgumentParserTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/validator/NameValidatorTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/testing/LoggingRule.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/testcontainer/InformixIndexIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlRoutinesIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/dummy/DummyDriverUnsatisfiedConnect.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/integrationtesting/H2ViewIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/integrationtesting/H2KeywordIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/validator/NameValidatorIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/util/InflectionTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/util/ConnectionURLBuilderTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/util/ResourceFinderTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/integrationtesting/H2SpacesIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/TableOrdererTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/util/RailsNamingTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/model/TableFullNameTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/model/InvalidConfigurationExceptionTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/testcontainer/InformixIndexXMLIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/model/CatalogTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/cli/PropertyFileDefaultProviderTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/model/SchemaTest.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/testing/AssumeClassIsPresentRule.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/testcontainer/MysqlHTMLIT.java
-/home/feideus/Work/BFHWork/schemafuzz/src/test/java/org/schemaspy/testcontainer/MSSQLServerIT.java
--
To stop receiving notification emails like this one, please contact
address@hidden