#637 : supporting google tests

ELENA-LANG · Mar 28, 2024 · 0ea69e8 · 0ea69e8
1 parent 81096c6
commit 0ea69e8
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 14 deletions.
diff --git a/elenasrc3/elena-tests/bt_optimization.cpp b/elenasrc3/elena-tests/bt_optimization.cpp
@@ -1 +1,12 @@
-#include "pch.h"
+//---------------------------------------------------------------------------
+//		E L E N A   P r o j e c t:  ELENA Compiler
+//
+//		This header contains ELENA Test Optimization Fixture implementation
+//                                             (C)2024, by Aleksey Rakov
+//---------------------------------------------------------------------------
+
+#include "bt_optimization.h"
+
+using namespace elena_lang;
+
+// --- BTOptimization1 ---
diff --git a/elenasrc3/elena-tests/bt_optimization.h b/elenasrc3/elena-tests/bt_optimization.h
@@ -8,13 +8,20 @@
 #ifndef BTOPTIMIZATION_H
 #define BTOPTIMIZATION_H
 
-#include "common.h"
+#include "pch.h"
+#include "tests_common.h"
 
 namespace elena_lang
 {
-   class BTOptimization1 : public testing::Test
+   // Optimization 1 (byRefOp) : "a := b.get()" => "b.get(ref a)"
+   class BTOptimization1_1 : public testing::Test
    {
    protected:
+      SyntaxTree syntaxTree;
+      BuildTree  buildTree;
+
+      CompilerEnvironment env;
+
       void SetUp() override
       {
       }

diff --git a/elenasrc3/elena-tests/bt_tests.cpp b/elenasrc3/elena-tests/bt_tests.cpp
@@ -2,7 +2,7 @@
 #include "bt_optimization.h"
 
 using namespace elena_lang;
-TEST_F(BTOptimization1, BuildTapeTest) {
+TEST_F(BTOptimization1_1, BuildTapeTest) {
   EXPECT_EQ(1, 1);
   EXPECT_TRUE(true);
 }
diff --git a/elenasrc3/elena-tests/compiler_tests.cpp b/elenasrc3/elena-tests/compiler_tests.cpp
@@ -2,18 +2,24 @@
 // ------------------------------------------------
 #include "bt_optimization.h"
 
-//#include "elena.h"
-
-#include "common.h"
+#include "compiler.h"
 
 using namespace elena_lang;
 
-TEST_F(BTOptimization1, CompilerTest) {
+TEST_F(BTOptimization1_1, CompilerTest) 
+{
+   // Arrange
+   Compiler* compiler = env.createCompiler();
 
-   CompilerEnvironment env;
+   BuildTree output;
+   BuildTreeWriter writer(output);
+   Compiler::SymbolScope rootScope(nullptr, 0, Visibility::Internal);
+   Compiler::Expression expression(compiler, rootScope, writer);
 
-   //Compiler* compiler = /*env.createCompiler()*/nullptr;
+   // Act
+   expression.compileRoot(syntaxTree.readRoot(), ExpressionAttribute::None);
 
-  EXPECT_EQ(1, 1);
-  EXPECT_TRUE(true);
+   // Assess
+   bool matched = BuildTree::compare(buildTree.readRoot(), output.readRoot());
+   EXPECT_TRUE(matched);
 }
diff --git a/elenasrc3/elena-tests/elena-tests.vcxproj b/elenasrc3/elena-tests/elena-tests.vcxproj
@@ -62,7 +62,7 @@
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>..\common;..\engine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\elc;..\common;..\engine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>Default</LanguageStandard>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
@@ -127,6 +127,12 @@
     <ClInclude Include="bt_optimization.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\common\dump.cpp" />
+    <ClCompile Include="..\common\ustring.cpp" />
+    <ClCompile Include="..\elc\compiler.cpp" />
+    <ClCompile Include="..\elc\compilerlogic.cpp" />
+    <ClCompile Include="..\engine\bytecode.cpp" />
+    <ClCompile Include="..\engine\syntaxtree.cpp" />
     <ClCompile Include="tests_common.cpp" />
     <ClCompile Include="bt_optimization.cpp" />
     <ClCompile Include="compiler_tests.cpp" />

diff --git a/elenasrc3/elena-tests/common.cpp → elenasrc3/elena-tests/tests_common.cpp b/elenasrc3/elena-tests/common.cpp → elenasrc3/elena-tests/tests_common.cpp
@@ -8,7 +8,7 @@
 
 #include "pch.h"
 // --------------------------------------------------------------------------
-#include "common.h"
+#include "tests_common.h"
 
 using namespace elena_lang;
 
@@ -17,4 +17,9 @@ using namespace elena_lang;
 CompilerEnvironment :: CompilerEnvironment()
 {
 
+}
+
+Compiler* CompilerEnvironment :: createCompiler()
+{
+   return nullptr;
 }
diff --git a/elenasrc3/elena-tests/common.h → elenasrc3/elena-tests/tests_common.h b/elenasrc3/elena-tests/common.h → elenasrc3/elena-tests/tests_common.h
@@ -8,12 +8,16 @@
 #ifndef TESTS_COMMON_H
 #define TESTS_COMMON_H
 
+#include "compiler.h"
+
 namespace elena_lang 
 {
    // --- CompilerEnvironment ---
    class CompilerEnvironment
    {
    public:
+      Compiler* createCompiler();
+
       CompilerEnvironment();
    };
 }

diff --git a/elenasrc3/engine/buildtree.h b/elenasrc3/engine/buildtree.h
@@ -241,6 +241,12 @@ namespace elena_lang
    class BuildTree : public Tree<BuildKey, BuildKey::None>
    {
    public:
+      static bool compare(Tree<BuildKey, BuildKey::None>::Node n1, Tree<BuildKey, BuildKey::None>::Node n2)
+      {
+         // !! temporal
+         return false;
+      }
+
       static pos_t countChildren(Tree<BuildKey, BuildKey::None>::Node node, BuildKey mask)
       {
          pos_t counter = 0;