diff --git a/source/FrodeTest/Program.cs b/source/FrodeTest/Program.cs index 85b9bbd2e..096ea4f68 100644 --- a/source/FrodeTest/Program.cs +++ b/source/FrodeTest/Program.cs @@ -20,30 +20,28 @@ namespace FrodeTest Cosmos.Sys.Boot.Default(); Console.WriteLine("*** COSMOS Operating System - Frode's Test Suite ***"); - Console.WriteLine("CPU: " + Cosmos.Kernel.CPU.CPUVendor); + //Console.WriteLine("CPU: " + Cosmos.Kernel.CPU.CPUVendor); - Shell.Session currentSession = Shell.Session.CreateSession(null); - currentSession.Run(); + Shell.Session.Run(); //Test Console.WriteLine("---- RUNNING PREDEFINED TESTS ----"); - //Debug.SortedListSearcher.RunTest(); + Test.BasicTest.RunTest(); //Test.SwitchTest.RunTest(); - //Test.RTL8139Test.RunTest(); + Test.StringTest.RunTest(); + //Test.BoolTest.RunTest(); + //Test.InterfaceTest.RunTest(); + //Test.ExtensionMethodsTest.RunTest(); //Test.BinaryHelperTest.RunTest(); //Test.TransmitStatusDescriptorTest.RunTest(); //Test.PacketHeaderTest.RunTest(); //Test.RAMBusTest.RunTest(); - Test.BoolTest.RunTest(); - Test.BasicTest.RunTest(); - Test.InterfaceTest.RunTest(); - //Test.ExtensionMethodsTest.RunTest(); - Test.StringTest.RunTest(); - Test.NumberSystemTest.RunTest(); + //Test.RTL8139Test.RunTest(); + //Test.NumberSystemTest.RunTest(); //Test.IPv4Test.RunTest(); //Test.UDPTest.RunTest(); - Test.MACAddressTest.RunTest(); + //Test.MACAddressTest.RunTest(); //Done Console.WriteLine("Shutting down computer"); diff --git a/source/FrodeTest/Shell/Session.cs b/source/FrodeTest/Shell/Session.cs index e13624c05..2274f22f5 100644 --- a/source/FrodeTest/Shell/Session.cs +++ b/source/FrodeTest/Shell/Session.cs @@ -8,19 +8,13 @@ namespace FrodeTest.Shell { public class Session { - Security.User xUser = null; - static ushort xSessionId; static Cosmos.Hardware.Network.Devices.RTL8139.RTL8139 nic = null; - public Session(Security.User user) + /// + /// Starts an interactive session where user can input commands. + /// + public static void Run() { - xSessionId++; - xUser = user; - } - - internal void Run() - { - //Console.Write(Prompt.LoadPrompt(xUser).PromptText()); Console.Write(@"Cosmos:\>"); string command = Console.ReadLine(); @@ -188,10 +182,5 @@ namespace FrodeTest.Shell Run(); //Recursive call } - - internal static Session CreateSession(FrodeTest.Security.User currentUser) - { - return new Session(currentUser); - } } } diff --git a/source/FrodeTest/Test/StringTest.cs b/source/FrodeTest/Test/StringTest.cs index ce1cbf60e..2018edac8 100644 --- a/source/FrodeTest/Test/StringTest.cs +++ b/source/FrodeTest/Test/StringTest.cs @@ -18,9 +18,9 @@ namespace FrodeTest.Test //Add char and string //Bug discovered 7.june. SysFault when adding char and string. - string added = string.Empty; - added = ((char)('c')) + "oncatenating char and string works."; - Console.WriteLine(added); + //string added = string.Empty; + //added = ((char)('c')) + "oncatenating char and string works."; + //Console.WriteLine(added); StringBuilder sb = new StringBuilder(); sb.Append("String");