Add BBAN (#8)

* regex * BBAN * BBAN * .
StefH · Dec 3, 2018 · cbf39d3 · cbf39d3
1 parent 1d5a501
commit cbf39d3
Show file tree

Hide file tree

Showing 18 changed files with 425 additions and 58 deletions.
diff --git a/Example Project Files/My Table.xml → Example Project Files/My Project.xml b/Example Project Files/My Table.xml → Example Project Files/My Project.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ProjectSettings xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http:https://www.w3.org/2001/XMLSchema">
- <Date>2013-10-02T20:42:18.5887967+02:00</Date>
- <Name>My Table</Name>
+ <Date>2018-12-03T10:23:44.2639199+01:00</Date>
+ <Name>My Test Project</Name>
  <TotalRecords>1000</TotalRecords>
  <OutputFile>c:\Temp\output.sql</OutputFile>
  <GenerateOptions xsi:type="GenerateOptionsSQL">
@@ -13,8 +13,8 @@
  <DataField>
  <Name>Numbers_Integer</Name>
  <FieldOptions xsi:type="FieldOptionsInteger">
- <ValueAsString>false</ValueAsString>
  <UseNullValues>false</UseNullValues>
+ <ValueAsString>false</ValueAsString>
  <Min>0</Min>
  <Max>77778888</Max>
  </FieldOptions>
@@ -28,8 +28,8 @@
  <DataField>
  <Name>Human_First_Both</Name>
  <FieldOptions xsi:type="FieldOptionsFirstName">
- <ValueAsString>true</ValueAsString>
  <UseNullValues>false</UseNullValues>
+ <ValueAsString>true</ValueAsString>
  <Male>true</Male>
  <Female>true</Female>
  </FieldOptions>
@@ -43,8 +43,8 @@
  <DataField>
  <Name>Human_Last</Name>
  <FieldOptions xsi:type="FieldOptionsLastName">
- <ValueAsString>true</ValueAsString>
  <UseNullValues>false</UseNullValues>
+ <ValueAsString>true</ValueAsString>
  </FieldOptions>
  <Field>
  <FieldType>Human</FieldType>
@@ -56,8 +56,8 @@
  <DataField>
  <Name>Human_Full_Both</Name>
  <FieldOptions xsi:type="FieldOptionsFullName">
- <ValueAsString>true</ValueAsString>
  <UseNullValues>false</UseNullValues>
+ <ValueAsString>true</ValueAsString>
  <Male>true</Male>
  <Female>true</Female>
  <Left2Right>true</Left2Right>
@@ -72,8 +72,8 @@
  <DataField>
  <Name>Human_Email</Name>
  <FieldOptions xsi:type="FieldOptionsEmailAddress">
- <ValueAsString>true</ValueAsString>
  <UseNullValues>true</UseNullValues>
+ <ValueAsString>true</ValueAsString>
  <Male>true</Male>
  <Female>true</Female>
  <Left2Right>true</Left2Right>
@@ -88,8 +88,8 @@
  <DataField>
  <Name>Loc_City</Name>
  <FieldOptions xsi:type="FieldOptionsCity">
- <ValueAsString>true</ValueAsString>
  <UseNullValues>false</UseNullValues>
+ <ValueAsString>true</ValueAsString>
  </FieldOptions>
  <Field>
  <FieldType>Location</FieldType>
@@ -101,8 +101,8 @@
  <DataField>
  <Name>Loc_Country</Name>
  <FieldOptions xsi:type="FieldOptionsCountry">
- <ValueAsString>true</ValueAsString>
  <UseNullValues>false</UseNullValues>
+ <ValueAsString>true</ValueAsString>
  </FieldOptions>
  <Field>
  <FieldType>Location</FieldType>
@@ -114,8 +114,8 @@
  <DataField>
  <Name>Text_Words_3</Name>
  <FieldOptions xsi:type="FieldOptionsTextWords">
- <ValueAsString>true</ValueAsString>
  <UseNullValues>false</UseNullValues>
+ <ValueAsString>true</ValueAsString>
  <Min>1</Min>
  <Max>3</Max>
  </FieldOptions>
@@ -129,8 +129,8 @@
  <DataField>
  <Name>Text_Random_4to8</Name>
  <FieldOptions xsi:type="FieldOptionsText">
- <ValueAsString>true</ValueAsString>
  <UseNullValues>false</UseNullValues>
+ <ValueAsString>true</ValueAsString>
  <Min>4</Min>
  <Max>8</Max>
  <UseUppercase>false</UseUppercase>
@@ -150,15 +150,9 @@
  <DataField>
  <Name>Text_Pattern</Name>
  <FieldOptions xsi:type="FieldOptionsTextPattern">
- <ValueAsString>true</ValueAsString>
  <UseNullValues>false</UseNullValues>
+ <ValueAsString>true</ValueAsString>
  <Pattern>\xLLnn_**ss\x</Pattern>
- <!-- <UseUppercase>false</UseUppercase> -->
- <!-- <UseLowercase>false</UseLowercase> -->
- <!-- <UseLetter>true</UseLetter> -->
- <!-- <UseNumber>true</UseNumber> -->
- <!-- <UseSpace>true</UseSpace> -->
- <!-- <UseSpecial>true</UseSpecial> -->
  </FieldOptions>
  <Field>
  <FieldType>Text</FieldType>
@@ -167,11 +161,25 @@
  <SubFieldType>TextPattern</SubFieldType>
  </SubField>
  </DataField>
+ <DataField>
+ <Name>Text_Regex</Name>
+ <FieldOptions xsi:type="FieldOptionsTextRegex">
+ <UseNullValues>false</UseNullValues>
+ <ValueAsString>false</ValueAsString>
+ <Pattern>[a-z]{4,8}</Pattern>
+ </FieldOptions>
+ <Field>
+ <FieldType>Text</FieldType>
+ </Field>
+ <SubField>
+ <SubFieldType>TextRegex</SubFieldType>
+ </SubField>
+ </DataField>
  <DataField>
  <Name>Set_StringList</Name>
  <FieldOptions xsi:type="FieldOptionsStringList">
- <ValueAsString>true</ValueAsString>
  <UseNullValues>false</UseNullValues>
+ <ValueAsString>true</ValueAsString>
  <Values>
  <string>Active</string>
  <string>InActive</string>
@@ -188,10 +196,11 @@
  <DataField>
  <Name>Date_Time</Name>
  <FieldOptions xsi:type="FieldOptionsDateTime">
- <ValueAsString>true</ValueAsString>
  <UseNullValues>true</UseNullValues>
- <DateFrom>2013-08-30T00:00:00+02:00</DateFrom>
- <DateTo>2014-08-30T00:00:00+02:00</DateTo>
+ <ValueAsString>true</ValueAsString>
+ <Format>s</Format>
+ <From>2018-12-03T00:00:00Z</From>
+ <To>2019-12-03T00:00:00Z</To>
  <IncludeTime>true</IncludeTime>
  </FieldOptions>
  <Field>
@@ -204,8 +213,8 @@
  <DataField>
  <Name>IT_IPv4</Name>
  <FieldOptions xsi:type="FieldOptionsIPv4Address">
- <ValueAsString>true</ValueAsString>
  <UseNullValues>false</UseNullValues>
+ <ValueAsString>true</ValueAsString>
  </FieldOptions>
  <Field>
  <FieldType>IT</FieldType>
@@ -217,8 +226,9 @@
  <DataField>
  <Name>IT_IPv6</Name>
  <FieldOptions xsi:type="FieldOptionsIPv6Address">
- <ValueAsString>true</ValueAsString>
  <UseNullValues>false</UseNullValues>
+ <ValueAsString>true</ValueAsString>
+ <Uppercase>false</Uppercase>
  </FieldOptions>
  <Field>
  <FieldType>IT</FieldType>
@@ -230,8 +240,10 @@
  <DataField>
  <Name>IT_MAC</Name>
  <FieldOptions xsi:type="FieldOptionsMACAddress">
- <ValueAsString>true</ValueAsString>
  <UseNullValues>false</UseNullValues>
+ <ValueAsString>true</ValueAsString>
+ <Separator>:</Separator>
+ <Uppercase>true</Uppercase>
  </FieldOptions>
  <Field>
  <FieldType>IT</FieldType>
@@ -243,8 +255,9 @@
  <DataField>
  <Name>IT_Guid</Name>
  <FieldOptions xsi:type="FieldOptionsGuid">
- <ValueAsString>true</ValueAsString>
  <UseNullValues>false</UseNullValues>
+ <ValueAsString>true</ValueAsString>
+ <Uppercase>true</Uppercase>
  </FieldOptions>
  <Field>
  <FieldType>IT</FieldType>
@@ -254,4 +267,4 @@
  </SubField>
  </DataField>
  </DataFields>
-</ProjectSettings>
+</ProjectSettings>
diff --git a/src/ConsoleAppClassic/MainTest.cs b/src/ConsoleAppClassic/MainTest.cs
@@ -15,7 +15,7 @@ public static void Run()
  string textRegex = randomizerTextRegex.Generate();
  Write(randomizerTextRegex, textRegex);
 
- var randomizerIBAN1 = RandomizerFactory.GetRandomizer(new FieldOptionsIBAN());
+ var randomizerIBAN1 = RandomizerFactory.GetRandomizer(new FieldOptionsIBAN { Type = "BOTH" });
  string IBAN1 = randomizerIBAN1.Generate();
  Write(randomizerIBAN1, IBAN1);
 

diff --git a/src/RandomDataGenerator Solution.sln b/src/RandomDataGenerator Solution.sln
@@ -30,7 +30,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RandomDataGenerator.Gui", "
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Example Project Files", "Example Project Files", "{E32DF9EB-603F-494D-A4BB-34CF2321F545}"
  ProjectSection(SolutionItems) = preProject
- ..\Example Project Files\My Table.xml = ..\Example Project Files\My Table.xml
+ ..\Example Project Files\My Project.xml = ..\Example Project Files\My Project.xml
  EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAppNetCoreApp2", "ConsoleAppNetCoreApp2\ConsoleAppNetCoreApp2.csproj", "{6AB9BD42-8B23-425C-9B5D-B97A52F008BE}"

diff --git a/src/RandomDataGenerator Solution.sln.DotSettings b/src/RandomDataGenerator Solution.sln.DotSettings
@@ -1,6 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http:https://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http:https://schemas.microsoft.com/winfx/2006/xaml/presentation">
  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MAC/@EntryIndexedValue">MAC</s:String>
  <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQL/@EntryIndexedValue">SQL</s:String>
+ <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQL/@EntryIndexedValue">BBAN</s:String>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=Lipsum/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=Randomizer/@EntryIndexedValue">True</s:Boolean>
  <s:Boolean x:Key="/Default/UserDictionary/Words/=Randomizers/@EntryIndexedValue">True</s:Boolean>

diff --git a/src/RandomDataGenerator.Gui/Data/DataManager.cs b/src/RandomDataGenerator.Gui/Data/DataManager.cs
@@ -63,6 +63,7 @@ public DataManager()
  SubFields = new[] {
  new SubField { SubFieldType = SubFieldType.Text },
  new SubField { SubFieldType = SubFieldType.TextPattern },
+ new SubField { SubFieldType = SubFieldType.TextRegex },
  new SubField { SubFieldType = SubFieldType.TextWords },
  // new SubField { SubFieldType = SubFieldType.TextLipsum }
  }

diff --git a/src/RandomDataGenerator.Gui/MainForm.Fields.cs b/src/RandomDataGenerator.Gui/MainForm.Fields.cs
@@ -74,7 +74,17 @@ void UserControlExample_RefreshClicked(object sender, EventArgs e)
  private void UpdateUserControlExampleText(BaseUserControl baseUserControl)
  {
  var dummyDataField = new DataField(null, baseUserControl.GetFieldOptions(), null, null);
- var value = dummyDataField.Generate();
+
+ object value = "N/A";
+ try
+ {
+ value = dummyDataField.Generate();
+ }
+ catch
+ {
+ // Just ignore exception
+ }
+
  userControlExample.txtExample.Text = value != null ? value.ToString() : "NULL";
  }
  #endregion

diff --git a/src/RandomDataGenerator.Gui/RandomDataGenerator.Gui.csproj b/src/RandomDataGenerator.Gui/RandomDataGenerator.Gui.csproj
@@ -124,6 +124,12 @@
  <Compile Include="UserControlsFields\UserControlIPv4Address.Designer.cs">
  <DependentUpon>UserControlIPv4Address.cs</DependentUpon>
  </Compile>
+ <Compile Include="UserControlsFields\UserControlTextRegex.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControlsFields\UserControlTextRegex.Designer.cs">
+ <DependentUpon>UserControlTextRegex.cs</DependentUpon>
+ </Compile>
  <Compile Include="UserControls\BaseUserControl.cs">
  <SubType>UserControl</SubType>
  </Compile>
@@ -258,6 +264,9 @@
  <EmbeddedResource Include="UserControlsFields\UserControlMACAddress.resx">
  <DependentUpon>UserControlMACAddress.cs</DependentUpon>
  </EmbeddedResource>
+ <EmbeddedResource Include="UserControlsFields\UserControlTextRegex.resx">
+ <DependentUpon>UserControlTextRegex.cs</DependentUpon>
+ </EmbeddedResource>
  <EmbeddedResource Include="UserControls\UserControlOutputSQL.resx">
  <DependentUpon>UserControlOutputSQL.cs</DependentUpon>
  </EmbeddedResource>

diff --git a/src/RandomDataGenerator.Gui/UserControlsFields/UserControlCommonOptions.Designer.cs b/src/RandomDataGenerator.Gui/UserControlsFields/UserControlCommonOptions.Designer.cs
diff --git a/src/RandomDataGenerator.Gui/UserControlsFields/UserControlInteger.Designer.cs b/src/RandomDataGenerator.Gui/UserControlsFields/UserControlInteger.Designer.cs