exclude default columns when creating join columns

Author: tanjjj

vuu/src/test/scala/org/finos/vuu/core/module/ModuleSyntaxTest.scala

@@ -6,16 +6,16 @@ import org.scalatest.GivenWhenThen
 import org.scalatest.featurespec.AnyFeatureSpec
 import org.scalatest.matchers.should.Matchers
 
-class ModuleSyntaxTest extends AnyFeatureSpec with Matchers with GivenWhenThen{
+class ModuleSyntaxTest extends AnyFeatureSpec with Matchers with GivenWhenThen {
 
-  Feature("check the new builder syntax for view server modules"){
+  Feature("check the new builder syntax for view server modules") {
 
-    Scenario("check we can parse the module"){
+    Scenario("check we can parse the module") {
 
       Given("A test module which several tables defined, which takes some parameters (these are simple example params but could be complicated lifecycle stuff)")
       implicit val tableDefContainer: TableDefContainer = new TableDefContainer(Map())
       val module = TestModule2.apply("foo", 100)
-      module.tableDefs.size should be (3)
+      module.tableDefs.size should be(3)
       module.name should equal("TEST")
 
       val instruments = module.tableDefs.head
@@ -33,16 +33,16 @@ class ModuleSyntaxTest extends AnyFeatureSpec with Matchers with GivenWhenThen{
         )
       )
       instruments.joinFields should equal(Seq("ric"))
-      
+
       val prices = module.tableDefs.tail.head
       prices.name should equal("prices")
       prices.columns.size should equal(9)
       prices.joinFields should equal(Seq("ric"))
 
       val instrumentPrices = module.tableDefs.tail.tail.head
       instrumentPrices.name should equal("instrumentPrices")
-      // TODO once https://github.com/finos/vuu/issues/1653 is done, review the expected value of columns.size in the next line
-      instrumentPrices.columns.size should equal(prices.columns.size + instruments.columns.size - 1 + 2)
+      instrumentPrices.columns.size should equal((prices.columns.size - 2) + (instruments.columns.size - 2) - 1 + 2)
+      // exclude default columns in left and right table and exclude join column
 
       instrumentPrices.joinFields should equal(Seq())
     }